diff --git a/AI/BattleAI/BattleAI.vcxproj b/AI/BattleAI/BattleAI.vcxproj index d9d373681..86c8798ee 100644 --- a/AI/BattleAI/BattleAI.vcxproj +++ b/AI/BattleAI/BattleAI.vcxproj @@ -21,6 +21,7 @@ {C0300513-E845-43B4-9A4F-E8817EAEF57C} BattleAI + 8.1 @@ -40,7 +41,7 @@ false true MultiByte - v140_xp + v140 DynamicLibrary @@ -80,7 +81,7 @@ $(VCMI_Out)\AI\ - .. + $(VCMI_Out)/AI $(VCMI_Out)\AI\ @@ -112,12 +113,11 @@ Use StdInc.h - /Zm159 %(AdditionalOptions) true VCMI_lib.lib;%(AdditionalDependencies) - ..\..\..\libs;..\.. + $(VCMI_Out) diff --git a/AI/EmptyAI/EmptyAI.vcxproj b/AI/EmptyAI/EmptyAI.vcxproj index 6f9c4b7c0..28b366cf5 100644 --- a/AI/EmptyAI/EmptyAI.vcxproj +++ b/AI/EmptyAI/EmptyAI.vcxproj @@ -35,6 +35,7 @@ {C41C4EB6-6F74-4F37-9FB0-9FA6BF377837} EmptyAI + 8.1 @@ -54,7 +55,7 @@ false true MultiByte - v140_xp + v140 DynamicLibrary @@ -96,7 +97,7 @@ $(VCMI_Out)\AI\ - .. + $(VCMI_Out)/AI $(VCMI_Out)\AI\ @@ -143,7 +144,6 @@ Use StdInc.h _WINDLL;%(PreprocessorDefinitions) - /Zm130 %(AdditionalOptions) true @@ -152,7 +152,7 @@ true VCMI_lib.lib;%(AdditionalDependencies) $(OutDir)EmptyAI.dll - ..\..\..\libs;..\.. + $(VCMI_Out) diff --git a/AI/StupidAI/StupidAI.vcxproj b/AI/StupidAI/StupidAI.vcxproj index 2ecb3a53e..0fa8cf3a3 100644 --- a/AI/StupidAI/StupidAI.vcxproj +++ b/AI/StupidAI/StupidAI.vcxproj @@ -21,6 +21,7 @@ {15DABC90-234A-4B6B-9EEB-777C4768B82B} StupidAI + 8.1 @@ -40,7 +41,7 @@ false true MultiByte - v140_xp + v140 DynamicLibrary @@ -80,7 +81,7 @@ $(VCMI_Out)\AI\ - .. + $(VCMI_Out)/AI $(VCMI_Out)\AI\ @@ -111,12 +112,11 @@ Use StdInc.h - /Zm150 %(AdditionalOptions) true VCMI_lib.lib;%(AdditionalDependencies) - ..\..\..\libs;..\.. + $(VCMI_Out) diff --git a/AI/VCAI/VCAI.vcxproj b/AI/VCAI/VCAI.vcxproj index db201b92a..7a6260936 100644 --- a/AI/VCAI/VCAI.vcxproj +++ b/AI/VCAI/VCAI.vcxproj @@ -21,6 +21,7 @@ {276C3DB0-7A6B-4417-8E5C-322B08633AAC} StupidAI + 8.1 @@ -40,7 +41,7 @@ false true MultiByte - v140_xp + v140 DynamicLibrary @@ -80,7 +81,7 @@ $(VCMI_Out)\AI\ - .. + $(VCMI_Out)/AI $(VCMI_Out)\AI\ @@ -112,15 +113,14 @@ - $(FUZZYLITEDIR) + ..\FuzzyLite\fuzzylite Use StdInc.h - /Zm199 %(AdditionalOptions) true VCMI_lib.lib;FuzzyLite.lib;%(AdditionalDependencies) - ..\..\..\libs;..\..;.. + $(VCMI_Out);$(SolutionDir)\AI diff --git a/VCMI_global_debug.props b/VCMI_global_debug.props index 6badbd11e..1c498039f 100644 --- a/VCMI_global_debug.props +++ b/VCMI_global_debug.props @@ -1,9 +1,6 @@  - - $(SolutionDir) - @@ -13,10 +10,4 @@ true - - - $(VCMI_Out) - true - - \ No newline at end of file diff --git a/VCMI_global_release.props b/VCMI_global_release.props index 66fc0b976..96f092358 100644 --- a/VCMI_global_release.props +++ b/VCMI_global_release.props @@ -1,9 +1,6 @@  - - C:\Temp\RD - @@ -29,9 +26,4 @@ true - - - $(VCMI_Out) - - \ No newline at end of file diff --git a/VCMI_global_user.props b/VCMI_global_user.props index ff50d9f7c..33f02d813 100644 --- a/VCMI_global_user.props +++ b/VCMI_global_user.props @@ -2,7 +2,8 @@ - C:\Qt\Qt5.1.0-32-no-opengl\5.1.0\msvc2012\ + D:\Program files co nie\Qt\5.9.1\msvc2015\ + D:\VCMI\vcmi_devversion @@ -10,5 +11,9 @@ $(QTDIR) + + $(VCMI_Out) + true + \ No newline at end of file diff --git a/client/VCMI_client.vcxproj b/client/VCMI_client.vcxproj index 8498ff874..158049926 100644 --- a/client/VCMI_client.vcxproj +++ b/client/VCMI_client.vcxproj @@ -21,13 +21,14 @@ {8355EBA8-65C2-44A4-BC2D-78053E1BF2D6} VCMI_client + 8.1 Application Unicode true - v140_xp + v140 Application @@ -75,7 +76,7 @@ $(VCMI_Out) $(Configuration)\ $(Configuration)\ - .. + $(VCMI_Out) $(VCMI_Out) $(Configuration)\ $(Configuration)\ @@ -141,7 +142,8 @@ Use StdInc.h - /MP4 /Zm150 + + $(FFMPEGDIR);$(SDLDIR);$(BOOSTDIR);$(AdditionalIncludeDirectories) true @@ -151,7 +153,7 @@ NotSet - $(FFMPEGDIR)\lib;.;..\..\libs;.. + $(VCMI_Out) false true /LTCG %(AdditionalOptions) diff --git a/launcher/VCMI_launcher.vcxproj b/launcher/VCMI_launcher.vcxproj index 7aa1c13a7..15ba80aac 100644 --- a/launcher/VCMI_launcher.vcxproj +++ b/launcher/VCMI_launcher.vcxproj @@ -14,6 +14,7 @@ {5B6946C8-A24F-4223-8415-5E16A238ACED} Win32Proj VCMI_launcher + 8.1 @@ -50,11 +51,11 @@ - .\GeneratedFiles;D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include\QtGui;D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include\QtCore;D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include\QtANGLE;D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include\QtWidgets;D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include;$(IncludePath) + $(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;.\GeneratedFiles;$(IncludePath) - D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\lib;$(LibraryPath) - .. + $(QTDIR)\lib;$(LibraryPath) + $(VCMI_Out) @@ -73,13 +74,12 @@ Use Full StdInc.h - /Zm150 %(AdditionalOptions) %(PreprocessorDefinitions) true VCMI_lib.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5Network.lib;SDL2.lib;%(AdditionalDependencies) - ..\..\libs;.. + $(VCMI_Out) @@ -133,10 +133,10 @@ Calling D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\bin\moc.exe for %(Filename) file... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp "D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fStdInc.h" "-f..\..\%(RecursiveDir)%(Filename).h" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-ID:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-ID:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include\QtCore" "-ID:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include\QtGui" "-ID:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include\QtWidgets" "-ID:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include\QtSvg" - D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\bin\moc.exe;%(FullPath) - Calling D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\bin\moc.exe for %(Filename) file... + $(QTDIR)\bin\moc.exe;%(FullPath) + Calling $(QTDIR)\bin\moc.exe for %(Filename) file... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fStdInc.h" "-f..\..\%(RecursiveDir)%(Filename).h" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-ID:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-ID:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include\QtCore" "-ID:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include\QtGui" "-ID:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include\QtWidgets" "-ID:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\include\QtSvg" + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fStdInc.h" "-f..\..\%(RecursiveDir)%(Filename).h" -DUNICODE -DWIN32 -DWIN64 -DQT_DLL -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SVG_LIB "-I.\GeneratedFiles" "-I." "-IC:\Qt\Qt5.8.0\5.8\msvc2015\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-IC:\Qt\Qt5.8.0\5.8\msvc2015\include\QtCore" "-IC:\Qt\Qt5.8.0\5.8\msvc2015\include\QtGui" "-IC:\Qt\Qt5.8.0\5.8\msvc2015\include\QtWidgets" "-IC:\Qt\Qt5.8.0\5.8\msvc2015\include\QtSvg" D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\bin\moc.exe;%(FullPath) Calling D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\bin\moc.exe for %(Filename) file... .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp @@ -153,10 +153,10 @@ Uic%27ing %(Identity)... .\GeneratedFiles\ui_%(Filename).h;%(Outputs) "D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\bin\uic.exe;%(AdditionalInputs) + $(QTDIR)\bin\uic.exe;%(AdditionalInputs) Uic%27ing %(Identity)... .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" + "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" D:\Programowanie\Biblioteki\QT\5.1.1\msvc2012\bin\uic.exe;%(AdditionalInputs) Uic%27ing %(Identity)... .\GeneratedFiles\ui_%(Filename).h;%(Outputs) diff --git a/lib/VCMI_lib.vcxproj b/lib/VCMI_lib.vcxproj index a850c5763..956822e31 100644 --- a/lib/VCMI_lib.vcxproj +++ b/lib/VCMI_lib.vcxproj @@ -21,13 +21,14 @@ {B952FFC5-3039-4DE1-9F08-90ACDA483D8F} VCMI_lib + 8.1 DynamicLibrary Unicode true - v140_xp + v140 DynamicLibrary @@ -76,7 +77,7 @@ $(VCMI_Out) $(Configuration)\ $(Configuration)\ - .. + $(VCMI_Out) $(VCMI_Out) $(Configuration)\ $(Configuration)\ @@ -135,7 +136,7 @@ - /Oy- /bigobj /Zm150 + /Oy- /bigobj VCMI_DLL;VCMI_NO_EXTRA_VERSION;%(PreprocessorDefinitions) StdInc.h Use diff --git a/server/VCMI_server.vcxproj b/server/VCMI_server.vcxproj index 99cb82dc5..01b91f9c6 100644 --- a/server/VCMI_server.vcxproj +++ b/server/VCMI_server.vcxproj @@ -21,13 +21,14 @@ {8AF697C3-465E-4910-B31B-576A9ECDB309} VCMI_server + 8.1 Application MultiByte true - v140_xp + v140 Application @@ -75,7 +76,7 @@ $(VCMI_Out) $(Configuration)\ $(Configuration)\ - .. + $(VCMI_Out) $(VCMI_Out) $(Configuration)\ $(Configuration)\ @@ -124,7 +125,7 @@ - /Oy- %(AdditionalOptions)/Zm200 + /Oy- %(AdditionalOptions) 4251;%(DisableSpecificWarnings) Use StdInc.h @@ -132,7 +133,7 @@ VCMI_lib.lib;zlib.lib;%(AdditionalDependencies) - ..\..\libs;.. + $(VCMI_Out) diff --git a/test/Test.vcxproj b/test/Test.vcxproj index c4e7e9e8e..8f510110e 100644 --- a/test/Test.vcxproj +++ b/test/Test.vcxproj @@ -21,13 +21,14 @@ {BA25F3F0-EB87-4164-AAB9-073C50A3557A} VCMI_client + 8.1 Application Unicode true - v140_xp + v140 Application @@ -133,7 +134,8 @@ Use StdInc.h - /MP4 /Zm150 + + true