diff options
-rw-r--r-- | externals/ace/win/VC90/ace.vcproj | 71 | ||||
-rw-r--r-- | externals/bzip2/win/VC90/bzip2.vcproj | 18 | ||||
-rw-r--r-- | externals/g3dlite/win/VC90/g3dlite.vcproj | 70 | ||||
-rw-r--r-- | externals/libmpq/win/VC90/libmpq.vcproj | 19 | ||||
-rw-r--r-- | externals/sockets/win/VC90/sockets.vcproj | 50 | ||||
-rw-r--r-- | externals/zlib/win/VC90/zlib.vcproj | 31 | ||||
-rw-r--r-- | src/tools/ExtractorToolsVC90.sln | 48 | ||||
-rw-r--r-- | src/tools/map_extractor/VC90/VC90_ad.vcproj | 57 | ||||
-rw-r--r-- | src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj | 61 | ||||
-rw-r--r-- | src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj | 38 | ||||
-rw-r--r-- | src/tools/vmap3_extractor/vmapexport.cpp | 2 | ||||
-rw-r--r-- | win/VC90/TrinityCore.vcproj | 87 | ||||
-rw-r--r-- | win/VC90/TrinityRealm.vcproj | 78 | ||||
-rw-r--r-- | win/VC90/framework.vcproj | 491 | ||||
-rw-r--r-- | win/VC90/game.vcproj | 138 | ||||
-rw-r--r-- | win/VC90/genrevision.vcproj | 25 | ||||
-rw-r--r-- | win/VC90/shared.vcproj | 72 |
17 files changed, 497 insertions, 859 deletions
diff --git a/externals/ace/win/VC90/ace.vcproj b/externals/ace/win/VC90/ace.vcproj index 11574ef24b0..35ae4149a81 100644 --- a/externals/ace/win/VC90/ace.vcproj +++ b/externals/ace/win/VC90/ace.vcproj @@ -21,8 +21,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\ACE__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="2" CharacterSet="0" > @@ -79,7 +79,7 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(OutDir)\ACEd.dll" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\ACEd.dll" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="" @@ -112,8 +112,8 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\ACE__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="2" CharacterSet="0" > @@ -149,7 +149,7 @@ RuntimeLibrary="3" RuntimeTypeInfo="true" UsePrecompiledHeader="2" - PrecompiledHeaderThrough="WinAcePCH.h" + PrecompiledHeaderThrough="WinAcePCH.h" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -171,7 +171,7 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/machine:AMD64" - OutputFile="$(OutDir)\ACEd.dll" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\ACEd.dll" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="" @@ -204,8 +204,8 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\ACE__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="2" CharacterSet="0" > @@ -239,7 +239,7 @@ RuntimeLibrary="2" RuntimeTypeInfo="true" UsePrecompiledHeader="2" - PrecompiledHeaderThrough="WinAcePCH.h" + PrecompiledHeaderThrough="WinAcePCH.h" WarningLevel="3" Detect64BitPortabilityProblems="false" DisableSpecificWarnings="4355" @@ -259,7 +259,7 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(OutDir)\ACE.dll" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\ACE.dll" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="" @@ -294,8 +294,8 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\ACE__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="2" CharacterSet="0" > @@ -329,7 +329,7 @@ RuntimeLibrary="2" RuntimeTypeInfo="true" UsePrecompiledHeader="2" - PrecompiledHeaderThrough="WinAcePCH.h" + PrecompiledHeaderThrough="WinAcePCH.h" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -350,8 +350,9 @@ /> <Tool Name="VCLinkerTool" + LinkLibraryDependencies="true" AdditionalOptions="/machine:AMD64" - OutputFile="$(OutDir)\ACE.dll" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\ACE.dll" LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="" @@ -472,7 +473,7 @@ RelativePath="..\..\Atomic_Op_Sparc.c" > <FileConfiguration - Name="Debug" + Name="Debug|Win32" > <Tool Name="VCCLCompilerTool" @@ -480,7 +481,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release" + Name="Release|Win32" > <Tool Name="VCCLCompilerTool" @@ -1260,7 +1261,7 @@ RelativePath="..\..\Rtems_init.c" > <FileConfiguration - Name="Debug" + Name="Debug|Win32" > <Tool Name="VCCLCompilerTool" @@ -1268,7 +1269,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release" + Name="Release|Win32" > <Tool Name="VCCLCompilerTool" @@ -2894,11 +2895,11 @@ > </File> <File - RelativePath="..\..\os_include\os_errno.h" + RelativePath="..\..\OS_Errno.h" > </File> <File - RelativePath="..\..\OS_Errno.h" + RelativePath="..\..\os_include\os_errno.h" > </File> <File @@ -3278,11 +3279,11 @@ > </File> <File - RelativePath="..\..\OS_String.h" + RelativePath="..\..\os_include\os_string.h" > </File> <File - RelativePath="..\..\os_include\os_string.h" + RelativePath="..\..\OS_String.h" > </File> <File @@ -3326,11 +3327,11 @@ > </File> <File - RelativePath="..\..\os_include\sys\os_time.h" + RelativePath="..\..\os_include\os_time.h" > </File> <File - RelativePath="..\..\os_include\os_time.h" + RelativePath="..\..\os_include\sys\os_time.h" > </File> <File @@ -5231,7 +5232,23 @@ RelativePath="..\..\PrecompiledHeaders\WinAcePCH.cpp" > <FileConfiguration - Name="Debug" + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" > <Tool Name="VCCLCompilerTool" @@ -5239,7 +5256,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release" + Name="Release|x64" > <Tool Name="VCCLCompilerTool" diff --git a/externals/bzip2/win/VC90/bzip2.vcproj b/externals/bzip2/win/VC90/bzip2.vcproj index e51e847a2a4..de4ca649e37 100644 --- a/externals/bzip2/win/VC90/bzip2.vcproj +++ b/externals/bzip2/win/VC90/bzip2.vcproj @@ -45,12 +45,14 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" - MinimalRebuild="true" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" + EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -107,9 +109,11 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" + EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -148,7 +152,7 @@ IntermediateDirectory=".\bzip2__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="1" - WholeProgramOptimization="1" + WholeProgramOptimization="0" > <Tool Name="VCPreBuildEventTool" @@ -168,13 +172,17 @@ <Tool Name="VCCLCompilerTool" Optimization="2" - EnableIntrinsicFunctions="true" + EnableIntrinsicFunctions="false" + WholeProgramOptimization="false" AdditionalIncludeDirectories="" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="1" UsePrecompiledHeader="0" WarningLevel="3" - DebugInformationFormat="3" + DebugInformationFormat="0" /> <Tool Name="VCManagedResourceCompilerTool" diff --git a/externals/g3dlite/win/VC90/g3dlite.vcproj b/externals/g3dlite/win/VC90/g3dlite.vcproj index 318eefd1dd4..f70fd21cad8 100644 --- a/externals/g3dlite/win/VC90/g3dlite.vcproj +++ b/externals/g3dlite/win/VC90/g3dlite.vcproj @@ -21,8 +21,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="2" > @@ -47,14 +47,14 @@ Optimization="0" AdditionalIncludeDirectories="..\..\..\zlib\;" AdditionalUsingDirectories="" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB" MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" BufferSecurityCheck="true" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" - AssemblerListingLocation=".\g3dlite__$(PlatformName)_$(ConfigurationName)\" + AssemblerListingLocation="" ObjectFile=".\g3dlite__$(PlatformName)_$(ConfigurationName)\" ProgramDataBaseFileName=".\g3dlite__$(PlatformName)_$(ConfigurationName)\" WarningLevel="3" @@ -73,8 +73,9 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="false" OutputFile="$(OutDir)\$(ProjectName).lib" - IgnoreAllDefaultLibraries="true" + IgnoreAllDefaultLibraries="false" /> <Tool Name="VCALinkTool" @@ -93,9 +94,9 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)" + Name="Debug|x64" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="2" > @@ -113,17 +114,22 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" + Optimization="0" AdditionalIncludeDirectories="..\..\..\zlib\;" AdditionalUsingDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0" - RuntimeLibrary="2" - EnableEnhancedInstructionSet="1" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + MinimalRebuild="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" + EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" - AssemblerListingLocation=".\g3dlite__$(PlatformName)_$(ConfigurationName)\" + AssemblerListingLocation="" ObjectFile=".\g3dlite__$(PlatformName)_$(ConfigurationName)\" ProgramDataBaseFileName=".\g3dlite__$(PlatformName)_$(ConfigurationName)\" WarningLevel="3" @@ -142,8 +148,9 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="false" OutputFile="$(OutDir)\$(ProjectName).lib" - IgnoreAllDefaultLibraries="true" + IgnoreAllDefaultLibraries="false" /> <Tool Name="VCALinkTool" @@ -162,9 +169,9 @@ /> </Configuration> <Configuration - Name="Debug|x64" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)" + Name="Release|Win32" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="2" > @@ -182,27 +189,24 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="0" AdditionalIncludeDirectories="..\..\..\zlib\;" AdditionalUsingDirectories="" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="false" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - BufferSecurityCheck="true" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + StringPooling="true" + RuntimeLibrary="2" EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="1" UsePrecompiledHeader="0" - AssemblerListingLocation=".\g3dlite__$(PlatformName)_$(ConfigurationName)\" - ObjectFile=".\g3dlite__$(PlatformName)_$(ConfigurationName)\" - ProgramDataBaseFileName=".\g3dlite__$(PlatformName)_$(ConfigurationName)\" + AssemblerListingLocation="" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\vc90.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" + DebugInformationFormat="0" CallingConvention="0" /> <Tool @@ -216,8 +220,9 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="false" OutputFile="$(OutDir)\$(ProjectName).lib" - IgnoreAllDefaultLibraries="true" + IgnoreAllDefaultLibraries="false" /> <Tool Name="VCALinkTool" @@ -237,8 +242,8 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="2" > @@ -264,7 +269,9 @@ AdditionalIncludeDirectories="..\..\..\zlib\;" AdditionalUsingDirectories="" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0" + StringPooling="true" RuntimeLibrary="2" + EnableFunctionLevelLinking="true" EnableEnhancedInstructionSet="0" UsePrecompiledHeader="0" AssemblerListingLocation=".\g3dlite__$(PlatformName)_$(ConfigurationName)\" @@ -286,8 +293,9 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="false" OutputFile="$(OutDir)\$(ProjectName).lib" - IgnoreAllDefaultLibraries="true" + IgnoreAllDefaultLibraries="false" /> <Tool Name="VCALinkTool" diff --git a/externals/libmpq/win/VC90/libmpq.vcproj b/externals/libmpq/win/VC90/libmpq.vcproj index 975eac173a3..13ce6289775 100644 --- a/externals/libmpq/win/VC90/libmpq.vcproj +++ b/externals/libmpq/win/VC90/libmpq.vcproj @@ -41,10 +41,11 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\;..\..\..\bzip2;..\..\..\zlib" - PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS" - MinimalRebuild="true" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB" + MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" + EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" CompileAs="1" @@ -61,7 +62,7 @@ <Tool Name="VCLibrarianTool" LinkLibraryDependencies="true" - AdditionalLibraryDirectories="..\dep\lib\$(PlatformName)_$(ConfigurationName)" + AdditionalLibraryDirectories="" /> <Tool Name="VCALinkTool" @@ -85,7 +86,7 @@ IntermediateDirectory="..\bin\$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="1" - WholeProgramOptimization="1" + WholeProgramOptimization="0" > <Tool Name="VCPreBuildEventTool" @@ -105,14 +106,16 @@ <Tool Name="VCCLCompilerTool" Optimization="2" - EnableIntrinsicFunctions="true" + EnableIntrinsicFunctions="false" + WholeProgramOptimization="false" AdditionalIncludeDirectories="..\;..\..\..\bzip2;..\..\..\zlib" - PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS;_NDEBUG" + PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;_NDEBUG" + StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" EnableEnhancedInstructionSet="1" WarningLevel="3" - DebugInformationFormat="3" + DebugInformationFormat="0" CompileAs="1" /> <Tool @@ -127,7 +130,7 @@ <Tool Name="VCLibrarianTool" LinkLibraryDependencies="true" - AdditionalLibraryDirectories="..\dep\lib\$(PlatformName)_$(ConfigurationName)" + AdditionalLibraryDirectories="" /> <Tool Name="VCALinkTool" diff --git a/externals/sockets/win/VC90/sockets.vcproj b/externals/sockets/win/VC90/sockets.vcproj index f855843f5de..efa94ef78af 100644 --- a/externals/sockets/win/VC90/sockets.vcproj +++ b/externals/sockets/win/VC90/sockets.vcproj @@ -21,8 +21,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\sockets__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="2" > @@ -46,7 +46,7 @@ Optimization="0" AdditionalIncludeDirectories="..\..\include;" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" - MinimalRebuild="true" + MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" EnableFunctionLevelLinking="true" @@ -69,6 +69,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="false" OutputFile="$(OutDir)\$(ProjectName).lib" /> <Tool @@ -88,9 +89,9 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\sockets__$(PlatformName)_$(ConfigurationName)" + Name="Debug|x64" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="2" > @@ -108,14 +109,17 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/MP" + Optimization="0" AdditionalIncludeDirectories="..\..\include;" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" - RuntimeLibrary="2" - EnableEnhancedInstructionSet="1" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + MinimalRebuild="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\sockets__$(PlatformName)_$(ConfigurationName)\zlib.pch" @@ -135,6 +139,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="false" OutputFile="$(OutDir)\$(ProjectName).lib" /> <Tool @@ -154,9 +159,9 @@ /> </Configuration> <Configuration - Name="Debug|x64" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\sockets__$(PlatformName)_$(ConfigurationName)" + Name="Release|Win32" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="2" > @@ -174,17 +179,14 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - Optimization="0" + AdditionalOptions="/MP" AdditionalIncludeDirectories="..\..\include;" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - EnableFunctionLevelLinking="true" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" + RuntimeLibrary="2" + EnableEnhancedInstructionSet="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\sockets__$(PlatformName)_$(ConfigurationName)\zlib.pch" @@ -204,6 +206,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="false" OutputFile="$(OutDir)\$(ProjectName).lib" /> <Tool @@ -224,8 +227,8 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\sockets__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="2" > @@ -250,7 +253,9 @@ AdditionalOptions="/MP" AdditionalIncludeDirectories="..\..\include;" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" + StringPooling="true" RuntimeLibrary="2" + EnableFunctionLevelLinking="true" EnableEnhancedInstructionSet="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -271,6 +276,7 @@ /> <Tool Name="VCLibrarianTool" + LinkLibraryDependencies="false" OutputFile="$(OutDir)\$(ProjectName).lib" /> <Tool diff --git a/externals/zlib/win/VC90/zlib.vcproj b/externals/zlib/win/VC90/zlib.vcproj index 1b63254aa23..2b35253a7d0 100644 --- a/externals/zlib/win/VC90/zlib.vcproj +++ b/externals/zlib/win/VC90/zlib.vcproj @@ -21,8 +21,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="2" > @@ -46,7 +46,7 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" - MinimalRebuild="true" + MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" EnableFunctionLevelLinking="true" @@ -89,8 +89,8 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="2" > @@ -115,7 +115,7 @@ Optimization="0" AdditionalIncludeDirectories="" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" - MinimalRebuild="true" + MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" EnableFunctionLevelLinking="true" @@ -158,8 +158,8 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="2" > @@ -182,15 +182,17 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + StringPooling="true" RuntimeLibrary="2" + EnableFunctionLevelLinking="true" EnableEnhancedInstructionSet="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - PrecompiledHeaderFile=".\zlib__$(PlatformName)_$(ConfigurationName)\zlib.pch" + PrecompiledHeaderFile="" WarningLevel="3" Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" + DebugInformationFormat="0" CallingConvention="0" /> <Tool @@ -205,6 +207,7 @@ <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)\$(ProjectName).lib" + IgnoreAllDefaultLibraries="false" /> <Tool Name="VCALinkTool" @@ -224,8 +227,8 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" CharacterSet="2" > @@ -250,7 +253,9 @@ AdditionalOptions="/MP" AdditionalIncludeDirectories="" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" + StringPooling="true" RuntimeLibrary="2" + EnableFunctionLevelLinking="true" EnableEnhancedInstructionSet="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/src/tools/ExtractorToolsVC90.sln b/src/tools/ExtractorToolsVC90.sln index 6a31b5a1ddf..5887925dcf1 100644 --- a/src/tools/ExtractorToolsVC90.sln +++ b/src/tools/ExtractorToolsVC90.sln @@ -2,10 +2,36 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ad", "map_extractor\VC90\VC90_ad.vcproj", "{D7552D4F-408F-4F8E-859B-366659150CF4}" + ProjectSection(ProjectDependencies) = postProject + {03AB0F44-628E-4855-99A0-C98A1EB52C50} = {03AB0F44-628E-4855-99A0-C98A1EB52C50} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap_assembler", "vmap3_assembler\VC90\vmap_assembler.vcproj", "{572FFF74-480C-4472-8ABF-81733BB4049D}" + ProjectSection(ProjectDependencies) = postProject + {8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap3_extractor", "vmap3_extractor\VC90\vmap3_extractor.vcproj", "{502602CC-98EA-4335-B922-C5C1DBF37604}" + ProjectSection(ProjectDependencies) = postProject + {03AB0F44-628E-4855-99A0-C98A1EB52C50} = {03AB0F44-628E-4855-99A0-C98A1EB52C50} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmpq", "..\..\externals\libmpq\win\VC90\libmpq.vcproj", "{03AB0F44-628E-4855-99A0-C98A1EB52C50}" + ProjectSection(ProjectDependencies) = postProject + {CE773400-763E-4B71-B5E2-C9B60A752EB1} = {CE773400-763E-4B71-B5E2-C9B60A752EB1} + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "..\..\externals\bzip2\win\VC90\bzip2.vcproj", "{CE773400-763E-4B71-B5E2-C9B60A752EB1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\externals\zlib\win\VC90\zlib.vcproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "..\..\externals\g3dlite\win\VC90\g3dlite.vcproj", "{8072769E-CF10-48BF-B9E1-12752A5DAC6E}" + ProjectSection(ProjectDependencies) = postProject + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{69F789A6-BD04-454A-AC8E-A57AAE7FCF77}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -25,8 +51,30 @@ Global {502602CC-98EA-4335-B922-C5C1DBF37604}.Debug|Win32.Build.0 = Debug|Win32 {502602CC-98EA-4335-B922-C5C1DBF37604}.Release|Win32.ActiveCfg = Release|Win32 {502602CC-98EA-4335-B922-C5C1DBF37604}.Release|Win32.Build.0 = Release|Win32 + {03AB0F44-628E-4855-99A0-C98A1EB52C50}.Debug|Win32.ActiveCfg = Debug|Win32 + {03AB0F44-628E-4855-99A0-C98A1EB52C50}.Debug|Win32.Build.0 = Debug|Win32 + {03AB0F44-628E-4855-99A0-C98A1EB52C50}.Release|Win32.ActiveCfg = Release|Win32 + {03AB0F44-628E-4855-99A0-C98A1EB52C50}.Release|Win32.Build.0 = Release|Win32 + {CE773400-763E-4B71-B5E2-C9B60A752EB1}.Debug|Win32.ActiveCfg = Debug|Win32 + {CE773400-763E-4B71-B5E2-C9B60A752EB1}.Debug|Win32.Build.0 = Debug|Win32 + {CE773400-763E-4B71-B5E2-C9B60A752EB1}.Release|Win32.ActiveCfg = Release|Win32 + {CE773400-763E-4B71-B5E2-C9B60A752EB1}.Release|Win32.Build.0 = Release|Win32 + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32 + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32 + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32 + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32 + {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.ActiveCfg = Debug|Win32 + {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32 + {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32 + {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {CE773400-763E-4B71-B5E2-C9B60A752EB1} = {69F789A6-BD04-454A-AC8E-A57AAE7FCF77} + {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {69F789A6-BD04-454A-AC8E-A57AAE7FCF77} + {8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {69F789A6-BD04-454A-AC8E-A57AAE7FCF77} + {03AB0F44-628E-4855-99A0-C98A1EB52C50} = {69F789A6-BD04-454A-AC8E-A57AAE7FCF77} + EndGlobalSection EndGlobal diff --git a/src/tools/map_extractor/VC90/VC90_ad.vcproj b/src/tools/map_extractor/VC90/VC90_ad.vcproj index 83480dd3912..e875137556c 100644 --- a/src/tools/map_extractor/VC90/VC90_ad.vcproj +++ b/src/tools/map_extractor/VC90/VC90_ad.vcproj @@ -17,8 +17,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\ad__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\ad__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -49,12 +49,14 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\;..\..\..\..\externals;..\..\..\..\externals\libmpq;..\..\..\..\externals\libmpq\win;..\server\shared" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CONSOLE" + MinimalRebuild="false" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" + EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" PrecompiledHeaderFile="$(IntDir)\ad.pch" - AssemblerListingLocation="$(IntDir)\" + AssemblerListingLocation="" ObjectFile="$(IntDir)\" ProgramDataBaseFileName="$(IntDir)\" XMLDocumentationFileName="$(IntDir)\" @@ -62,7 +64,7 @@ BrowseInformationFile="" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -77,14 +79,13 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="bzip2.lib libmpq.lib zlib.lib" - OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\ad_debug.exe" - LinkIncremental="1" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName)_d.exe" + LinkIncremental="2" SuppressStartupBanner="true" - AdditionalLibraryDirectories=""..\..\..\..\externals\bzip2\bin\$(PlatformName)_$(ConfigurationName)";"..\..\..\..\externals\libmpq\bin\$(PlatformName)_$(ConfigurationName)";"..\..\..\..\externals\zlib\bin\$(PlatformName)_$(ConfigurationName)"" - IgnoreDefaultLibraryNames="LIBCD.lib;LIBCMTD.lib;MSVCRT.lib" + AdditionalLibraryDirectories="" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" - ProgramDatabaseFile="$(IntDir)\ad.pdb" + ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" SubSystem="1" RandomizedBaseAddress="1" DataExecutionPrevention="0" @@ -115,8 +116,8 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)\" - IntermediateDirectory="$(PlatformName)_$(ConfigurationName)\" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -145,16 +146,19 @@ /> <Tool Name="VCCLCompilerTool" - Optimization="3" - InlineFunctionExpansion="1" + Optimization="2" + InlineFunctionExpansion="0" AdditionalIncludeDirectories="..\;..\..\..\..\externals;..\..\..\..\externals\libmpq;..\..\..\..\externals\libmpq\win;..\server\shared" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" - RuntimeLibrary="0" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="1" UsePrecompiledHeader="0" - PrecompiledHeaderFile="$(IntDir)\ad.pch" - AssemblerListingLocation="$(IntDir)\" + PrecompiledHeaderFile="" + AssemblerListingLocation="" ObjectFile="$(IntDir)\" - ProgramDataBaseFileName="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\vc90.pdb" XMLDocumentationFileName="$(IntDir)\" BrowseInformation="0" WarningLevel="3" @@ -173,15 +177,16 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="bzip2.lib libmpq.lib zlib.lib" - OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\ad.exe" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories=""..\..\..\..\externals\bzip2\bin\$(PlatformName)_$(ConfigurationName)";"..\..\..\..\externals\libmpq\bin\$(PlatformName)_$(ConfigurationName)";"..\..\..\..\externals\zlib\bin\$(PlatformName)_$(ConfigurationName)"" - IgnoreDefaultLibraryNames="LIBCD.lib;LIBCMTD.lib;MSVCRT.lib" - GenerateDebugInformation="true" - ProgramDatabaseFile="$(IntDir)\ad.pdb" + AdditionalLibraryDirectories="" + IgnoreDefaultLibraryNames="" + GenerateDebugInformation="false" + ProgramDatabaseFile="" SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" RandomizedBaseAddress="1" DataExecutionPrevention="0" TargetMachine="1" diff --git a/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj b/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj index b7c0e7719b3..63a99dfa421 100644 --- a/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj +++ b/src/tools/vmap3_assembler/VC90/vmap_assembler.vcproj @@ -44,13 +44,14 @@ Optimization="0" AdditionalIncludeDirectories="..\..\..\..\externals;..\..\..\..\externals\g3dlite;..\..\..\server\collision;..\..\..\server\collision\Management;..\..\..\server\collision\Maps;..\..\..\server\collision\Models;..\..\..\server\shared;..\..\..\server\shared\Debugging" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="true" + MinimalRebuild="false" BasicRuntimeChecks="3" - RuntimeLibrary="1" - EnableEnhancedInstructionSet="1" + RuntimeLibrary="3" + EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="0" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="true" + Detect64BitPortabilityProblems="false" DebugInformationFormat="3" /> <Tool @@ -64,14 +65,13 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="g3dlite.lib zlib.lib" - OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\vmap_assembler.exe" - LinkIncremental="1" - AdditionalLibraryDirectories=""..\..\..\..\externals\g3dlite\bin\$(PlatformName)_$(ConfigurationName)";"..\..\..\..\externals\zlib\bin\$(PlatformName)_$(ConfigurationName)"" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName)_d.exe" + LinkIncremental="2" + AdditionalLibraryDirectories="" IgnoreAllDefaultLibraries="false" - IgnoreDefaultLibraryNames="MSVCPRTD.LIB" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/vmap_assembler.pdb" + ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" SubSystem="1" RandomizedBaseAddress="1" DataExecutionPrevention="0" @@ -124,14 +124,16 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="..\..\..\..\externals;..\..\..\..\externals\g3dlite;..\..\..\server\collision;..\..\..\server\collision\Management;..\..\..\server\collision\Maps;..\..\..\server\collision\Models;..\..\..\server\shared;..\..\..\server\shared\Debugging" + AdditionalIncludeDirectories="..\..\..\..\externals;..\..\..\..\externals\g3dlite;..\..\..\server\collision;..\..\..\server\collision\Maps;..\..\..\server\collision\Models;..\..\..\server\shared;..\..\..\server\shared\Debugging" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + StringPooling="true" RuntimeLibrary="2" + EnableFunctionLevelLinking="true" EnableEnhancedInstructionSet="1" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="0" /> <Tool Name="VCManagedResourceCompilerTool" @@ -144,12 +146,11 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="g3dlite.lib zlib.lib" - OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\vmap_assembler.exe" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe" LinkIncremental="1" - AdditionalLibraryDirectories=""..\..\..\..\externals\g3dlite\bin\$(PlatformName)_$(ConfigurationName)";"..\..\..\..\externals\zlib\bin\$(PlatformName)_$(ConfigurationName)"" - IgnoreDefaultLibraryNames="MSVCPRTD.LIB" - GenerateDebugInformation="true" + AdditionalLibraryDirectories="" + IgnoreDefaultLibraryNames="" + GenerateDebugInformation="false" SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" @@ -204,22 +205,10 @@ RelativePath="..\..\..\server\collision\BoundingIntervalHierarchy.h" > </File> - <File - RelativePath="..\..\..\src\shared\vmap\VMapTools.h" - > - </File> <Filter Name="Maps" > <File - RelativePath="..\..\..\server\collision\Maps\MapTree.cpp" - > - </File> - <File - RelativePath="..\..\..\server\collision\Maps\MapTree.h" - > - </File> - <File RelativePath="..\..\..\server\collision\Maps\TileAssembler.cpp" > </File> @@ -248,18 +237,6 @@ > </File> </Filter> - <Filter - Name="Management" - > - <File - RelativePath="..\..\..\server\collision\Management\VMapManager2.cpp" - > - </File> - <File - RelativePath="..\..\..\server\collision\Management\VMapManager2.h" - > - </File> - </Filter> </Filter> </Files> <Globals> diff --git a/src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj b/src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj index 3e0000b6249..34665937c9a 100644 --- a/src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj +++ b/src/tools/vmap3_extractor/VC90/vmap3_extractor.vcproj @@ -18,8 +18,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\vmap3_extractor__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\vmap3_extractor__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" CharacterSet="1" > @@ -43,12 +43,13 @@ Optimization="0" AdditionalIncludeDirectories="..\;..\..\..\..\externals\libmpq;..\..\..\..\externals\libmpq\win" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="true" + MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" + EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" @@ -61,12 +62,14 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="bzip2.lib libmpq.lib zlib.lib" - OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName)_d.exe" LinkIncremental="2" - AdditionalLibraryDirectories=""..\..\..\..\externals\bzip2\bin\$(PlatformName)_$(ConfigurationName)";"..\..\..\..\externals\libmpq\bin\$(PlatformName)_$(ConfigurationName)";"..\..\..\..\externals\zlib\bin\$(PlatformName)_$(ConfigurationName)"" + AdditionalLibraryDirectories="" GenerateDebugInformation="true" + ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb" SubSystem="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" TargetMachine="1" /> <Tool @@ -93,11 +96,11 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\vmap3_extractor__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\vmap3_extractor__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" CharacterSet="1" - WholeProgramOptimization="1" + WholeProgramOptimization="0" > <Tool Name="VCPreBuildEventTool" @@ -117,14 +120,17 @@ <Tool Name="VCCLCompilerTool" Optimization="2" - EnableIntrinsicFunctions="true" + EnableIntrinsicFunctions="false" + WholeProgramOptimization="false" AdditionalIncludeDirectories="..\;..\..\..\..\externals\libmpq;..\..\..\..\externals\libmpq\win" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="1" UsePrecompiledHeader="0" WarningLevel="3" - DebugInformationFormat="3" + DebugInformationFormat="0" /> <Tool Name="VCManagedResourceCompilerTool" @@ -137,14 +143,16 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="bzip2.lib libmpq.lib zlib.lib" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\$(ProjectName).exe" LinkIncremental="1" - AdditionalLibraryDirectories=""..\..\..\..\externals\bzip2\bin\$(PlatformName)_$(ConfigurationName)";"..\..\..\..\externals\libmpq\bin\$(PlatformName)_$(ConfigurationName)";"..\..\..\..\externals\zlib\bin\$(PlatformName)_$(ConfigurationName)"" - GenerateDebugInformation="true" + AdditionalLibraryDirectories="" + GenerateDebugInformation="false" SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" + LinkTimeCodeGeneration="0" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" TargetMachine="1" /> <Tool diff --git a/src/tools/vmap3_extractor/vmapexport.cpp b/src/tools/vmap3_extractor/vmapexport.cpp index ff81da52219..b3da5065f96 100644 --- a/src/tools/vmap3_extractor/vmapexport.cpp +++ b/src/tools/vmap3_extractor/vmapexport.cpp @@ -103,7 +103,7 @@ void ReadLiquidTypeTableDBC() printf("Done! (%u LiqTypes loaded)\n", (unsigned int)LiqType_count); } -int ExtractWmo() +bool ExtractWmo() { char szLocalFile[1024] = ""; bool success=true; diff --git a/win/VC90/TrinityCore.vcproj b/win/VC90/TrinityCore.vcproj index 264e36fd790..45d4a1735cb 100644 --- a/win/VC90/TrinityCore.vcproj +++ b/win/VC90/TrinityCore.vcproj @@ -21,8 +21,8 @@ <Configurations> <Configuration Name="Release|Win32" - OutputDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -79,12 +79,13 @@ /> <Tool Name="VCLinkerTool" + LinkLibraryDependencies="true" AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="libmySQL.lib ssleay32.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRT.LIB msvcrt.lib" + AdditionalDependencies="libmysql.lib ssleay32.lib libeay32.lib ws2_32.lib dbghelp.lib" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" + AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName)" GenerateDebugInformation="true" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.pdb" GenerateMapFile="true" @@ -116,13 +117,13 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\worldserver.conf
copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)
" + CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)
" /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" + Name="Release|x64" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -142,18 +143,19 @@ /> <Tool Name="VCMIDLTool" - TypeLibraryName=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.tlb" + TargetEnvironment="3" + TypeLibraryName=".\..\..\bin\Release\trinitycore.tlb" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="0" + InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\externals;..\..\externals\mersennetwister;..\..\externals\sockets\include;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\BattleGrounds;..\..\src\server\game\Chat;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Globals;..\..\src\server\game\Grids;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Groups;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Spells\Auras;..\..\src\server\game\World;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\worldserver;..\..\src\server\worldserver\CommandLine;..\..\src\server\worldserver\RemoteAccess;..\..\src\server\worldserver\WorldThread" - PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE;ENABLE_CLI;_CRT_SECURE_NO_WARNINGS" - IgnoreStandardIncludePath="false" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS" + StringPooling="true" + RuntimeLibrary="2" EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="0" RuntimeTypeInfo="true" PrecompiledHeaderFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.pch" AssemblerListingLocation=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" @@ -171,7 +173,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG;_SECURE_SCL=0" Culture="1033" /> <Tool @@ -179,23 +181,21 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="libmySQL.lib ssleay32.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRTD.LIB msvcrtd.lib" + AdditionalDependencies="libmysql.lib ssleay32.lib libeay32.lib ws2_32.lib dbghelp.lib" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.exe" - Version="" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" + AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName)" GenerateDebugInformation="true" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.pdb" GenerateMapFile="true" MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.map" SubSystem="1" - LargeAddressAware="2" + LinkTimeCodeGeneration="0" RandomizedBaseAddress="1" - FixedBaseAddress="1" DataExecutionPrevention="0" ImportLibrary="$(OutDir)\TrinityCore.lib" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -217,13 +217,13 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\worldserver.conf
copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)
" + CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)
" /> </Configuration> <Configuration - Name="Release|x64" - OutputDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" + Name="Debug|Win32" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -243,19 +243,18 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" - TypeLibraryName=".\..\..\bin\Release\trinitycore.tlb" + TypeLibraryName=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.tlb" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - InlineFunctionExpansion="1" + Optimization="0" AdditionalIncludeDirectories="..\..\externals;..\..\externals\mersennetwister;..\..\externals\sockets\include;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\BattleGrounds;..\..\src\server\game\Chat;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Globals;..\..\src\server\game\Grids;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Groups;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Spells\Auras;..\..\src\server\game\World;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\worldserver;..\..\src\server\worldserver\CommandLine;..\..\src\server\worldserver\RemoteAccess;..\..\src\server\worldserver\WorldThread" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS" - StringPooling="true" - RuntimeLibrary="2" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE;ENABLE_CLI;_CRT_SECURE_NO_WARNINGS" + IgnoreStandardIncludePath="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" EnableFunctionLevelLinking="true" - EnableEnhancedInstructionSet="0" RuntimeTypeInfo="true" PrecompiledHeaderFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.pch" AssemblerListingLocation=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" @@ -273,7 +272,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_SECURE_SCL=0" + PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool @@ -281,21 +280,23 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libmySQL.lib ssleay32.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRT.LIB msvcrt.lib" + AdditionalOptions="/MACHINE:I386" + AdditionalDependencies="libmysql.lib ssleay32.lib libeay32.lib dbghelp.lib" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.exe" + Version="" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" + AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName)" GenerateDebugInformation="true" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.pdb" GenerateMapFile="true" MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.map" SubSystem="1" - LinkTimeCodeGeneration="0" + LargeAddressAware="2" RandomizedBaseAddress="1" + FixedBaseAddress="1" DataExecutionPrevention="0" ImportLibrary="$(OutDir)\TrinityCore.lib" - TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -317,13 +318,13 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\worldserver.conf
copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)
" + CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)
" /> </Configuration> <Configuration Name="Debug|x64" - OutputDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -381,12 +382,12 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libmySQL.lib ssleay32.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRTD.LIB msvcrtd.lib" + AdditionalDependencies="libmysql.lib ssleay32.lib libeay32.lib ws2_32.lib dbghelp.lib" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.exe" Version="" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" + AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName)" GenerateDebugInformation="true" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.pdb" GenerateMapFile="true" @@ -418,7 +419,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\worldserver.conf
copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)
" + CommandLine="copy ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\externals\lib\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\src\server\worldserver\worldserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\README.* ..\..\bin\$(PlatformName)_$(ConfigurationName)
" /> </Configuration> </Configurations> diff --git a/win/VC90/TrinityRealm.vcproj b/win/VC90/TrinityRealm.vcproj index e8b8d9f5183..a18082e70ef 100644 --- a/win/VC90/TrinityRealm.vcproj +++ b/win/VC90/TrinityRealm.vcproj @@ -21,8 +21,8 @@ <Configurations> <Configuration Name="Release|Win32" - OutputDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -80,11 +80,11 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRT.LIB msvcrt.lib" + AdditionalDependencies="libmysql.lib libeay32.lib ws2_32.lib dbghelp.lib" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" + AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName)" GenerateDebugInformation="true" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb" GenerateMapFile="true" @@ -114,13 +114,13 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="copy ..\..\src\server\authserver\authserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\authserver.conf" + CommandLine="copy ..\..\src\server\authserver\authserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)" /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" + Name="Release|x64" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -140,18 +140,19 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" TypeLibraryName=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.tlb" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="0" + InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\externals;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\authserver;..\..\src\server\authserver\Authentication;..\..\src\server\authserver\Realms;..\..\src\server\authserver\Server" - PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS" - IgnoreStandardIncludePath="false" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + PreprocessorDefinitions="VERSION="0.12.0-SVN",WIN32,NDEBUG,_CONSOLE;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS" + StringPooling="true" + RuntimeLibrary="2" EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="0" RuntimeTypeInfo="true" PrecompiledHeaderFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.pch" AssemblerListingLocation=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" @@ -169,7 +170,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG;_SECURE_SCL=0" Culture="1033" /> <Tool @@ -177,21 +178,19 @@ /> <Tool Name="VCLinkerTool" - AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRTD.LIB msvcrtd.lib" + AdditionalDependencies="libmysql.lib libeay32.lib ws2_32.lib dbghelp.lib" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" + AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName)" GenerateDebugInformation="true" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb" GenerateMapFile="true" MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.map" SubSystem="1" - LargeAddressAware="2" RandomizedBaseAddress="1" - FixedBaseAddress="1" DataExecutionPrevention="0" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -213,13 +212,13 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="copy ..\..\src\server\authserver\authserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\authserver.conf" + CommandLine="copy ..\..\src\server\authserver\authserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)" /> </Configuration> <Configuration - Name="Release|x64" - OutputDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" + Name="Debug|Win32" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -239,19 +238,18 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" TypeLibraryName=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.tlb" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - InlineFunctionExpansion="1" + Optimization="0" AdditionalIncludeDirectories="..\..\externals;..\..\src\server\shared;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\authserver;..\..\src\server\authserver\Authentication;..\..\src\server\authserver\Realms;..\..\src\server\authserver\Server" - PreprocessorDefinitions="VERSION="0.12.0-SVN",WIN32,NDEBUG,_CONSOLE;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS" - StringPooling="true" - RuntimeLibrary="2" + PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS" + IgnoreStandardIncludePath="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" EnableFunctionLevelLinking="true" - EnableEnhancedInstructionSet="0" RuntimeTypeInfo="true" PrecompiledHeaderFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.pch" AssemblerListingLocation=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" @@ -269,7 +267,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_SECURE_SCL=0" + PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool @@ -277,19 +275,21 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRT.LIB msvcrt.lib" + AdditionalOptions="/MACHINE:I386" + AdditionalDependencies="libmysql.lib libeay32.lib ws2_32.lib dbghelp.lib" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" + AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName)" GenerateDebugInformation="true" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb" GenerateMapFile="true" MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.map" SubSystem="1" + LargeAddressAware="2" RandomizedBaseAddress="1" + FixedBaseAddress="1" DataExecutionPrevention="0" - TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -311,13 +311,13 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="copy ..\..\src\server\authserver\authserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\authserver.conf" + CommandLine="copy ..\..\src\server\authserver\authserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)" /> </Configuration> <Configuration Name="Debug|x64" - OutputDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -375,11 +375,11 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRTD.LIB msvcrtd.lib" + AdditionalDependencies="libmysql.lib libeay32.lib ws2_32.lib dbghelp.lib" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" + AdditionalLibraryDirectories="..\..\externals\lib\$(PlatformName)_$(ConfigurationName)" GenerateDebugInformation="true" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb" GenerateMapFile="true" @@ -410,7 +410,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="copy ..\..\src\server\authserver\authserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\authserver.conf" + CommandLine="copy ..\..\src\server\authserver\authserver.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)" /> </Configuration> </Configurations> diff --git a/win/VC90/framework.vcproj b/win/VC90/framework.vcproj deleted file mode 100644 index 4cf74a17a1e..00000000000 --- a/win/VC90/framework.vcproj +++ /dev/null @@ -1,491 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="framework" - ProjectGUID="{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}" - RootNamespace="framework" - Keyword="Win32Proj" - TargetFrameworkVersion="0" - > - <Platforms> - <Platform - Name="Win32" - /> - <Platform - Name="x64" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory=".\framework__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\framework__$(PlatformName)_$(ConfigurationName)" - ConfigurationType="4" - CharacterSet="2" - ManagedExtensions="0" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/Zl /MP" - Optimization="0" - AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB" - MinimalRebuild="false" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - EnableFunctionLevelLinking="true" - RuntimeTypeInfo="true" - UsePrecompiledHeader="0" - PrecompiledHeaderFile=".\framework__$(PlatformName)_$(ConfigurationName)\framework.pch" - AssemblerListingLocation=".\framework__$(PlatformName)_$(ConfigurationName)\" - ObjectFile=".\framework__$(PlatformName)_$(ConfigurationName)\" - ProgramDataBaseFileName=".\framework__$(PlatformName)_$(ConfigurationName)\" - WarningLevel="3" - SuppressStartupBanner="true" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" - CallingConvention="0" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile=".\framework__$(PlatformName)_$(ConfigurationName)\framework.lib" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Debug|x64" - OutputDirectory=".\framework__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\framework__$(PlatformName)_$(ConfigurationName)" - ConfigurationType="4" - CharacterSet="2" - ManagedExtensions="0" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/Zl /MP" - Optimization="0" - AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB" - MinimalRebuild="false" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - EnableFunctionLevelLinking="true" - RuntimeTypeInfo="true" - UsePrecompiledHeader="0" - PrecompiledHeaderFile=".\framework__$(PlatformName)_$(ConfigurationName)\framework.pch" - AssemblerListingLocation=".\framework__$(PlatformName)_$(ConfigurationName)\" - ObjectFile=".\framework__$(PlatformName)_$(ConfigurationName)\" - ProgramDataBaseFileName=".\framework__$(PlatformName)_$(ConfigurationName)\" - WarningLevel="3" - SuppressStartupBanner="true" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" - CallingConvention="0" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile=".\framework__$(PlatformName)_$(ConfigurationName)\framework.lib" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory=".\framework__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\framework__$(PlatformName)_$(ConfigurationName)" - ConfigurationType="4" - CharacterSet="2" - ManagedExtensions="0" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/Zl /MP" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0" - StringPooling="true" - MinimalRebuild="false" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - EnableEnhancedInstructionSet="1" - RuntimeTypeInfo="true" - UsePrecompiledHeader="0" - PrecompiledHeaderFile=".\framework__$(PlatformName)_$(ConfigurationName)\framework.pch" - AssemblerListingLocation=".\framework__$(PlatformName)_$(ConfigurationName)\" - ObjectFile=".\framework__$(PlatformName)_$(ConfigurationName)\" - ProgramDataBaseFileName=".\framework__$(PlatformName)_$(ConfigurationName)\" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" - CallingConvention="0" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile=".\framework__$(PlatformName)_$(ConfigurationName)\framework.lib" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|x64" - OutputDirectory=".\framework__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\framework__$(PlatformName)_$(ConfigurationName)" - ConfigurationType="4" - CharacterSet="2" - ManagedExtensions="0" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/Zl /MP" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0" - StringPooling="true" - MinimalRebuild="false" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - EnableEnhancedInstructionSet="0" - RuntimeTypeInfo="true" - UsePrecompiledHeader="0" - PrecompiledHeaderFile=".\framework__$(PlatformName)_$(ConfigurationName)\framework.pch" - AssemblerListingLocation=".\framework__$(PlatformName)_$(ConfigurationName)\" - ObjectFile=".\framework__$(PlatformName)_$(ConfigurationName)\" - ProgramDataBaseFileName=".\framework__$(PlatformName)_$(ConfigurationName)\" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" - CallingConvention="0" - CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile=".\framework__$(PlatformName)_$(ConfigurationName)\framework.lib" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="GameSystem" - > - <File - RelativePath="..\..\src\server\framework\GameSystem\Grid.h" - > - </File> - <File - RelativePath="..\..\src\server\framework\GameSystem\GridLoader.h" - > - </File> - <File - RelativePath="..\..\src\server\framework\GameSystem\GridReference.h" - > - </File> - <File - RelativePath="..\..\src\server\framework\GameSystem\GridRefManager.h" - > - </File> - <File - RelativePath="..\..\src\server\framework\GameSystem\NGrid.h" - > - </File> - <File - RelativePath="..\..\src\server\framework\GameSystem\TypeContainer.h" - > - </File> - <File - RelativePath="..\..\src\server\framework\GameSystem\TypeContainerFunctions.h" - > - </File> - <File - RelativePath="..\..\src\server\framework\GameSystem\TypeContainerFunctionsPtr.h" - > - </File> - <File - RelativePath="..\..\src\server\framework\GameSystem\TypeContainerVisitor.h" - > - </File> - </Filter> - <Filter - Name="Platform" - > - <File - RelativePath="..\..\src\server\framework\Platform\CompilerDefs.h" - > - </File> - <File - RelativePath="..\..\src\server\framework\Platform\Define.h" - > - </File> - </Filter> - <Filter - Name="Policies" - > - <File - RelativePath="..\..\src\server\framework\Policies\CreationPolicy.h" - > - </File> - <File - RelativePath="..\..\src\server\framework\Policies\ObjectLifeTime.cpp" - > - </File> - <File - RelativePath="..\..\src\server\framework\Policies\ObjectLifeTime.h" - > - </File> - <File - RelativePath="..\..\src\server\framework\Policies\Singleton.h" - > - </File> - <File - RelativePath="..\..\src\server\framework\Policies\SingletonImp.h" - > - </File> - <File - RelativePath="..\..\src\server\framework\Policies\ThreadingModel.h" - > - </File> - </Filter> - <Filter - Name="Utilities" - > - <File - RelativePath="..\..\src\server\framework\Utilities\ByteConverter.h" - > - </File> - <File - RelativePath="..\..\src\server\framework\Utilities\Callback.h" - > - </File> - <File - RelativePath="..\..\src\server\framework\Utilities\EventProcessor.cpp" - > - </File> - <File - RelativePath="..\..\src\server\framework\Utilities\EventProcessor.h" - > - </File> - <File - RelativePath="..\..\src\server\framework\Utilities\LinkedList.h" - > - </File> - <File - RelativePath="..\..\src\server\framework\Utilities\TypeList.h" - > - </File> - <File - RelativePath="..\..\src\server\framework\Utilities\UnorderedMap.h" - > - </File> - <Filter - Name="CountedReference" - > - <File - RelativePath="..\..\src\server\framework\Utilities\CountedReference\Reference.h" - > - </File> - <File - RelativePath="..\..\src\server\framework\Utilities\CountedReference\ReferenceHolder.h" - > - </File> - <File - RelativePath="..\..\src\server\framework\Utilities\CountedReference\ReferenceImpl.h" - > - </File> - </Filter> - <Filter - Name="LinkedReference" - > - <File - RelativePath="..\..\src\server\framework\Utilities\LinkedReference\Reference.h" - > - </File> - <File - RelativePath="..\..\src\server\framework\Utilities\LinkedReference\RefManager.h" - > - </File> - </Filter> - </Filter> - <Filter - Name="Dynamic" - > - <File - RelativePath="..\..\src\server\framework\Dynamic\FactoryHolder.h" - > - </File> - <File - RelativePath="..\..\src\server\framework\Dynamic\ObjectRegistry.h" - > - </File> - </Filter> - <Filter - Name="Network" - > - <File - RelativePath="..\..\src\server\framework\Network\SocketDefines.h" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj index 14834618e5e..af57afc95a8 100644 --- a/win/VC90/game.vcproj +++ b/win/VC90/game.vcproj @@ -22,8 +22,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\game__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\game__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -48,7 +48,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP /Zm200" Optimization="0" - AdditionalIncludeDirectories="..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Server\Protocol\Handlers;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World;..\..\externals;..\..\src\server\shared\Cryptography\Authentication;" + AdditionalIncludeDirectories="..\..\externals;..\..\externals\g3dlite;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\collision\Maps;..\..\src\server\collision\Models;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World" PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS" StringPooling="false" MinimalRebuild="false" @@ -58,7 +58,7 @@ RuntimeTypeInfo="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="WinCorePCH.h" - PrecompiledHeaderFile=".\game__$(PlatformName)_$(ConfigurationName)\game.pch" + PrecompiledHeaderFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\$(ProjectName).pch" AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\" ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\" ProgramDataBaseFileName=".\game__$(PlatformName)_$(ConfigurationName)\" @@ -84,8 +84,9 @@ /> <Tool Name="VCLibrarianTool" - OutputFile=".\game__$(PlatformName)_$(ConfigurationName)\game.lib" - AdditionalLibraryDirectories=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib ..\..\externals\ace\bin\$(PlatformName)_$(ConfigurationName)\ACEd.lib" + LinkLibraryDependencies="false" + OutputFile="$(OutDir)\$(ProjectName).lib" + AdditionalLibraryDirectories="" SuppressStartupBanner="true" /> <Tool @@ -105,9 +106,9 @@ /> </Configuration> <Configuration - Name="Release|Win32" - OutputDirectory=".\game__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\game__$(PlatformName)_$(ConfigurationName)" + Name="Debug|x64" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -127,21 +128,23 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/MP /Zm200" - InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Server\Protocol\Handlers;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\externals\g3dlite;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\collision\Maps;..\..\src\server\collision\Models;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World;..\..\externals;..\..\src\server\shared\Cryptography\Authentication" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS" - StringPooling="true" - RuntimeLibrary="2" + AdditionalOptions="/MP /bigobj /Zm200" + Optimization="0" + AdditionalIncludeDirectories="..\..\externals;..\..\externals\g3dlite;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\collision\Maps;..\..\src\server\collision\Models;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" + StringPooling="false" + MinimalRebuild="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" EnableFunctionLevelLinking="true" - EnableEnhancedInstructionSet="1" RuntimeTypeInfo="true" UsePrecompiledHeader="2" - PrecompiledHeaderThrough="PrecompiledHeaders\WinCorePCH.h" - PrecompiledHeaderFile=".\game__$(PlatformName)_$(ConfigurationName)\game.pch" + PrecompiledHeaderThrough="WinCorePCH.h" + PrecompiledHeaderFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\$(ProjectName).pch" AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\" ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\" ProgramDataBaseFileName=".\game__$(PlatformName)_$(ConfigurationName)\" @@ -151,14 +154,14 @@ DebugInformationFormat="3" CallingConvention="0" CompileAs="0" - ForcedIncludeFiles="PrecompiledHeaders\WinCorePCH.h" + ForcedIncludeFiles="WinCorePCH.h" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_SECURE_SCL=0" + PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool @@ -166,7 +169,8 @@ /> <Tool Name="VCLibrarianTool" - OutputFile=".\game__$(PlatformName)_$(ConfigurationName)\game.lib" + LinkLibraryDependencies="false" + OutputFile="$(OutDir)\$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool @@ -186,9 +190,9 @@ /> </Configuration> <Configuration - Name="Debug|x64" - OutputDirectory=".\game__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\game__$(PlatformName)_$(ConfigurationName)" + Name="Release|Win32" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -208,24 +212,22 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/MP /bigobj /Zm200" - Optimization="0" - AdditionalIncludeDirectories="..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Server\Protocol\Handlers;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World;..\..\externals;..\..\src\server\shared\Cryptography\Authentication;" - PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS" - StringPooling="false" - MinimalRebuild="false" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + AdditionalOptions="/MP /Zm200" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\..\externals;..\..\externals\g3dlite;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\collision\Maps;..\..\src\server\collision\Models;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS" + StringPooling="true" + RuntimeLibrary="2" EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="1" RuntimeTypeInfo="true" UsePrecompiledHeader="2" - PrecompiledHeaderThrough="PrecompiledHeaders\WinCorePCH.h" - PrecompiledHeaderFile=".\game__$(PlatformName)_$(ConfigurationName)\game.pch" - AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\" + PrecompiledHeaderThrough="WinCorePCH.h" + PrecompiledHeaderFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\$(ProjectName).pch" + AssemblerListingLocation="" ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\" ProgramDataBaseFileName=".\game__$(PlatformName)_$(ConfigurationName)\" WarningLevel="3" @@ -234,14 +236,14 @@ DebugInformationFormat="3" CallingConvention="0" CompileAs="0" - ForcedIncludeFiles="PrecompiledHeaders\WinCorePCH.h" + ForcedIncludeFiles="WinCorePCH.h" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG;_SECURE_SCL=0" Culture="1033" /> <Tool @@ -249,8 +251,8 @@ /> <Tool Name="VCLibrarianTool" - AdditionalDependencies=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" - OutputFile=".\game__$(PlatformName)_$(ConfigurationName)\game.lib" + LinkLibraryDependencies="false" + OutputFile="$(OutDir)\$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool @@ -271,8 +273,8 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory=".\game__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\game__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -298,7 +300,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP /bigobj /Zm200" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Server\Protocol\Handlers;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World;..\..\externals;..\..\src\server\shared\Cryptography\Authentication;" + AdditionalIncludeDirectories="..\..\externals;..\..\externals\g3dlite;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\collision\Maps;..\..\src\server\collision\Models;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS" StringPooling="true" RuntimeLibrary="2" @@ -306,8 +308,8 @@ EnableEnhancedInstructionSet="0" RuntimeTypeInfo="true" UsePrecompiledHeader="2" - PrecompiledHeaderThrough="PrecompiledHeaders\WinCorePCH.h" - PrecompiledHeaderFile=".\game__$(PlatformName)_$(ConfigurationName)\game.pch" + PrecompiledHeaderThrough="WinCorePCH.h" + PrecompiledHeaderFile=".\$(ProjectName)__$(PlatformName)_$(ConfigurationName)\$(ProjectName).pch" AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\" ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\" ProgramDataBaseFileName=".\game__$(PlatformName)_$(ConfigurationName)\" @@ -317,7 +319,7 @@ DebugInformationFormat="3" CallingConvention="0" CompileAs="0" - ForcedIncludeFiles="PrecompiledHeaders\WinCorePCH.h" + ForcedIncludeFiles="WinCorePCH.h" /> <Tool Name="VCManagedResourceCompilerTool" @@ -332,8 +334,8 @@ /> <Tool Name="VCLibrarianTool" - AdditionalDependencies=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" - OutputFile=".\game__$(PlatformName)_$(ConfigurationName)\game.lib" + LinkLibraryDependencies="false" + OutputFile="$(OutDir)\$(ProjectName).lib" SuppressStartupBanner="true" /> <Tool @@ -4302,6 +4304,38 @@ <File RelativePath="..\..\src\server\game\PrecompiledHeaders\ScriptPCH.cpp" > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="2" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="2" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="2" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="2" + /> + </FileConfiguration> </File> <File RelativePath="..\..\src\server\game\PrecompiledHeaders\ScriptPCH.h" @@ -4316,22 +4350,25 @@ <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1" + PrecompiledHeaderThrough="WinCorePCH.h" /> </FileConfiguration> <FileConfiguration - Name="Release|Win32" + Name="Debug|x64" > <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1" + PrecompiledHeaderThrough="WinCorePCH.h" /> </FileConfiguration> <FileConfiguration - Name="Debug|x64" + Name="Release|Win32" > <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1" + PrecompiledHeaderThrough="WinCorePCH.h" /> </FileConfiguration> <FileConfiguration @@ -4340,6 +4377,7 @@ <Tool Name="VCCLCompilerTool" UsePrecompiledHeader="1" + PrecompiledHeaderThrough="WinCorePCH.h" /> </FileConfiguration> </File> diff --git a/win/VC90/genrevision.vcproj b/win/VC90/genrevision.vcproj index 6684660319b..13eda318a32 100644 --- a/win/VC90/genrevision.vcproj +++ b/win/VC90/genrevision.vcproj @@ -21,8 +21,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" CharacterSet="1" > @@ -45,9 +45,10 @@ Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="true" + MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" + EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -93,8 +94,8 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" CharacterSet="1" > @@ -118,9 +119,10 @@ Name="VCCLCompilerTool" Optimization="0" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="true" + MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" + EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" @@ -166,8 +168,8 @@ </Configuration> <Configuration Name="Release|Win32" - OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" CharacterSet="1" WholeProgramOptimization="1" @@ -241,8 +243,8 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" CharacterSet="1" WholeProgramOptimization="1" @@ -266,8 +268,9 @@ <Tool Name="VCCLCompilerTool" Optimization="2" - EnableIntrinsicFunctions="true" + EnableIntrinsicFunctions="false" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_SECURE_SCL=0" + StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" diff --git a/win/VC90/shared.vcproj b/win/VC90/shared.vcproj index a84fb4cde2f..6ad73c65207 100644 --- a/win/VC90/shared.vcproj +++ b/win/VC90/shared.vcproj @@ -21,8 +21,8 @@ <Configurations> <Configuration Name="Release|Win32" - OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -49,7 +49,7 @@ AdditionalOptions="/MP" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\src\server\game\Entities\Object" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_SECURE_SCL=0" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -80,7 +80,8 @@ /> <Tool Name="VCLibrarianTool" - OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" + LinkLibraryDependencies="false" + OutputFile="$(OutDir)\$(ProjectName).lib" AdditionalLibraryDirectories="" SuppressStartupBanner="true" /> @@ -101,9 +102,9 @@ /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" + Name="Release|x64" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -124,19 +125,21 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - Optimization="0" + InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\src\server\game\Entities\Object" - PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" - BasicRuntimeChecks="3" - RuntimeLibrary="3" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" + StringPooling="true" + RuntimeLibrary="2" EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.pch" + PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)/shared.pch" AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\" ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\" ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\" @@ -152,7 +155,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG;_SECURE_SCL=0" Culture="1033" /> <Tool @@ -160,7 +163,8 @@ /> <Tool Name="VCLibrarianTool" - OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" + LinkLibraryDependencies="false" + OutputFile="$(OutDir)\$(ProjectName).lib" AdditionalLibraryDirectories="" SuppressStartupBanner="true" /> @@ -181,9 +185,9 @@ /> </Configuration> <Configuration - Name="Release|x64" - OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" + Name="Debug|Win32" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -204,21 +208,19 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - InlineFunctionExpansion="1" + Optimization="0" AdditionalIncludeDirectories="..\..\src\server\shared\Debugging\;..\..\src\server\;..\..\src\server\shared\Utilities;..\..\src\server\shared\Logging;..\..\src\server\shared;..\..\externals;..\..\externals\sockets;..\..\externals\sockets\include;..\..\externals\openssl;..\..\externals\utf8cpp;..\..\externals\mersennetwister;..\..\externals\mysql;..\..\src\server\game\Entities\Object" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" - StringPooling="true" - RuntimeLibrary="2" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" EnableFunctionLevelLinking="true" - EnableEnhancedInstructionSet="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)/shared.pch" + PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.pch" AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\" ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\" ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\" @@ -234,7 +236,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG;_SECURE_SCL=0" + PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool @@ -242,8 +244,8 @@ /> <Tool Name="VCLibrarianTool" - AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib" - OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" + LinkLibraryDependencies="false" + OutputFile="$(OutDir)\$(ProjectName).lib" AdditionalLibraryDirectories="" SuppressStartupBanner="true" /> @@ -265,8 +267,8 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" + OutputDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory="$(ProjectName)__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" @@ -324,8 +326,8 @@ /> <Tool Name="VCLibrarianTool" - AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib" - OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" + LinkLibraryDependencies="false" + OutputFile="$(OutDir)\$(ProjectName).lib" AdditionalLibraryDirectories="" SuppressStartupBanner="true" /> @@ -732,23 +734,23 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="Release|x64" > <Tool Name="VCCustomBuildTool" Description="Getting Version..." - CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "-d" "..\..\.."
" + CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "..\..\.."
" AdditionalDependencies="$(SolutionDir)../.hg/branchheads.cache" Outputs="revision.h" /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="Debug|Win32" > <Tool Name="VCCustomBuildTool" Description="Getting Version..." - CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "..\..\.."
" + CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "-d" "..\..\.."
" AdditionalDependencies="$(SolutionDir)../.hg/branchheads.cache" Outputs="revision.h" /> |