From dcee98f88ea7aa0c0c5282b04540ac65daddcbb7 Mon Sep 17 00:00:00 2001 From: chai Date: Fri, 26 Oct 2018 01:36:01 +0800 Subject: =?UTF-8?q?+SDL2=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/vc++/3rdparty/SDL2/SDL2.vcxproj | 350 ++++++++++++++- build/vc++/3rdparty/SDL2/SDL2.vcxproj.filters | 491 +++++++++++++++++++++- build/vc++/3rdparty/luajit/luajit.vcxproj | 27 +- build/vc++/3rdparty/luajit/luajit.vcxproj.filters | 3 + build/vc++/jin.sln | 16 +- build/vc++/jin/jin.vcxproj | 10 +- build/vc++/libjin/libjin.vcxproj | 6 + 7 files changed, 879 insertions(+), 24 deletions(-) (limited to 'build') diff --git a/build/vc++/3rdparty/SDL2/SDL2.vcxproj b/build/vc++/3rdparty/SDL2/SDL2.vcxproj index 511ce2e..8daa81d 100644 --- a/build/vc++/3rdparty/SDL2/SDL2.vcxproj +++ b/build/vc++/3rdparty/SDL2/SDL2.vcxproj @@ -22,17 +22,17 @@ 15.0 {8658F91C-9AAE-4819-9005-77D09C61D97F} SDL2 - 10.0.17134.0 + 8.1 - Application + DynamicLibrary true v141 MultiByte - Application + DynamicLibrary false v141 true @@ -69,14 +69,33 @@ - + + $(SolutionDir)..\..\bin + + + $(SolutionDir)..\..\bin + Level3 - Disabled + MaxSpeed true true + $(SolutionDir)..\..\src\3rdparty\SDL2\include;%(AdditionalIncludeDirectories) + OnlyExplicitInline + NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreadedDLL + false + StreamingSIMDExtensions + true + + winmm.lib;imm32.lib;version.lib;%(AdditionalDependencies) + true + Windows + true + true + @@ -91,13 +110,23 @@ Level3 MaxSpeed true - true true true + $(SolutionDir)..\..\src\3rdparty\SDL2\include;%(AdditionalIncludeDirectories) + OnlyExplicitInline + NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreadedDLL + false + StreamingSIMDExtensions + true + false true true + winmm.lib;imm32.lib;version.lib;%(AdditionalDependencies) + true + Windows @@ -115,6 +144,315 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/vc++/3rdparty/SDL2/SDL2.vcxproj.filters b/build/vc++/3rdparty/SDL2/SDL2.vcxproj.filters index 3c6f4fd..d422087 100644 --- a/build/vc++/3rdparty/SDL2/SDL2.vcxproj.filters +++ b/build/vc++/3rdparty/SDL2/SDL2.vcxproj.filters @@ -1,17 +1,486 @@  - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + {68cf214f-f5bc-4549-96e8-c44b37523bde} + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build/vc++/3rdparty/luajit/luajit.vcxproj b/build/vc++/3rdparty/luajit/luajit.vcxproj index 4f254b2..0b05bd6 100644 --- a/build/vc++/3rdparty/luajit/luajit.vcxproj +++ b/build/vc++/3rdparty/luajit/luajit.vcxproj @@ -71,9 +71,17 @@ $(SolutionDir)..\..\bin + $(ProjectName) $(SolutionDir)..\..\bin + $(ProjectName) + + + lua51 + + + lua51 @@ -81,7 +89,7 @@ Disabled true false - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) lj_vm.obj @@ -89,6 +97,11 @@ $(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src + + $(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src;%(AdditionalLibraryDirectories) + lj_vm.obj;%(AdditionalDependencies) + luajit.def + @@ -97,6 +110,9 @@ true true + + luajit.def + @@ -106,11 +122,14 @@ true true false - _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true true + $(SolutionDir)..\..\src\3rdparty\LuaJIT-2.0.5\src;%(AdditionalLibraryDirectories) + lj_vm.obj;%(AdditionalDependencies) + luajit.def lj_vm.obj @@ -131,6 +150,7 @@ true true + luajit.def @@ -269,6 +289,9 @@ {8b1269cf-1aff-4aa3-9209-96ddba4fa17f} + + + diff --git a/build/vc++/3rdparty/luajit/luajit.vcxproj.filters b/build/vc++/3rdparty/luajit/luajit.vcxproj.filters index 2e909ae..9599ffc 100644 --- a/build/vc++/3rdparty/luajit/luajit.vcxproj.filters +++ b/build/vc++/3rdparty/luajit/luajit.vcxproj.filters @@ -390,4 +390,7 @@ src + + + \ No newline at end of file diff --git a/build/vc++/jin.sln b/build/vc++/jin.sln index 3413994..fd022a4 100644 --- a/build/vc++/jin.sln +++ b/build/vc++/jin.sln @@ -39,6 +39,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "buildvm", "3rdparty\buildvm EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minilua", "3rdparty\minilua\minilua.vcxproj", "{C87C5B2F-4088-4BBC-8BEE-C6A2BB22F9A0}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SDL", "SDL", "{CD378AC6-A4FE-48F7-984A-EB68C60A211B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2main", "3rdparty\SDL2main\SDL2main.vcxproj", "{5522BDBA-3F18-4EDD-B6E4-CE6A70D9D794}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -151,6 +155,14 @@ Global {C87C5B2F-4088-4BBC-8BEE-C6A2BB22F9A0}.Release|x64.Build.0 = Release|x64 {C87C5B2F-4088-4BBC-8BEE-C6A2BB22F9A0}.Release|x86.ActiveCfg = Release|Win32 {C87C5B2F-4088-4BBC-8BEE-C6A2BB22F9A0}.Release|x86.Build.0 = Release|Win32 + {5522BDBA-3F18-4EDD-B6E4-CE6A70D9D794}.Debug|x64.ActiveCfg = Debug|x64 + {5522BDBA-3F18-4EDD-B6E4-CE6A70D9D794}.Debug|x64.Build.0 = Debug|x64 + {5522BDBA-3F18-4EDD-B6E4-CE6A70D9D794}.Debug|x86.ActiveCfg = Debug|Win32 + {5522BDBA-3F18-4EDD-B6E4-CE6A70D9D794}.Debug|x86.Build.0 = Debug|Win32 + {5522BDBA-3F18-4EDD-B6E4-CE6A70D9D794}.Release|x64.ActiveCfg = Release|x64 + {5522BDBA-3F18-4EDD-B6E4-CE6A70D9D794}.Release|x64.Build.0 = Release|x64 + {5522BDBA-3F18-4EDD-B6E4-CE6A70D9D794}.Release|x86.ActiveCfg = Release|Win32 + {5522BDBA-3F18-4EDD-B6E4-CE6A70D9D794}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -165,11 +177,13 @@ Global {3FC3E8B7-380E-41E6-91FF-82FA5E622D29} = {65DFFFA6-F434-47FB-9DB2-DCF019060B92} {9A0EAD3F-5A23-41C8-8FFD-8F6B71F43342} = {65DFFFA6-F434-47FB-9DB2-DCF019060B92} {05128A0C-74E2-43EF-B5F4-B0DA70D47940} = {2D5BA0D9-04A7-43BB-BD30-000D39317B07} - {8658F91C-9AAE-4819-9005-77D09C61D97F} = {65DFFFA6-F434-47FB-9DB2-DCF019060B92} + {8658F91C-9AAE-4819-9005-77D09C61D97F} = {CD378AC6-A4FE-48F7-984A-EB68C60A211B} {80410A0C-5592-418E-848B-FEC61C432F53} = {2A2F610D-E42B-426F-8DC8-79E0C6FCCDD2} {2A2F610D-E42B-426F-8DC8-79E0C6FCCDD2} = {65DFFFA6-F434-47FB-9DB2-DCF019060B92} {8B1269CF-1AFF-4AA3-9209-96DDBA4FA17F} = {2A2F610D-E42B-426F-8DC8-79E0C6FCCDD2} {C87C5B2F-4088-4BBC-8BEE-C6A2BB22F9A0} = {2A2F610D-E42B-426F-8DC8-79E0C6FCCDD2} + {CD378AC6-A4FE-48F7-984A-EB68C60A211B} = {65DFFFA6-F434-47FB-9DB2-DCF019060B92} + {5522BDBA-3F18-4EDD-B6E4-CE6A70D9D794} = {CD378AC6-A4FE-48F7-984A-EB68C60A211B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {633D8D43-3349-43F7-8835-7D7F58BAD2A8} diff --git a/build/vc++/jin/jin.vcxproj b/build/vc++/jin/jin.vcxproj index 336ab5e..6a6f0af 100644 --- a/build/vc++/jin/jin.vcxproj +++ b/build/vc++/jin/jin.vcxproj @@ -89,8 +89,9 @@ true true Windows - $(SolutionDir)libs\SDL2-2.0.5\lib\x86 - SDL2main.lib;SDL2.lib;opengl32.lib;%(AdditionalDependencies) + + + opengl32.lib;%(AdditionalDependencies) @@ -103,8 +104,9 @@ Windows - $(SolutionDir)libs\SDL2-2.0.5\lib\x86 - SDL2main.lib;SDL2.lib;opengl32.lib;%(AdditionalDependencies) + + + opengl32.lib;%(AdditionalDependencies) diff --git a/build/vc++/libjin/libjin.vcxproj b/build/vc++/libjin/libjin.vcxproj index 049f1d8..671eec7 100644 --- a/build/vc++/libjin/libjin.vcxproj +++ b/build/vc++/libjin/libjin.vcxproj @@ -274,6 +274,12 @@ {8828f6b1-f167-4bc9-b7c7-7cc34cddee8a} + + {5522bdba-3f18-4edd-b6e4-ce6a70d9d794} + + + {8658f91c-9aae-4819-9005-77d09c61d97f} + {3fc3e8b7-380e-41e6-91ff-82fa5e622d29} -- cgit v1.1-26-g67d0