From fa2bf295fa9646a3052ab0498a4577f586eadef0 Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 1 Apr 2019 08:55:57 +0800 Subject: *misc --- build/3rd-party/Box2D/box2d.vcxproj | 8 +- build/3rd-party/SDL2/SDL2.vcxproj | 294 ++++++++++----------- build/3rd-party/SDL2/SDL2.vcxproj.filters | 286 ++++++++++---------- build/3rd-party/SDL2main/SDL2main.vcxproj | 8 +- build/Asura.sln | 16 ++ build/tests/win32/01-window/01-window.vcxproj | 134 ++++++++++ .../win32/01-window/01-window.vcxproj.filters | 11 + build/tests/win32/01-window/01-window.vcxproj.user | 4 + build/x64/Debug/01-window.exe | Bin 0 -> 64512 bytes build/x64/Debug/03-openal.exe | Bin 58368 -> 0 bytes 10 files changed, 463 insertions(+), 298 deletions(-) create mode 100644 build/tests/win32/01-window/01-window.vcxproj create mode 100644 build/tests/win32/01-window/01-window.vcxproj.filters create mode 100644 build/tests/win32/01-window/01-window.vcxproj.user create mode 100644 build/x64/Debug/01-window.exe delete mode 100644 build/x64/Debug/03-openal.exe (limited to 'build') diff --git a/build/3rd-party/Box2D/box2d.vcxproj b/build/3rd-party/Box2D/box2d.vcxproj index 854cd73..8e8653b 100644 --- a/build/3rd-party/Box2D/box2d.vcxproj +++ b/build/3rd-party/Box2D/box2d.vcxproj @@ -76,7 +76,7 @@ Disabled true true - $(SolutionDir)..\Source\3rdparty\;%(AdditionalIncludeDirectories) + $(SolutionDir)..\Source\3rd-party\;%(AdditionalIncludeDirectories) @@ -85,7 +85,7 @@ Disabled true true - $(SolutionDir)..\Source\3rdparty\;%(AdditionalIncludeDirectories) + $(SolutionDir)..\Source\3rd-party\;%(AdditionalIncludeDirectories) @@ -96,7 +96,7 @@ true true true - $(SolutionDir)..\Source\3rdparty\;%(AdditionalIncludeDirectories) + $(SolutionDir)..\Source\3rd-party\;%(AdditionalIncludeDirectories) true @@ -111,7 +111,7 @@ true true true - $(SolutionDir)..\Source\3rdparty\;%(AdditionalIncludeDirectories) + $(SolutionDir)..\Source\3rd-party\;%(AdditionalIncludeDirectories) true diff --git a/build/3rd-party/SDL2/SDL2.vcxproj b/build/3rd-party/SDL2/SDL2.vcxproj index 970966f..6c85ba5 100644 --- a/build/3rd-party/SDL2/SDL2.vcxproj +++ b/build/3rd-party/SDL2/SDL2.vcxproj @@ -81,7 +81,7 @@ Disabled false false - $(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories) + $(SolutionDir)..\Source\3rd-party\SDL2\include;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;%(PreprocessorDefinitions) false MultiThreadedDLL @@ -102,7 +102,7 @@ Disabled true true - $(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories) + $(SolutionDir)..\Source\3rd-party\SDL2\include;%(AdditionalIncludeDirectories) @@ -113,7 +113,7 @@ true true true - $(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories) + $(SolutionDir)..\Source\3rd-party\SDL2\include;%(AdditionalIncludeDirectories) true @@ -128,7 +128,7 @@ true false false - $(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories) + $(SolutionDir)..\Source\3rd-party\SDL2\include;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;%(PreprocessorDefinitions) false MultiThreadedDLL @@ -145,163 +145,163 @@ - + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/3rd-party/SDL2/SDL2.vcxproj.filters b/build/3rd-party/SDL2/SDL2.vcxproj.filters index 07c0d77..c4be66e 100644 --- a/build/3rd-party/SDL2/SDL2.vcxproj.filters +++ b/build/3rd-party/SDL2/SDL2.vcxproj.filters @@ -1,143 +1,143 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -150,12 +150,12 @@ - - - - - - + + + + + + diff --git a/build/3rd-party/SDL2main/SDL2main.vcxproj b/build/3rd-party/SDL2main/SDL2main.vcxproj index e3ac28f..5da2151 100644 --- a/build/3rd-party/SDL2main/SDL2main.vcxproj +++ b/build/3rd-party/SDL2main/SDL2main.vcxproj @@ -81,7 +81,7 @@ Disabled true true - $(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories) + $(SolutionDir)..\Source\3rd-party\SDL2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) @@ -91,7 +91,7 @@ Disabled true true - $(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories) + $(SolutionDir)..\Source\3rd-party\SDL2\include;%(AdditionalIncludeDirectories) @@ -102,7 +102,7 @@ true true true - $(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories) + $(SolutionDir)..\Source\3rd-party\SDL2\include;%(AdditionalIncludeDirectories) true @@ -117,7 +117,7 @@ true true true - $(SolutionDir)..\Source\3rdparty\SDL2\include;%(AdditionalIncludeDirectories) + $(SolutionDir)..\Source\3rd-party\SDL2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) diff --git a/build/Asura.sln b/build/Asura.sln index 2e3f4f0..9513df5 100644 --- a/build/Asura.sln +++ b/build/Asura.sln @@ -103,6 +103,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asura-plot", "modules\asura EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "07-image", "tests\07-image\07-image.vcxproj", "{72119950-3542-41AD-97EB-DC4856FC16AA}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "win32", "win32", "{6096DD65-FE67-4D0F-BEF4-4D81A1554A3A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01-window", "tests\win32\01-window\01-window.vcxproj", "{B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -575,6 +579,16 @@ Global {72119950-3542-41AD-97EB-DC4856FC16AA}.Release|x64.Build.0 = Release|x64 {72119950-3542-41AD-97EB-DC4856FC16AA}.Release|x86.ActiveCfg = Release|Win32 {72119950-3542-41AD-97EB-DC4856FC16AA}.Release|x86.Build.0 = Release|Win32 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Debug|x64.ActiveCfg = Debug|x64 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Debug|x64.Build.0 = Debug|x64 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Debug|x86.ActiveCfg = Debug|Win32 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Debug|x86.Build.0 = Debug|Win32 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Release|Any CPU.ActiveCfg = Release|Win32 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Release|x64.ActiveCfg = Release|x64 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Release|x64.Build.0 = Release|x64 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Release|x86.ActiveCfg = Release|Win32 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -620,6 +634,8 @@ Global {49F7847E-219E-4A7B-8484-2A33DAC29DD0} = {64D4E4B2-4A60-46F4-A500-370EFED4524F} {F248C936-2169-45DF-8FC4-60E56EA23ECC} = {CD115016-E377-4AC1-8595-DB2836CEFE7E} {72119950-3542-41AD-97EB-DC4856FC16AA} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} + {6096DD65-FE67-4D0F-BEF4-4D81A1554A3A} = {E068D138-C824-4365-B5A3-27C65E8FD0B5} + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA} = {6096DD65-FE67-4D0F-BEF4-4D81A1554A3A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {331032D8-F7CC-43E3-A03B-67108767F96B} diff --git a/build/tests/win32/01-window/01-window.vcxproj b/build/tests/win32/01-window/01-window.vcxproj new file mode 100644 index 0000000..88d957c --- /dev/null +++ b/build/tests/win32/01-window/01-window.vcxproj @@ -0,0 +1,134 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {B8FF8AE1-D0C1-4C7D-9FEE-5727ECE604BA} + My01window + 10.0.17134.0 + + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + + + + + + + + + + + + + + + + + + + + + Level3 + Disabled + true + true + + + opengl32.lib;%(AdditionalDependencies) + Windows + + + + + Level3 + Disabled + true + true + + + + + Level3 + MaxSpeed + true + true + true + true + + + true + true + + + + + Level3 + MaxSpeed + true + true + true + true + + + true + true + opengl32.lib;%(AdditionalDependencies) + Windows + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build/tests/win32/01-window/01-window.vcxproj.filters b/build/tests/win32/01-window/01-window.vcxproj.filters new file mode 100644 index 0000000..07cdbcd --- /dev/null +++ b/build/tests/win32/01-window/01-window.vcxproj.filters @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/build/tests/win32/01-window/01-window.vcxproj.user b/build/tests/win32/01-window/01-window.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/build/tests/win32/01-window/01-window.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/build/x64/Debug/01-window.exe b/build/x64/Debug/01-window.exe new file mode 100644 index 0000000..3130760 Binary files /dev/null and b/build/x64/Debug/01-window.exe differ diff --git a/build/x64/Debug/03-openal.exe b/build/x64/Debug/03-openal.exe deleted file mode 100644 index 9a535ec..0000000 Binary files a/build/x64/Debug/03-openal.exe and /dev/null differ -- cgit v1.1-26-g67d0