From 54550b50deda64db44071eaa99cf2c5f98efc168 Mon Sep 17 00:00:00 2001 From: Dydzio Date: Sun, 9 Jun 2019 17:28:55 +0200 Subject: [PATCH] Update VS files to 2019, partially fix test project --- AI/BattleAI/BattleAI.vcxproj | 5 +- AI/EmptyAI/EmptyAI.vcxproj | 4 +- AI/StupidAI/StupidAI.vcxproj | 4 +- AI/VCAI/VCAI.vcxproj | 6 +- client/VCMI_client.vcxproj | 7 +- launcher/VCMI_launcher.vcxproj | 6 +- lib/VCMI_lib.vcxproj | 4 +- lib/minizip/minizip.vcxproj | 10 +- scripting/erm/ERM.vcxproj | 10 +- server/VCMI_server.vcxproj | 4 +- test/Test.vcxproj | 74 +++++++++++- test/Test.vcxproj.filters | 211 ++++++++++++++++++++++++++++++++- 12 files changed, 310 insertions(+), 35 deletions(-) diff --git a/AI/BattleAI/BattleAI.vcxproj b/AI/BattleAI/BattleAI.vcxproj index c433a1868..9509985e6 100644 --- a/AI/BattleAI/BattleAI.vcxproj +++ b/AI/BattleAI/BattleAI.vcxproj @@ -21,7 +21,7 @@ {C0300513-E845-43B4-9A4F-E8817EAEF57C} BattleAI - 10.0.17763.0 + 10.0 @@ -41,7 +41,7 @@ false true MultiByte - v141 + v142 DynamicLibrary @@ -114,6 +114,7 @@ Use StdInc.h true + MaxSpeed VCMI_lib.lib;%(AdditionalDependencies) diff --git a/AI/EmptyAI/EmptyAI.vcxproj b/AI/EmptyAI/EmptyAI.vcxproj index 7415b66f3..42204cccd 100644 --- a/AI/EmptyAI/EmptyAI.vcxproj +++ b/AI/EmptyAI/EmptyAI.vcxproj @@ -35,7 +35,7 @@ {C41C4EB6-6F74-4F37-9FB0-9FA6BF377837} EmptyAI - 10.0.17763.0 + 10.0 @@ -55,7 +55,7 @@ false true MultiByte - v141 + v142 DynamicLibrary diff --git a/AI/StupidAI/StupidAI.vcxproj b/AI/StupidAI/StupidAI.vcxproj index a8df96baa..3cfcafb70 100644 --- a/AI/StupidAI/StupidAI.vcxproj +++ b/AI/StupidAI/StupidAI.vcxproj @@ -21,7 +21,7 @@ {15DABC90-234A-4B6B-9EEB-777C4768B82B} StupidAI - 10.0.17763.0 + 10.0 @@ -41,7 +41,7 @@ false true MultiByte - v141 + v142 DynamicLibrary diff --git a/AI/VCAI/VCAI.vcxproj b/AI/VCAI/VCAI.vcxproj index 5e902eeed..b3b127daa 100644 --- a/AI/VCAI/VCAI.vcxproj +++ b/AI/VCAI/VCAI.vcxproj @@ -21,7 +21,7 @@ {276C3DB0-7A6B-4417-8E5C-322B08633AAC} StupidAI - 10.0.17763.0 + 10.0 @@ -41,7 +41,7 @@ false true MultiByte - v141 + v142 DynamicLibrary @@ -117,7 +117,7 @@ Use StdInc.h true - MaxSpeed + Disabled VCMI_lib.lib;FuzzyLite.lib;%(AdditionalDependencies) diff --git a/client/VCMI_client.vcxproj b/client/VCMI_client.vcxproj index 7754b5d16..73de261cb 100644 --- a/client/VCMI_client.vcxproj +++ b/client/VCMI_client.vcxproj @@ -21,14 +21,14 @@ {8355EBA8-65C2-44A4-BC2D-78053E1BF2D6} VCMI_client - 10.0.17763.0 + 10.0 Application Unicode true - v141 + v142 Application @@ -146,6 +146,7 @@ $(FFMPEGDIR);$(SDLDIR);$(BOOSTDIR);$(AdditionalIncludeDirectories) true + Disabled avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;postproc.lib;swresample.lib;swscale.lib;zlib.lib;SDL2.lib;SDL2main.lib;VCMI_lib.lib;SDL2_mixer.lib;SDL2_image.lib;SDL2_ttf.lib;%(AdditionalDependencies) @@ -158,6 +159,7 @@ true MultiplyDefinedSymbolOnly /LTCG /d2:-notypeopt %(AdditionalOptions) + true @@ -176,6 +178,7 @@ NotSet + true diff --git a/launcher/VCMI_launcher.vcxproj b/launcher/VCMI_launcher.vcxproj index b71499ae9..cd98d119e 100644 --- a/launcher/VCMI_launcher.vcxproj +++ b/launcher/VCMI_launcher.vcxproj @@ -14,19 +14,19 @@ {5B6946C8-A24F-4223-8415-5E16A238ACED} Win32Proj VCMI_launcher - 10.0.17763.0 + 10.0 Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode diff --git a/lib/VCMI_lib.vcxproj b/lib/VCMI_lib.vcxproj index ec0427d79..21c719f94 100644 --- a/lib/VCMI_lib.vcxproj +++ b/lib/VCMI_lib.vcxproj @@ -21,14 +21,14 @@ {B952FFC5-3039-4DE1-9F08-90ACDA483D8F} VCMI_lib - 10.0.17763.0 + 10.0 DynamicLibrary Unicode true - v141 + v142 DynamicLibrary diff --git a/lib/minizip/minizip.vcxproj b/lib/minizip/minizip.vcxproj index 0d091d450..cab7d74a2 100644 --- a/lib/minizip/minizip.vcxproj +++ b/lib/minizip/minizip.vcxproj @@ -32,32 +32,32 @@ {AA3CC588-9D08-4178-A1E8-C71561E99723} Win32Proj minizip - 10.0.17763.0 + 10.0 DynamicLibrary true - v141 + v142 Unicode DynamicLibrary true - v141 + v142 Unicode DynamicLibrary false - v141 + v142 true Unicode DynamicLibrary false - v141 + v142 true Unicode diff --git a/scripting/erm/ERM.vcxproj b/scripting/erm/ERM.vcxproj index 88be2cad4..f2854e8b6 100644 --- a/scripting/erm/ERM.vcxproj +++ b/scripting/erm/ERM.vcxproj @@ -21,34 +21,34 @@ {8F202F43-106D-4F63-AD9D-B1D43E803E8C} ERM - 10.0.17763.0 + 10.0 DynamicLibrary true MultiByte - v141 + v142 DynamicLibrary true MultiByte - v141 + v142 DynamicLibrary false true MultiByte - v141 + v142 DynamicLibrary false true MultiByte - v141 + v142 diff --git a/server/VCMI_server.vcxproj b/server/VCMI_server.vcxproj index 1789ee446..6009d4c59 100644 --- a/server/VCMI_server.vcxproj +++ b/server/VCMI_server.vcxproj @@ -21,14 +21,14 @@ {8AF697C3-465E-4910-B31B-576A9ECDB309} VCMI_server - 10.0.17763.0 + 10.0 Application MultiByte true - v141 + v142 Application diff --git a/test/Test.vcxproj b/test/Test.vcxproj index 2ad153303..46d8c3ac4 100644 --- a/test/Test.vcxproj +++ b/test/Test.vcxproj @@ -21,14 +21,14 @@ {BA25F3F0-EB87-4164-AAB9-073C50A3557A} VCMI_client - 10.0.17763.0 + 10.0 Application Unicode true - v141 + v142 Application @@ -93,6 +93,9 @@ + + $(SolutionDir)\AI\FuzzyLite\fuzzylite;$(SolutionDir)\test\googletest\googlemock\include;$(SolutionDir)\test\googletest\googletest\include;$(IncludePath) + @@ -139,7 +142,7 @@ true - VCMI_lib.lib;%(AdditionalDependencies) + VCMI_lib.lib;VCAI.lib;FuzzyLite.lib;gmock.lib;gtest.lib;%(AdditionalDependencies) NotSet @@ -168,19 +171,80 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create Create Create Create + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/Test.vcxproj.filters b/test/Test.vcxproj.filters index 2fea96114..2b357e83a 100644 --- a/test/Test.vcxproj.filters +++ b/test/Test.vcxproj.filters @@ -1,13 +1,220 @@  - - + + + + map + + + map + + + map + + + battle + + + battle + + + battle + + + battle + + + battle + + + battle + + + game + + + spells\effects + + + spells\effects + + + spells\effects + + + spells\effects + + + spells\effects + + + spells\effects + + + spells\effects + + + spells\effects + + + spells\effects + + + spells\effects + + + spells\targetConditions + + + spells\targetConditions + + + spells\targetConditions + + + spells\targetConditions + + + spells\targetConditions + + + spells\targetConditions + + + spells\targetConditions + + + spells\targetConditions + + + spells\targetConditions + + + spells\targetConditions + + + spells\targetConditions + + + spells\targetConditions + + + spells + + + spells + + + vcai + + + vcai + + + vcai + + + mock + + + mock + + + mock + + + mock + + + + map + + + spells\effects + + + spells\targetConditions + + + vcai + + + vcai + + + vcai + + + vcai + + + mock + + + mock + + + mock + + + mock + + + mock + + + mock + + + mock + + + mock + + + mock + + + mock + + + mock + + + mock + + + + + {418ff473-dca6-4c43-bba7-d575536c5791} + + + {01a5ea57-0094-4f54-94a5-10184cb7518c} + + + {db53f45d-1e4d-4e6b-9bc1-fa0e15f1def2} + + + {9b00f38e-f370-413e-ad10-644a21be00b4} + + + {dc596868-45d4-4ee4-8191-34c2f76b47fc} + + + {ac23eabd-5463-468f-862e-38a0934b866e} + + + {f7e35d1b-7e06-4c22-a3a3-6f7d1357e028} + + + {53399b0b-1a51-43f7-91cc-4fc47dfbad84} + \ No newline at end of file