From ddef39a3154d214fa1bb7f154c1c6610714c8ea6 Mon Sep 17 00:00:00 2001 From: chai Date: Tue, 21 Aug 2018 21:06:04 +0800 Subject: *update --- build/vs2015/jin.sln | 17 +- build/vs2015/jin.vcxproj | 100 +------- build/vs2015/jin.vcxproj.filters | 359 ---------------------------- build/vs2015/libjin/libjin.vcxproj | 233 ++++++++++++++++++ build/vs2015/libjin/libjin.vcxproj.filters | 368 +++++++++++++++++++++++++++++ build/vs2015/libjin/libjin.vcxproj.user | 4 + 6 files changed, 625 insertions(+), 456 deletions(-) create mode 100644 build/vs2015/libjin/libjin.vcxproj create mode 100644 build/vs2015/libjin/libjin.vcxproj.filters create mode 100644 build/vs2015/libjin/libjin.vcxproj.user (limited to 'build') diff --git a/build/vs2015/jin.sln b/build/vs2015/jin.sln index c608875..ed8f37c 100644 --- a/build/vs2015/jin.sln +++ b/build/vs2015/jin.sln @@ -1,10 +1,12 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.27703.2047 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jin", "jin.vcxproj", "{A3E35ECA-62EB-45CE-8152-674FBC7F7A3B}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjin", "libjin\libjin.vcxproj", "{9EE02090-C15E-4520-9C05-C435E45EF2FC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -21,8 +23,19 @@ Global {A3E35ECA-62EB-45CE-8152-674FBC7F7A3B}.Release|x64.Build.0 = Release|x64 {A3E35ECA-62EB-45CE-8152-674FBC7F7A3B}.Release|x86.ActiveCfg = Release|Win32 {A3E35ECA-62EB-45CE-8152-674FBC7F7A3B}.Release|x86.Build.0 = Release|Win32 + {9EE02090-C15E-4520-9C05-C435E45EF2FC}.Debug|x64.ActiveCfg = Debug|x64 + {9EE02090-C15E-4520-9C05-C435E45EF2FC}.Debug|x64.Build.0 = Debug|x64 + {9EE02090-C15E-4520-9C05-C435E45EF2FC}.Debug|x86.ActiveCfg = Debug|Win32 + {9EE02090-C15E-4520-9C05-C435E45EF2FC}.Debug|x86.Build.0 = Debug|Win32 + {9EE02090-C15E-4520-9C05-C435E45EF2FC}.Release|x64.ActiveCfg = Release|x64 + {9EE02090-C15E-4520-9C05-C435E45EF2FC}.Release|x64.Build.0 = Release|x64 + {9EE02090-C15E-4520-9C05-C435E45EF2FC}.Release|x86.ActiveCfg = Release|Win32 + {9EE02090-C15E-4520-9C05-C435E45EF2FC}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {633D8D43-3349-43F7-8835-7D7F58BAD2A8} + EndGlobalSection EndGlobal diff --git a/build/vs2015/jin.vcxproj b/build/vs2015/jin.vcxproj index 427288f..a0836a4 100644 --- a/build/vs2015/jin.vcxproj +++ b/build/vs2015/jin.vcxproj @@ -139,41 +139,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -199,64 +165,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -277,15 +185,17 @@ - - - + + + {9ee02090-c15e-4520-9c05-c435e45ef2fc} + + diff --git a/build/vs2015/jin.vcxproj.filters b/build/vs2015/jin.vcxproj.filters index 25b8715..f223626 100644 --- a/build/vs2015/jin.vcxproj.filters +++ b/build/vs2015/jin.vcxproj.filters @@ -4,87 +4,9 @@ {f3e85b81-1688-49e4-b85c-65d99ddafad9} - - {f3e85b81-1688-49e4-b85c-65d99ddafad0} - {e082b09b-1cdc-4c21-967b-eaf7130cf620} - - {4e3c38b2-8076-4927-993d-e59607d4256a} - - - {8222e176-beec-43ee-8604-3e6491dc45bb} - - - {7467bc99-3a63-4b92-b3ab-b5a3d86ead1b} - - - {5087c206-df20-4380-b929-eb5b466d42b3} - - - {bb4a9832-a45a-445d-8199-80d3e97f9415} - - - {14253521-dbe9-4289-b100-47b4deb41331} - - - {3c5d715c-d885-4af9-95db-3b1ca43cae58} - - - {fe12237c-986f-42f3-86d9-1fe848e1e058} - - - {3eded42e-5a27-433d-9b0a-c25190008be7} - - - {31ad905a-11d7-4a67-ab7a-66caa3ae54fc} - - - {be27da6f-98b1-4e99-ac75-c3116f1618de} - - - {8fb29df7-e8de-4bce-944b-b8822e21f4c5} - - - {f7c7c527-a154-4bfe-a3a9-d34a3828da58} - - - {bdf3096e-923f-4c91-bafe-03cf47f25ff2} - - - {e9abe7cb-bbbf-4315-a9ab-285b52efa3b7} - - - {14019a9d-eeaf-42be-b0ec-833217f3c131} - - - {eb34937f-6278-4d8e-ad48-3c7a6dd6606c} - - - {82885ffb-90e6-46d6-b92d-5d96188809b2} - - - {8e02a165-9a07-40ed-a7cb-1992fe1b354d} - - - {82ff6d68-7fc7-47fd-8817-81f2a01338fa} - - - {f590a5f6-f8d5-4607-8280-9d436fc0988b} - - - {d1f6dace-eb73-49f8-8731-eeec095956eb} - - - {2add7117-cbae-4454-a5f1-93eaed51b3e6} - - - {23033979-4942-4f08-8a1d-ecc0dec442b5} - - - {2ca0fd6f-0e11-4215-9ca6-c58179928bd5} - {579f12b8-5758-4be5-9cd7-e1fa62fdef74} @@ -153,102 +75,6 @@ src - - src\libjin\Audio - - - src\libjin\Audio - - - src\libjin\Core - - - src\libjin\Filesystem - - - src\libjin\Input - - - src\libjin\Input - - - src\libjin\Input - - - src\libjin\Input - - - src\libjin\Math - - - src\libjin\Math - - - src\libjin\Net - - - src\libjin\Thread - - - src\libjin\Utils - - - src\libjin\Utils - - - src\libjin\Audio\SDL - - - src\libjin\Audio\SDL - - - src\libjin\Audio\OpenAL - - - src\libjin\Audio\OpenAL - - - src\libjin\3rdparty\GLee - - - src\libjin\3rdparty\stb - - - src\libjin\3rdparty\wav - - - src\libjin\3rdparty\tekcos - - - src\libjin\3rdparty\smount - - - src\libjin\Graphics - - - src\libjin\Graphics - - - src\libjin\Graphics - - - src\libjin\Graphics - - - src\libjin\Graphics - - - src\libjin\Graphics - - - src\libjin\Graphics - - - src\libjin\Time - - - src\libjin\Net - src\lua\modules\audio @@ -315,182 +141,11 @@ src\lua\modules - - src\libjin\Common - - - src\libjin\Common - - - src\libjin - - - src\libjin - - - src\libjin\Tools\EventMsgCenter - - - src\libjin\Audio - - - src\libjin\Audio - - - src\libjin\Core - - - src\libjin\Core - - - src\libjin\Debug - - - src\libjin\Debug - - - src\libjin\Filesystem - - - src\libjin\Filesystem - - - src\libjin\Input - - - src\libjin\Input - - - src\libjin\Input - - - src\libjin\Input - - - src\libjin\Input - - - src\libjin\Math - - - src\libjin\Math - - - src\libjin\Math - - - src\libjin\Math - - - src\libjin\Math - - - src\libjin\Net - - - src\libjin\Physics - - - src\libjin\Physics - - - src\libjin\Thread - - - src\libjin\Tilemap - - - src\libjin\UI - - - src\libjin\Utils - - - src\libjin\Utils - - - src\libjin\Utils - - - src\libjin\Utils - - - src\libjin\Audio\SDL - - - src\libjin\Audio\SDL - - - src\libjin\Audio\OpenAL - - - src\libjin\Audio\OpenAL - - - src\libjin\3rdparty\GLee - - - src\libjin\3rdparty\stb - - - src\libjin\3rdparty\stb - - - src\libjin\3rdparty\wav - - - src\libjin\3rdparty\tekcos - - - src\libjin\3rdparty\smount - - - src\libjin\3rdparty\smount - - - src\libjin\Graphics - - - src\libjin\Graphics - - - src\libjin\Graphics - - - src\libjin\Graphics - - - src\libjin\Graphics - - - src\libjin\Graphics - - - src\libjin\Graphics - - - src\libjin\Graphics - - - src\libjin\Graphics - - - src\libjin\Time - - - src\libjin\Common - - - src\libjin\Common - res - - src\libjin\Net - src\lua\common @@ -545,20 +200,6 @@ src\lua\modules - - src\libjin\Common - - - src\libjin\Common - - - src\libjin\Common - - - - - src\libjin - diff --git a/build/vs2015/libjin/libjin.vcxproj b/build/vs2015/libjin/libjin.vcxproj new file mode 100644 index 0000000..97562ee --- /dev/null +++ b/build/vs2015/libjin/libjin.vcxproj @@ -0,0 +1,233 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {9EE02090-C15E-4520-9C05-C435E45EF2FC} + libjin + 10.0.17134.0 + + + + StaticLibrary + true + v141 + MultiByte + + + StaticLibrary + false + v141 + true + MultiByte + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + + + + + + + + + + + + + + + + + + + $(SolutionDir)..\..\bin + + + $(SolutionDir)..\..\bin + + + + Level3 + MinSpace + true + true + true + true + CompileAsCpp + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(SolutionDir)libs\SDL2-2.0.5\include;%(AdditionalIncludeDirectories) + $(IntDir)/%(RelativeDir)/ + Size + + + true + true + + + + + Level3 + Disabled + true + true + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + $(SolutionDir)libs\SDL2-2.0.5\include;%(AdditionalIncludeDirectories) + CompileAsCpp + $(IntDir)/%(RelativeDir)/ + + + + + Level3 + Disabled + true + true + + + + + Level3 + MaxSpeed + true + true + true + true + + + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build/vs2015/libjin/libjin.vcxproj.filters b/build/vs2015/libjin/libjin.vcxproj.filters new file mode 100644 index 0000000..5d35e1e --- /dev/null +++ b/build/vs2015/libjin/libjin.vcxproj.filters @@ -0,0 +1,368 @@ + + + + + {708c6303-1b76-4db4-bac5-be6fa9179e98} + + + {27146cd2-84fe-4eaf-a45b-641a463d381b} + + + {2dc5e4ca-0904-4b49-8043-5d02db438008} + + + {5a317104-8e72-4adf-9ba5-73fc7ba5f08a} + + + {908f94da-1fc4-42db-abe9-8c8e17051f9d} + + + {c002d452-c7a0-4161-a419-c10fd3d1c297} + + + {aa4b3ca5-8f5b-4150-9482-21d3aa6eb902} + + + {3a98cf95-d45a-4a0e-b3fe-65b5accdb75f} + + + {e4d464ae-1cb5-47fd-b24a-fd35708aead0} + + + {17b71ceb-a8ff-4ec0-aa18-b51e265bec34} + + + {125ecddc-2a19-4da8-9e81-da40ccfb1be7} + + + {37300e86-d766-4c21-b632-4963fe62684c} + + + {5d5c96c3-1065-4e74-9521-f4d756d4057f} + + + {7a39e6c4-8899-4bb7-bbad-cfb294fcd729} + + + {aa8fe913-0a49-4fed-8ad8-92a8339e9ed7} + + + {6d942940-9b42-49b8-82d0-d5495254dc99} + + + {6340a8aa-ed06-4090-849e-cd7b2def4ba7} + + + {6259760f-501a-4b52-b9a1-4abb4d788a99} + + + {3634a892-8e97-442c-b855-80a26dff2143} + + + {230b5ce5-8893-4aed-8f96-576d5f0aa3a2} + + + {d3f9b98c-e18c-4603-be4a-40cf5270c8a0} + + + {6f4aa0ff-3d1b-40ff-8da9-ce7292ac83b2} + + + {06d4dd93-7a6d-4b9e-a841-c7f8fbccafe0} + + + {60deec03-f023-4417-a058-c955d23f01d4} + + + {bb6c372a-520b-4de3-ab14-64839a6166d9} + + + {e11ee8ea-9e7d-4906-a6fd-8df56cb6a3e9} + + + + + Source + + + Source + + + Source\Audio + + + Source\Audio + + + Source\Audio\SDL + + + Source\Audio\SDL + + + Source\Audio\OpenAL + + + Source\Audio\OpenAL + + + Source\Common + + + Source\Common + + + Source\Common + + + Source\Common + + + Source\Common + + + Source\Core + + + Source\Core + + + Source\Debug + + + Source\Debug + + + Source\Filesystem + + + Source\Filesystem + + + Source\Input + + + Source\Input + + + Source\Input + + + Source\Input + + + Source\Input + + + Source\Math + + + Source\Math + + + Source\Math + + + Source\Math + + + Source\Math + + + Source\Net + + + Source\Net + + + Source\Physics + + + Source\Physics + + + Source\Thread + + + Source\Tilemap + + + Source\Tools\EventMsgCenter + + + Source\UI + + + Source\Utils + + + Source\Utils + + + Source\Utils + + + Source\Utils + + + Source\3rdparty\GLee + + + Source\3rdparty\stb + + + Source\3rdparty\stb + + + Source\3rdparty\wav + + + Source\3rdparty\tekcos + + + Source\3rdparty\smount + + + Source\3rdparty\smount + + + Source\Graphics + + + Source\Graphics + + + Source\Graphics + + + Source\Graphics + + + Source\Graphics + + + Source\Graphics + + + Source\Graphics + + + Source\Graphics + + + Source\Graphics + + + Source\Time + + + + + Source + + + + + Source\Audio + + + Source\Audio + + + Source\Audio\SDL + + + Source\Audio\SDL + + + Source\Audio\OpenAL + + + Source\Audio\OpenAL + + + Source\Common + + + Source\Common + + + Source\Core + + + Source\Filesystem + + + Source\Input + + + Source\Input + + + Source\Input + + + Source\Input + + + Source\Math + + + Source\Math + + + Source\Net + + + Source\Net + + + Source\Thread + + + Source\Utils + + + Source\Utils + + + Source\3rdparty\GLee + + + Source\3rdparty\stb + + + Source\3rdparty\wav + + + Source\3rdparty\tekcos + + + Source\3rdparty\smount + + + Source\Graphics + + + Source\Graphics + + + Source\Graphics + + + Source\Graphics + + + Source\Graphics + + + Source\Graphics + + + Source\Graphics + + + Source\Time + + + \ No newline at end of file diff --git a/build/vs2015/libjin/libjin.vcxproj.user b/build/vs2015/libjin/libjin.vcxproj.user new file mode 100644 index 0000000..be25078 --- /dev/null +++ b/build/vs2015/libjin/libjin.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file -- cgit v1.1-26-g67d0