From 26a83d76800fc167f5bf17629a22a23e1577b6ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20W=2E=20Urba=C5=84czyk?= Date: Mon, 15 Aug 2011 21:53:03 +0000 Subject: [PATCH] http://forum.vcmi.eu/viewtopic.php?p=5956#5956 Significant changes in project files: * new library package required! URL: http://download.vcmi.eu/msvc-pack.7z * created VCMI_global.props property sheet for settings common to all VCMI projects * added configuration for x64 builds --- AI/GeniusAI/genius.vcxproj | 111 +++++++++++++++++++++-------- AI/StupidAI/StupidAI.vcxproj | 81 +++++++++++++++------ VCMI_VS10.sln | 44 ++++++------ VCMI_global.props | 16 +++++ client/VCMI_client.vcxproj | 130 +++++++++++++++++++++++----------- lib/VCMI_lib.vcxproj | 133 ++++++++++++++++++++++++----------- server/VCMI_server.vcxproj | 117 +++++++++++++++++++++--------- 7 files changed, 440 insertions(+), 192 deletions(-) create mode 100644 VCMI_global.props diff --git a/AI/GeniusAI/genius.vcxproj b/AI/GeniusAI/genius.vcxproj index 2ffd7cecc..67391a19f 100644 --- a/AI/GeniusAI/genius.vcxproj +++ b/AI/GeniusAI/genius.vcxproj @@ -5,13 +5,17 @@ Debug Win32 + + Debug + x64 + RD Win32 - - Release - Win32 + + RD + x64 @@ -25,7 +29,7 @@ Unicode true - + DynamicLibrary Unicode true @@ -34,52 +38,71 @@ DynamicLibrary Unicode + + DynamicLibrary + Unicode + + - + + + + + + + <_ProjectFileVersion>10.0.30128.1 $(SolutionDir)\AI\ + $(SolutionDir)\AI\ $(Configuration)\ + $(Configuration)\ true - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - false + true $(SolutionDir)$(Configuration)\bin\AI\ + $(SolutionDir)$(Configuration)\bin\AI\ $(Configuration)\ + $(Configuration)\ false + false false + false AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + - AllRules.ruleset - - - $(IncludePath) + $(IncludePath) + $(IncludePath) $(IncludePath) - $(LibraryPath) + $(IncludePath) $(LibraryPath) + $(LibraryPath) $(LibraryPath) + $(LibraryPath) Disabled - ../../../include;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;GENIUS_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -93,7 +116,7 @@ VCMI_lib.lib;%(AdditionalDependencies) $(OutDir)GeniusAI.dll - ../../../libs; ../../;%(AdditionalLibraryDirectories) + $(OutDir)..;%(AdditionalLibraryDirectories) true Windows @@ -102,29 +125,28 @@ false - + - Full - true - ..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;GENIUS_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDLL - true + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;GENIUS_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL - Level3 + Level4 ProgramDatabase 4512;%(DisableSpecificWarnings) VCMI_lib.lib;%(AdditionalDependencies) $(OutDir)GeniusAI.dll - ../../../libs; ../../;%(AdditionalLibraryDirectories) + $(OutDir)..;%(AdditionalLibraryDirectories) true Windows - true - true - MachineX86 + + + false @@ -132,7 +154,7 @@ /Oy- %(AdditionalOptions) Full true - ..\..\include;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;GENIUS_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -148,7 +170,7 @@ VCMI_lib.lib;%(AdditionalDependencies) $(OutDir)GeniusAI.dll - ../../../libs; ../../;%(AdditionalLibraryDirectories) + $(OutDir)..;%(AdditionalLibraryDirectories) true true Windows @@ -157,6 +179,35 @@ MachineX86 + + + /Oy- %(AdditionalOptions) + Full + true + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;GENIUS_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + All + $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\GeniusAI.pdb + Level3 + ProgramDatabase + 4512;%(DisableSpecificWarnings) + + + VCMI_lib.lib;%(AdditionalDependencies) + $(OutDir)GeniusAI.dll + $(OutDir)..;%(AdditionalLibraryDirectories) + true + true + Windows + true + true + + diff --git a/AI/StupidAI/StupidAI.vcxproj b/AI/StupidAI/StupidAI.vcxproj index 9bc19d6b5..022a23eab 100644 --- a/AI/StupidAI/StupidAI.vcxproj +++ b/AI/StupidAI/StupidAI.vcxproj @@ -5,13 +5,17 @@ Debug Win32 + + Debug + x64 + RD Win32 - - Release - Win32 + + RD + x64 @@ -24,13 +28,18 @@ true MultiByte - + + DynamicLibrary + true + MultiByte + + DynamicLibrary false true MultiByte - + DynamicLibrary false true @@ -41,12 +50,19 @@ + - + + + + + + + @@ -54,48 +70,49 @@ $(IncludePath) $(LibraryPath) + + $(SolutionDir)\AI\ + $(IncludePath) + $(LibraryPath) + $(SolutionDir)$(Configuration)\bin\AI\ $(IncludePath) $(LibraryPath) - + + $(SolutionDir)$(Configuration)\bin\AI\ $(IncludePath) - - $(LibraryPath) Level3 Disabled - ../../../include; + %(AdditionalIncludeDirectories) Use stdafx.h true VCMI_lib.lib;%(AdditionalDependencies) - ../../../libs; ../../; + $(OutDir)..;%(AdditionalLibraryDirectories) $(OutDir)StupidAI.dll - + Level3 - MaxSpeed - true - true - ../../../include; + Disabled + %(AdditionalIncludeDirectories) Use stdafx.h true - true - true VCMI_lib.lib;%(AdditionalDependencies) - ../../../libs; ../../; + $(OutDir)..;%(AdditionalLibraryDirectories) + $(OutDir)StupidAI.dll @@ -104,7 +121,7 @@ MaxSpeed true true - ../../../include; + %(AdditionalIncludeDirectories) Use stdafx.h @@ -113,7 +130,26 @@ true true VCMI_lib.lib;%(AdditionalDependencies) - ../../../libs; ../../; + $(OutDir)..;%(AdditionalLibraryDirectories) + $(OutDir)StupidAI.dll + + + + + Level3 + MaxSpeed + true + true + %(AdditionalIncludeDirectories) + Use + stdafx.h + + + true + true + true + VCMI_lib.lib;%(AdditionalDependencies) + $(OutDir)..;%(AdditionalLibraryDirectories) $(OutDir)StupidAI.dll @@ -121,8 +157,9 @@ Create - Create + Create Create + Create diff --git a/VCMI_VS10.sln b/VCMI_VS10.sln index fc3da2409..d7e23bf33 100644 --- a/VCMI_VS10.sln +++ b/VCMI_VS10.sln @@ -14,54 +14,54 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StupidAI", "AI\StupidAI\Stu {B952FFC5-3039-4DE1-9F08-90ACDA483D8F} = {B952FFC5-3039-4DE1-9F08-90ACDA483D8F} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ERM", "Scripting\ERM\ERM.vcxproj", "{8F202F43-106D-4F63-AD9D-B1D43E803E8C}" - ProjectSection(ProjectDependencies) = postProject - {B952FFC5-3039-4DE1-9F08-90ACDA483D8F} = {B952FFC5-3039-4DE1-9F08-90ACDA483D8F} - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 RD|Win32 = RD|Win32 - Release|Win32 = Release|Win32 + RD|x64 = RD|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {8355EBA8-65C2-44A4-BC2D-78053E1BF2D6}.Debug|Win32.ActiveCfg = Debug|Win32 {8355EBA8-65C2-44A4-BC2D-78053E1BF2D6}.Debug|Win32.Build.0 = Debug|Win32 + {8355EBA8-65C2-44A4-BC2D-78053E1BF2D6}.Debug|x64.ActiveCfg = Debug|x64 + {8355EBA8-65C2-44A4-BC2D-78053E1BF2D6}.Debug|x64.Build.0 = Debug|x64 {8355EBA8-65C2-44A4-BC2D-78053E1BF2D6}.RD|Win32.ActiveCfg = RD|Win32 {8355EBA8-65C2-44A4-BC2D-78053E1BF2D6}.RD|Win32.Build.0 = RD|Win32 - {8355EBA8-65C2-44A4-BC2D-78053E1BF2D6}.Release|Win32.ActiveCfg = Release|Win32 - {8355EBA8-65C2-44A4-BC2D-78053E1BF2D6}.Release|Win32.Build.0 = Release|Win32 + {8355EBA8-65C2-44A4-BC2D-78053E1BF2D6}.RD|x64.ActiveCfg = RD|x64 + {8355EBA8-65C2-44A4-BC2D-78053E1BF2D6}.RD|x64.Build.0 = RD|x64 {B952FFC5-3039-4DE1-9F08-90ACDA483D8F}.Debug|Win32.ActiveCfg = Debug|Win32 {B952FFC5-3039-4DE1-9F08-90ACDA483D8F}.Debug|Win32.Build.0 = Debug|Win32 + {B952FFC5-3039-4DE1-9F08-90ACDA483D8F}.Debug|x64.ActiveCfg = Debug|x64 + {B952FFC5-3039-4DE1-9F08-90ACDA483D8F}.Debug|x64.Build.0 = Debug|x64 {B952FFC5-3039-4DE1-9F08-90ACDA483D8F}.RD|Win32.ActiveCfg = RD|Win32 {B952FFC5-3039-4DE1-9F08-90ACDA483D8F}.RD|Win32.Build.0 = RD|Win32 - {B952FFC5-3039-4DE1-9F08-90ACDA483D8F}.Release|Win32.ActiveCfg = Release|Win32 - {B952FFC5-3039-4DE1-9F08-90ACDA483D8F}.Release|Win32.Build.0 = Release|Win32 + {B952FFC5-3039-4DE1-9F08-90ACDA483D8F}.RD|x64.ActiveCfg = RD|x64 + {B952FFC5-3039-4DE1-9F08-90ACDA483D8F}.RD|x64.Build.0 = RD|x64 {8AF697C3-465E-4910-B31B-576A9ECDB309}.Debug|Win32.ActiveCfg = Debug|Win32 {8AF697C3-465E-4910-B31B-576A9ECDB309}.Debug|Win32.Build.0 = Debug|Win32 + {8AF697C3-465E-4910-B31B-576A9ECDB309}.Debug|x64.ActiveCfg = Debug|x64 + {8AF697C3-465E-4910-B31B-576A9ECDB309}.Debug|x64.Build.0 = Debug|x64 {8AF697C3-465E-4910-B31B-576A9ECDB309}.RD|Win32.ActiveCfg = RD|Win32 {8AF697C3-465E-4910-B31B-576A9ECDB309}.RD|Win32.Build.0 = RD|Win32 - {8AF697C3-465E-4910-B31B-576A9ECDB309}.Release|Win32.ActiveCfg = Release|Win32 - {8AF697C3-465E-4910-B31B-576A9ECDB309}.Release|Win32.Build.0 = Release|Win32 + {8AF697C3-465E-4910-B31B-576A9ECDB309}.RD|x64.ActiveCfg = RD|x64 + {8AF697C3-465E-4910-B31B-576A9ECDB309}.RD|x64.Build.0 = RD|x64 {B6A14ED9-E7C1-411B-A596-2FE90B3145B4}.Debug|Win32.ActiveCfg = Debug|Win32 {B6A14ED9-E7C1-411B-A596-2FE90B3145B4}.Debug|Win32.Build.0 = Debug|Win32 + {B6A14ED9-E7C1-411B-A596-2FE90B3145B4}.Debug|x64.ActiveCfg = Debug|x64 + {B6A14ED9-E7C1-411B-A596-2FE90B3145B4}.Debug|x64.Build.0 = Debug|x64 {B6A14ED9-E7C1-411B-A596-2FE90B3145B4}.RD|Win32.ActiveCfg = RD|Win32 {B6A14ED9-E7C1-411B-A596-2FE90B3145B4}.RD|Win32.Build.0 = RD|Win32 - {B6A14ED9-E7C1-411B-A596-2FE90B3145B4}.Release|Win32.ActiveCfg = Release|Win32 - {B6A14ED9-E7C1-411B-A596-2FE90B3145B4}.Release|Win32.Build.0 = Release|Win32 + {B6A14ED9-E7C1-411B-A596-2FE90B3145B4}.RD|x64.ActiveCfg = RD|x64 + {B6A14ED9-E7C1-411B-A596-2FE90B3145B4}.RD|x64.Build.0 = RD|x64 {15DABC90-234A-4B6B-9EEB-777C4768B82B}.Debug|Win32.ActiveCfg = Debug|Win32 {15DABC90-234A-4B6B-9EEB-777C4768B82B}.Debug|Win32.Build.0 = Debug|Win32 + {15DABC90-234A-4B6B-9EEB-777C4768B82B}.Debug|x64.ActiveCfg = Debug|x64 + {15DABC90-234A-4B6B-9EEB-777C4768B82B}.Debug|x64.Build.0 = Debug|x64 {15DABC90-234A-4B6B-9EEB-777C4768B82B}.RD|Win32.ActiveCfg = RD|Win32 {15DABC90-234A-4B6B-9EEB-777C4768B82B}.RD|Win32.Build.0 = RD|Win32 - {15DABC90-234A-4B6B-9EEB-777C4768B82B}.Release|Win32.ActiveCfg = Release|Win32 - {15DABC90-234A-4B6B-9EEB-777C4768B82B}.Release|Win32.Build.0 = Release|Win32 - {8F202F43-106D-4F63-AD9D-B1D43E803E8C}.Debug|Win32.ActiveCfg = Debug|Win32 - {8F202F43-106D-4F63-AD9D-B1D43E803E8C}.Debug|Win32.Build.0 = Debug|Win32 - {8F202F43-106D-4F63-AD9D-B1D43E803E8C}.RD|Win32.ActiveCfg = RD|Win32 - {8F202F43-106D-4F63-AD9D-B1D43E803E8C}.RD|Win32.Build.0 = RD|Win32 - {8F202F43-106D-4F63-AD9D-B1D43E803E8C}.Release|Win32.ActiveCfg = Release|Win32 - {8F202F43-106D-4F63-AD9D-B1D43E803E8C}.Release|Win32.Build.0 = Release|Win32 + {15DABC90-234A-4B6B-9EEB-777C4768B82B}.RD|x64.ActiveCfg = RD|x64 + {15DABC90-234A-4B6B-9EEB-777C4768B82B}.RD|x64.Build.0 = RD|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/VCMI_global.props b/VCMI_global.props new file mode 100644 index 000000000..8f2fe710f --- /dev/null +++ b/VCMI_global.props @@ -0,0 +1,16 @@ + + + + + + <_PropertySheetDisplayName>VCMI_global + $(SolutionDir)..\libs\$(PlatformShortName);$(LibraryPath) + $(SolutionDir)..\include;$(IncludePath) + + + + %(AdditionalLibraryDirectories) + + + + \ No newline at end of file diff --git a/client/VCMI_client.vcxproj b/client/VCMI_client.vcxproj index d263dac2e..2b7cdbafd 100644 --- a/client/VCMI_client.vcxproj +++ b/client/VCMI_client.vcxproj @@ -5,13 +5,17 @@ Debug Win32 + + Debug + x64 + RD Win32 - - Release - Win32 + + RD + x64 @@ -24,7 +28,7 @@ Unicode true - + Application Unicode true @@ -33,48 +37,66 @@ Application Unicode + + Application + Unicode + + - + + + + + + + <_ProjectFileVersion>10.0.30128.1 $(SolutionDir) + $(SolutionDir) $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ + $(Configuration)\ $(SolutionDir)$(Configuration)\bin\ + $(SolutionDir)$(Configuration)\bin\ $(Configuration)\ + $(Configuration)\ AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + - AllRules.ruleset - - + D:\Program Files\boost\boost_1_46_1;$(IncludePath) + $(IncludePath) D:\Program Files\boost\boost_1_46_1\stage\lib;$(LibraryPath) - C:\C++\boost_1_42_0;$(IncludePath) + $(LibraryPath) C:\C++\boost_1_42_0;$(IncludePath) - C:\C++\boost_1_42_0\stage\lib;$(LibraryPath) + C:\C++\boost_1_42_0;$(IncludePath) C:\C++\boost_1_42_0\stage\lib;$(LibraryPath) + C:\C++\boost_1_42_0\stage\lib;$(LibraryPath) /MP4 %(AdditionalOptions) Disabled - D:\Program Files\boost\boost_1_46_1;..\..\include;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) false false false @@ -86,9 +108,9 @@ NoListing - SDL.lib;zdll.lib;SDL_image.lib;SDL_ttf.lib;SDL_mixer.lib;VCMI_lib.lib;%(AdditionalDependencies) + SDL.lib;zlib.lib;SDL_image.lib;SDL_ttf.lib;SDL_mixer.lib;VCMI_lib.lib;%(AdditionalDependencies) NotSet - D:\Program Files\boost\boost_1_46_1\stage\lib;../../libs;../;%(AdditionalLibraryDirectories) + $(OutDir);%(AdditionalLibraryDirectories) true false MachineX86 @@ -98,34 +120,27 @@ $(ProjectDir)DPIaware.manifest;%(AdditionalManifestFiles) - + /MP4 %(AdditionalOptions) - Full - true - Speed - true - true - true - D:\Program Files\boost\boost_1_46_1;..\..\include;%(AdditionalIncludeDirectories) - true - Default - MultiThreadedDLL - false - NotSet - Level3 + Disabled + %(AdditionalIncludeDirectories) + false + false + false + EnableFastChecks + MultiThreadedDebugDLL + Level1 ProgramDatabase + 4251;%(DisableSpecificWarnings) + NoListing - SDL.lib;zdll.lib;SDL_image.lib;SDL_ttf.lib;SDL_mixer.lib;VCMI_lib.lib;%(AdditionalDependencies) - D:\Program Files\boost\boost_1_46_1\stage\lib;../../libs;../;%(AdditionalLibraryDirectories) + SDL.lib;zlib.lib;SDL_image.lib;SDL_ttf.lib;SDL_mixer.lib;VCMI_lib.lib;%(AdditionalDependencies) + LinkVerbose + $(OutDir);%(AdditionalLibraryDirectories) true - NotSet - true - true - - - MachineX86 + false true @@ -141,7 +156,7 @@ false true true - ..\..\include;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) true Default MultiThreadedDLL @@ -153,8 +168,8 @@ ProgramDatabase - SDL.lib;zdll.lib;SDL_image.lib;SDL_ttf.lib;SDL_mixer.lib;VCMI_lib.lib;%(AdditionalDependencies) - ../../libs;../RD/bin;%(AdditionalLibraryDirectories) + SDL.lib;zlib.lib;SDL_image.lib;SDL_ttf.lib;SDL_mixer.lib;VCMI_lib.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) true true NotSet @@ -167,9 +182,44 @@ NotSet + + + /Oy- %(AdditionalOptions) + Full + true + Speed + false + true + true + %(AdditionalIncludeDirectories) + true + Default + MultiThreadedDLL + false + NotSet + All + $(SolutionDir)$(Configuration)\ + Level3 + ProgramDatabase + + + SDL.lib;zlib.lib;SDL_image.lib;SDL_ttf.lib;SDL_mixer.lib;VCMI_lib.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + true + true + NotSet + true + true + + + true + NotSet + + false + false diff --git a/lib/VCMI_lib.vcxproj b/lib/VCMI_lib.vcxproj index 57afd9e4b..d113c93e3 100644 --- a/lib/VCMI_lib.vcxproj +++ b/lib/VCMI_lib.vcxproj @@ -5,13 +5,17 @@ Debug Win32 + + Debug + x64 + RD Win32 - - Release - Win32 + + RD + x64 @@ -24,7 +28,7 @@ Unicode true - + DynamicLibrary Unicode true @@ -33,49 +37,67 @@ DynamicLibrary MultiByte + + DynamicLibrary + MultiByte + + - + + + + + + + <_ProjectFileVersion>10.0.30128.1 $(SolutionDir) + $(SolutionDir) $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ + $(Configuration)\ $(SolutionDir)$(Configuration)\bin\ + $(SolutionDir)$(Configuration)\bin\ $(Configuration)\ + $(Configuration)\ AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + - AllRules.ruleset - - - $(IncludePath) + $(IncludePath) + $(IncludePath) $(IncludePath) - $(LibraryPath) + $(IncludePath) $(LibraryPath) + $(LibraryPath) $(LibraryPath) + $(LibraryPath) /MP4 %(AdditionalOptions) /bigobj Disabled - ..\..\include;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) false EnableFastChecks MultiThreadedDebugDLL @@ -87,42 +109,32 @@ false - SDL.lib;zdll.lib;SDL_image.lib;SDL_ttf.lib;%(AdditionalDependencies) - ../../libs;%(AdditionalLibraryDirectories) + zlib.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true MachineX86 - + - Full - true - Speed - true - true - true - ..\..\include;%(AdditionalIncludeDirectories) - true - false - Default - MultiThreadedDLL - false - Level3 - ProgramDatabase - /bigobj + /MP4 %(AdditionalOptions) /bigobj + Disabled + %(AdditionalIncludeDirectories) + false + EnableFastChecks + MultiThreadedDebugDLL + Level1 + ProgramDatabase + 4251;%(DisableSpecificWarnings) + false + NoListing + false - zdll.lib;%(AdditionalDependencies) - - - ../../libs;%(AdditionalLibraryDirectories) + zlib.lib;%(AdditionalDependencies) + %(AdditionalLibraryDirectories) true - true - true - - - MachineX86 @@ -135,7 +147,7 @@ false true true - ..\..\include;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) true false Default @@ -147,10 +159,10 @@ ProgramDatabase - zdll.lib;%(AdditionalDependencies) + zlib.lib;%(AdditionalDependencies) - ../../libs;%(AdditionalLibraryDirectories) + %(AdditionalLibraryDirectories) true true true @@ -161,6 +173,41 @@ true + + + /Oy- %(AdditionalOptions) /bigobj + + Full + true + Speed + false + true + true + %(AdditionalIncludeDirectories) + true + false + Default + MultiThreadedDLL + false + All + $(SolutionDir)$(Configuration)\ + Level3 + ProgramDatabase + + + zlib.lib;%(AdditionalDependencies) + + + %(AdditionalLibraryDirectories) + true + true + true + true + + + true + + diff --git a/server/VCMI_server.vcxproj b/server/VCMI_server.vcxproj index f6408aa1f..1a75b0046 100644 --- a/server/VCMI_server.vcxproj +++ b/server/VCMI_server.vcxproj @@ -5,13 +5,17 @@ Debug Win32 + + Debug + x64 + RD Win32 - - Release - Win32 + + RD + x64 @@ -24,7 +28,7 @@ MultiByte true - + Application MultiByte true @@ -33,48 +37,66 @@ Application Unicode + + Application + Unicode + + - + + + + + + + <_ProjectFileVersion>10.0.30128.1 $(SolutionDir) + $(SolutionDir) $(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ + $(Configuration)\ $(SolutionDir)$(Configuration)\bin\ + $(SolutionDir)$(Configuration)\bin\ $(Configuration)\ + $(Configuration)\ AllRules.ruleset + AllRules.ruleset + + AllRules.ruleset + AllRules.ruleset + - AllRules.ruleset - - - $(IncludePath) + $(IncludePath) + $(IncludePath) $(IncludePath) - $(LibraryPath) + $(IncludePath) $(LibraryPath) + $(LibraryPath) $(LibraryPath) + $(LibraryPath) /MP4 %(AdditionalOptions) Disabled - ..\..\include;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) false EnableFastChecks MultiThreadedDebugDLL @@ -85,36 +107,30 @@ stdafx.h - VCMI_lib.lib;zdll.lib;%(AdditionalDependencies) - ../../libs;../;%(AdditionalLibraryDirectories) + VCMI_lib.lib;zlib.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) true MachineX86 - + - MaxSpeed - true - Speed - true - true - ..\..\include;%(AdditionalIncludeDirectories) - true - MultiThreadedDLL - false - Level3 + /MP4 %(AdditionalOptions) + Disabled + %(AdditionalIncludeDirectories) + false + EnableFastChecks + MultiThreadedDebugDLL + Level1 ProgramDatabase 4251;%(DisableSpecificWarnings) Use stdafx.h - VCMI_lib.lib;zdll.lib;%(AdditionalDependencies) - ../../libs;../;%(AdditionalLibraryDirectories) + VCMI_lib.lib;zlib.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) true - true - true - MachineX86 @@ -125,7 +141,7 @@ Speed false true - ..\..\include;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) true MultiThreadedDLL false @@ -138,8 +154,8 @@ stdafx.h - VCMI_lib.lib;zdll.lib;%(AdditionalDependencies) - ../../libs;../;%(AdditionalLibraryDirectories) + VCMI_lib.lib;zlib.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) true true true @@ -148,14 +164,45 @@ true + + + /Oy- %(AdditionalOptions) + MaxSpeed + true + Speed + false + true + %(AdditionalIncludeDirectories) + true + MultiThreadedDLL + false + All + $(SolutionDir)$(Configuration)\ + Level3 + ProgramDatabase + 4251;%(DisableSpecificWarnings) + Use + stdafx.h + + + VCMI_lib.lib;zlib.lib;%(AdditionalDependencies) + $(OutDir);%(AdditionalLibraryDirectories) + true + true + true + true + true + + Create + Create Create - Create + Create