diff options
Diffstat (limited to 'win/VC90')
| -rw-r--r-- | win/VC90/ACE_vc9.vcproj | 227 | ||||
| -rw-r--r-- | win/VC90/ScriptsInterfaces.vcproj | 191 | ||||
| -rw-r--r-- | win/VC90/TrinityCore.vcproj | 241 | ||||
| -rw-r--r-- | win/VC90/TrinityRealm.vcproj | 264 | ||||
| -rw-r--r-- | win/VC90/framework.vcproj | 178 | ||||
| -rw-r--r-- | win/VC90/g3dlite.vcproj | 167 | ||||
| -rw-r--r-- | win/VC90/game.vcproj | 939 | ||||
| -rw-r--r-- | win/VC90/genrevision.vcproj | 798 | ||||
| -rw-r--r-- | win/VC90/shared.vcproj | 412 | ||||
| -rw-r--r-- | win/VC90/sockets.vcproj | 183 | ||||
| -rw-r--r-- | win/VC90/zlib.vcproj | 156 | ||||
| -rw-r--r-- | win/VC90/zthread.vcproj | 666 |
12 files changed, 2833 insertions, 1589 deletions
diff --git a/win/VC90/ACE_vc9.vcproj b/win/VC90/ACE_vc9.vcproj index a2dedea085b..dfd824f03f3 100644 --- a/win/VC90/ACE_vc9.vcproj +++ b/win/VC90/ACE_vc9.vcproj @@ -6,7 +6,6 @@ ProjectGUID="{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}" RootNamespace="ACE" Keyword="Win32Proj" - TargetFrameworkVersion="0" > <Platforms> <Platform @@ -78,7 +77,7 @@ Name="VCLinkerTool" AdditionalDependencies="" OutputFile="$(OutDir)\ACEd.dll" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="" GenerateDebugInformation="true" @@ -168,7 +167,7 @@ AdditionalOptions="/machine:AMD64" AdditionalDependencies="" OutputFile="$(OutDir)\ACEd.dll" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="" GenerateDebugInformation="true" @@ -324,6 +323,7 @@ RuntimeTypeInfo="true" WarningLevel="3" Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" DisableSpecificWarnings="4355" /> <Tool @@ -375,6 +375,187 @@ Name="VCPostBuildEventTool" /> </Configuration> + <Configuration + Name="Debug_NoPCH|Win32" + OutputDirectory="..\..\dep\lib\$(PlatformName)_debug" + IntermediateDirectory=".\ace__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + AdditionalOptions="" + AdditionalIncludeDirectories="" + TypeLibraryName="$(InputName).tlb" + HeaderFileName="$(InputName).h" + InterfaceIdentifierFileName="$(InputName)_i.c" + ProxyFileName="$(InputName)_p.c" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP /wd 4748" + Optimization="0" + AdditionalIncludeDirectories="..\..\dep\ACE_wrappers" + PreprocessorDefinitions="ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + MinimalRebuild="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + RuntimeTypeInfo="true" + WarningLevel="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + DisableSpecificWarnings="4355" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + Culture="1033" + AdditionalIncludeDirectories=".." + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="" + OutputFile="$(OutDir)\ACEd.dll" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(TargetDir)\ADEd.pdb" + SubSystem="2" + ImportLibrary="$(OutDir)\ACEd.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug_NoPCH|x64" + OutputDirectory="..\..\dep\lib\$(PlatformName)_debug" + IntermediateDirectory=".\ace__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="0" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + AdditionalOptions="" + AdditionalIncludeDirectories="" + TypeLibraryName="$(InputName).tlb" + HeaderFileName="$(InputName).h" + InterfaceIdentifierFileName="$(InputName)_i.c" + ProxyFileName="$(InputName)_p.c" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP /wd 4748" + Optimization="0" + AdditionalIncludeDirectories="..\..\dep\ACE_wrappers" + PreprocessorDefinitions="ACE_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" + MinimalRebuild="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + RuntimeTypeInfo="true" + WarningLevel="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + DisableSpecificWarnings="4355" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN64" + Culture="1033" + AdditionalIncludeDirectories=".." + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalOptions="/machine:AMD64" + AdditionalDependencies="" + OutputFile="$(OutDir)\ACEd.dll" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(TargetDir)\ADEd.pdb" + SubSystem="2" + ImportLibrary="$(OutDir)\ACEd.lib" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> </Configurations> <References> </References> @@ -3237,11 +3418,11 @@ > </File> <File - RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_string.h" + RelativePath="..\..\dep\ACE_wrappers\ace\OS_String.h" > </File> <File - RelativePath="..\..\dep\ACE_wrappers\ace\OS_String.h" + RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_string.h" > </File> <File @@ -3285,11 +3466,11 @@ > </File> <File - RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_time.h" + RelativePath="..\..\dep\ACE_wrappers\ace\os_include\sys\os_time.h" > </File> <File - RelativePath="..\..\dep\ACE_wrappers\ace\os_include\sys\os_time.h" + RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_time.h" > </File> <File @@ -5212,6 +5393,22 @@ Name="VCCustomBuildTool" /> </FileConfiguration> + <FileConfiguration + Name="Debug_NoPCH|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_NoPCH|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> </File> <File RelativePath="..\..\dep\ACE_wrappers\VERSION" @@ -5248,6 +5445,22 @@ Name="VCCustomBuildTool" /> </FileConfiguration> + <FileConfiguration + Name="Debug_NoPCH|Win32" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_NoPCH|x64" + ExcludedFromBuild="true" + > + <Tool + Name="VCCustomBuildTool" + /> + </FileConfiguration> </File> </Filter> <Filter diff --git a/win/VC90/ScriptsInterfaces.vcproj b/win/VC90/ScriptsInterfaces.vcproj index b6f5b588d06..7037cffdf68 100644 --- a/win/VC90/ScriptsInterfaces.vcproj +++ b/win/VC90/ScriptsInterfaces.vcproj @@ -6,7 +6,7 @@ ProjectGUID="{4205C8A9-79B7-4354-8064-F05FB9CA0C96}" RootNamespace="ScriptsInterfaces" Keyword="Win32Proj" - TargetFrameworkVersion="131072" + TargetFrameworkVersion="0" > <Platforms> <Platform @@ -24,7 +24,6 @@ OutputDirectory=".\script__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\script__$(PlatformName)_$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" > <Tool @@ -68,10 +67,10 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="trinitycore.lib zlib.lib zthread.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib MSVCPRTD.LIB msvcrtd.lib" + AdditionalDependencies="trinitycore.lib zlib.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib aced.lib" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityScript.dll" - LinkIncremental="2" - AdditionalLibraryDirectories="".\trinitycore__$(PlatformName)_$(ConfigurationName)";"..\..\dep\lib\$(PlatformName)_$(ConfigurationName)";".\zlib__$(PlatformName)_$(ConfigurationName)";".\zthread__$(PlatformName)_$(ConfigurationName)"" + LinkIncremental="1" + AdditionalLibraryDirectories=";.\trinitycore__$(PlatformName)_$(ConfigurationName);.\zlib__$(PlatformName)_$(ConfigurationName);..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)\TrinityScript.pdb" SubSystem="2" @@ -107,7 +106,6 @@ OutputDirectory=".\script__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\script__$(PlatformName)_$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" > <Tool @@ -152,10 +150,10 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="trinitycore.lib zlib.lib zthread.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib MSVCPRTD.LIB msvcrtd.lib" + AdditionalDependencies="trinitycore.lib zlib.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib aced.lib" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityScript.dll" - LinkIncremental="2" - AdditionalLibraryDirectories="".\trinitycore__$(PlatformName)_$(ConfigurationName)";"..\..\dep\lib\$(PlatformName)_$(ConfigurationName)";".\zlib__$(PlatformName)_$(ConfigurationName)";".\zthread__$(PlatformName)_$(ConfigurationName)"" + LinkIncremental="1" + AdditionalLibraryDirectories=";.\trinitycore__$(PlatformName)_$(ConfigurationName);.\zlib__$(PlatformName)_$(ConfigurationName);..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)\TrinityScript.pdb" SubSystem="2" @@ -191,7 +189,6 @@ OutputDirectory=".\script__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\script__$(PlatformName)_$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" > <Tool @@ -233,10 +230,10 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="trinitycore.lib zlib.lib zthread.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib MSVCPRT.LIB msvcrt.lib" + AdditionalDependencies="trinitycore.lib zlib.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib ace.lib" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityScript.dll" LinkIncremental="1" - AdditionalLibraryDirectories="".\trinitycore__$(PlatformName)_$(ConfigurationName)";"..\..\dep\lib\$(PlatformName)_$(ConfigurationName)";".\zlib__$(PlatformName)_$(ConfigurationName)";".\zthread__$(PlatformName)_$(ConfigurationName)"" + AdditionalLibraryDirectories=";.\trinitycore__$(PlatformName)_$(ConfigurationName);.\zlib__$(PlatformName)_$(ConfigurationName);..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" GenerateDebugInformation="false" SubSystem="2" OptimizeReferences="2" @@ -273,7 +270,6 @@ OutputDirectory=".\script__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\script__$(PlatformName)_$(ConfigurationName)" ConfigurationType="2" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" > <Tool @@ -316,10 +312,10 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="trinitycore.lib zlib.lib zthread.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib MSVCPRT.LIB msvcrt.lib" + AdditionalDependencies="trinitycore.lib zlib.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib ace.lib" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityScript.dll" LinkIncremental="1" - AdditionalLibraryDirectories="".\trinitycore__$(PlatformName)_$(ConfigurationName)";"..\..\dep\lib\$(PlatformName)_$(ConfigurationName)";".\zlib__$(PlatformName)_$(ConfigurationName)";".\zthread__$(PlatformName)_$(ConfigurationName)"" + AdditionalLibraryDirectories=";.\trinitycore__$(PlatformName)_$(ConfigurationName);.\zlib__$(PlatformName)_$(ConfigurationName);..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" GenerateDebugInformation="false" SubSystem="2" OptimizeReferences="2" @@ -351,6 +347,171 @@ Name="VCPostBuildEventTool" /> </Configuration> + <Configuration + Name="Debug_NoPCH|Win32" + OutputDirectory=".\script__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\script__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\TrinityRealm;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_WINDOWS;_USRDLL;SCRIPT" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="4" + CallingConvention="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="trinitycore.lib zlib.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib aced.lib" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityScript.dll" + LinkIncremental="1" + AdditionalLibraryDirectories=";.\trinitycore__$(PlatformName)_$(ConfigurationName);.\zlib__$(PlatformName)_$(ConfigurationName);..\..\dep\lib\$(PlatformName)_debug" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)\TrinityScript.pdb" + SubSystem="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(OutDir)\TrinityScript.lib" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug_NoPCH|x64" + OutputDirectory=".\script__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\script__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\src\shared;..\..\src\framework;..\..\dep\include;..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\TrinityRealm;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_WINDOWS;_USRDLL;SCRIPT" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + CallingConvention="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="trinitycore.lib zlib.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib aced.lib" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityScript.dll" + LinkIncremental="1" + AdditionalLibraryDirectories=";.\trinitycore__$(PlatformName)_$(ConfigurationName);.\zlib__$(PlatformName)_$(ConfigurationName);..\..\dep\lib\$(PlatformName)_debug" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(OutDir)\TrinityScript.pdb" + SubSystem="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(OutDir)\TrinityScript.lib" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> </Configurations> <References> </References> diff --git a/win/VC90/TrinityCore.vcproj b/win/VC90/TrinityCore.vcproj index cd5fb8e19d2..c93fa3eda09 100644 --- a/win/VC90/TrinityCore.vcproj +++ b/win/VC90/TrinityCore.vcproj @@ -4,8 +4,9 @@ Version="9,00" Name="TrinityCore" ProjectGUID="{A3A04E47-43A2-4C08-90B3-029CEF558594}" - RootNamespace="mangosd" - TargetFrameworkVersion="131072" + RootNamespace="trinitycore" + Keyword="Win32Proj" + TargetFrameworkVersion="0" > <Platforms> <Platform @@ -23,7 +24,6 @@ OutputDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -42,7 +42,7 @@ /> <Tool Name="VCMIDLTool" - TypeLibraryName=".\..\..\bin\Release\mangosd.tlb" + TypeLibraryName=".\..\..\bin\Release\trinitycore.tlb" /> <Tool Name="VCCLCompilerTool" @@ -63,6 +63,7 @@ SuppressStartupBanner="true" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" + CallingConvention="0" CompileAs="0" /> <Tool @@ -123,7 +124,6 @@ OutputDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -143,7 +143,7 @@ <Tool Name="VCMIDLTool" TargetEnvironment="3" - TypeLibraryName=".\..\..\bin\Release\mangosd.tlb" + TypeLibraryName=".\..\..\bin\Release\trinitycore.tlb" /> <Tool Name="VCCLCompilerTool" @@ -164,6 +164,7 @@ SuppressStartupBanner="true" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" + CallingConvention="0" CompileAs="0" /> <Tool @@ -190,6 +191,8 @@ MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.map" SubSystem="1" LinkTimeCodeGeneration="0" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" ImportLibrary="$(OutDir)\TrinityCore.lib" TargetMachine="17" /> @@ -221,7 +224,6 @@ OutputDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -240,7 +242,7 @@ /> <Tool Name="VCMIDLTool" - TypeLibraryName=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.tlb" + TypeLibraryName=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.tlb" /> <Tool Name="VCCLCompilerTool" @@ -251,6 +253,7 @@ IgnoreStandardIncludePath="false" BasicRuntimeChecks="3" RuntimeLibrary="3" + EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" PrecompiledHeaderFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.pch" AssemblerListingLocation=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" @@ -260,6 +263,7 @@ SuppressStartupBanner="true" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" + CallingConvention="0" CompileAs="0" /> <Tool @@ -279,7 +283,7 @@ AdditionalDependencies="libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRTD.LIB msvcrtd.lib" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.exe" Version="" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" GenerateDebugInformation="true" @@ -321,7 +325,6 @@ OutputDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -341,7 +344,7 @@ <Tool Name="VCMIDLTool" TargetEnvironment="3" - TypeLibraryName=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.tlb" + TypeLibraryName=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.tlb" /> <Tool Name="VCCLCompilerTool" @@ -352,6 +355,7 @@ IgnoreStandardIncludePath="false" BasicRuntimeChecks="3" RuntimeLibrary="3" + EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" PrecompiledHeaderFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.pch" AssemblerListingLocation=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" @@ -361,6 +365,7 @@ SuppressStartupBanner="true" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" + CallingConvention="0" CompileAs="0" /> <Tool @@ -379,7 +384,7 @@ AdditionalDependencies="libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRTD.LIB msvcrtd.lib" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.exe" Version="" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" GenerateDebugInformation="true" @@ -387,7 +392,9 @@ GenerateMapFile="true" MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.map" SubSystem="1" + RandomizedBaseAddress="1" FixedBaseAddress="1" + DataExecutionPrevention="0" ImportLibrary="$(OutDir)\TrinityCore.lib" TargetMachine="17" /> @@ -414,6 +421,208 @@ CommandLine="copy ..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\src\trinitycore\trinitycore.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.conf.dist
" /> </Configuration> + <Configuration + Name="Debug_NoPCH|Win32" + OutputDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="1" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.tlb" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" + Optimization="0" + AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\trinitycore;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="VERSION="0.13.0-DEV";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE;ENABLE_CLI" + IgnoreStandardIncludePath="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + EnableFunctionLevelLinking="true" + RuntimeTypeInfo="true" + PrecompiledHeaderFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.pch" + AssemblerListingLocation=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + CallingConvention="0" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <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" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\trinitycore.exe" + Version="" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_debug" + GenerateDebugInformation="true" + ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\trinitycore.pdb" + GenerateMapFile="true" + MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\trinitycore.map" + SubSystem="1" + LargeAddressAware="2" + RandomizedBaseAddress="1" + FixedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(OutDir)\trinitycore.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy ..\..\dep\lib\$(PlatformName)_debug\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)" + /> + </Configuration> + <Configuration + Name="Debug_NoPCH|x64" + OutputDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="1" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + TypeLibraryName=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.tlb" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" + Optimization="0" + AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\trinitycore;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="VERSION="0.13.0-DEV";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE;ENABLE_CLI" + IgnoreStandardIncludePath="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + EnableFunctionLevelLinking="true" + RuntimeTypeInfo="true" + PrecompiledHeaderFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.pch" + AssemblerListingLocation=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + CallingConvention="0" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <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" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\trinitycore.exe" + Version="" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_debug" + GenerateDebugInformation="true" + ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\trinitycore.pdb" + GenerateMapFile="true" + MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\trinitycore.map" + SubSystem="1" + RandomizedBaseAddress="1" + FixedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(OutDir)\trinitycore.lib" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy ..\..\dep\lib\$(PlatformName)_debug\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)" + /> + </Configuration> </Configurations> <References> </References> @@ -463,6 +672,10 @@ > </File> <File + RelativePath="..\..\src\trinitycore\TrinityCore.rc" + > + </File> + <File RelativePath="..\..\src\trinitycore\Master.cpp" > </File> @@ -483,10 +696,6 @@ > </File> <File - RelativePath="..\..\src\trinitycore\TrinityCore.rc" - > - </File> - <File RelativePath="..\..\src\shared\WheatyExceptionReport.cpp" > </File> diff --git a/win/VC90/TrinityRealm.vcproj b/win/VC90/TrinityRealm.vcproj index 85659d11540..98f1979ab1d 100644 --- a/win/VC90/TrinityRealm.vcproj +++ b/win/VC90/TrinityRealm.vcproj @@ -4,8 +4,8 @@ Version="9,00" Name="TrinityRealm" ProjectGUID="{563E9905-3657-460C-AE63-0AC39D162E23}" - RootNamespace="realmd" - TargetFrameworkVersion="131072" + RootNamespace="TrinityRealm" + Keyword="Win32Proj" > <Platforms> <Platform @@ -23,7 +23,6 @@ OutputDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -42,20 +41,20 @@ /> <Tool Name="VCMIDLTool" - TypeLibraryName=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.tlb" + TypeLibraryName=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.tlb" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" + AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\TrinityRealm;..\..\dep\ACE_wrappers" PreprocessorDefinitions="VERSION="0.12.0-SVN",WIN32,NDEBUG,_CONSOLE" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" EnableEnhancedInstructionSet="1" RuntimeTypeInfo="true" - PrecompiledHeaderFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\realmd.pch" + PrecompiledHeaderFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.pch" AssemblerListingLocation=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" ObjectFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" ProgramDataBaseFileName=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" @@ -63,6 +62,7 @@ SuppressStartupBanner="true" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" + CallingConvention="0" CompileAs="0" /> <Tool @@ -79,11 +79,11 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="zthread.lib 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 winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRT.LIB msvcrt.lib" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories=""..\..\dep\lib\$(PlatformName)_$(ConfigurationName)";".\zthread__$(PlatformName)_$(ConfigurationName)"" + AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" GenerateDebugInformation="true" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb" GenerateMapFile="true" @@ -121,7 +121,6 @@ OutputDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -141,20 +140,20 @@ <Tool Name="VCMIDLTool" TargetEnvironment="3" - TypeLibraryName=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.tlb" + TypeLibraryName=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.tlb" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" + AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\TrinityRealm;..\..\dep\ACE_wrappers" PreprocessorDefinitions="VERSION="0.12.0-SVN",WIN32,NDEBUG,_CONSOLE" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" EnableEnhancedInstructionSet="0" RuntimeTypeInfo="true" - PrecompiledHeaderFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\realmd.pch" + PrecompiledHeaderFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.pch" AssemblerListingLocation=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" ObjectFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" ProgramDataBaseFileName=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" @@ -162,6 +161,7 @@ SuppressStartupBanner="true" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" + CallingConvention="0" CompileAs="0" /> <Tool @@ -177,16 +177,18 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="zthread.lib 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 winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRT.LIB msvcrt.lib" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories=""..\..\dep\lib\$(PlatformName)_$(ConfigurationName)";".\zthread__$(PlatformName)_$(ConfigurationName)"" + AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" GenerateDebugInformation="true" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb" GenerateMapFile="true" MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.map" SubSystem="1" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" TargetMachine="17" /> <Tool @@ -217,7 +219,6 @@ OutputDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -236,19 +237,20 @@ /> <Tool Name="VCMIDLTool" - TypeLibraryName=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.tlb" + TypeLibraryName=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.tlb" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="0" - AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" + AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\TrinityRealm;..\..\dep\ACE_wrappers" PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE" IgnoreStandardIncludePath="false" BasicRuntimeChecks="3" RuntimeLibrary="3" + EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" - PrecompiledHeaderFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\realmd.pch" + PrecompiledHeaderFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.pch" AssemblerListingLocation=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" ObjectFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" ProgramDataBaseFileName=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" @@ -256,6 +258,7 @@ SuppressStartupBanner="true" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" + CallingConvention="0" CompileAs="0" /> <Tool @@ -272,11 +275,11 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="zthread.lib 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 winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRTD.LIB msvcrtd.lib" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories=""..\..\dep\lib\$(PlatformName)_$(ConfigurationName)";".\zthread__$(PlatformName)_$(ConfigurationName)"" + AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" GenerateDebugInformation="true" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb" GenerateMapFile="true" @@ -315,7 +318,6 @@ OutputDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -335,19 +337,20 @@ <Tool Name="VCMIDLTool" TargetEnvironment="3" - TypeLibraryName=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.tlb" + TypeLibraryName=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.tlb" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="0" - AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" + AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\TrinityRealm;..\..\dep\ACE_wrappers" PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE" IgnoreStandardIncludePath="false" BasicRuntimeChecks="3" RuntimeLibrary="3" + EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" - PrecompiledHeaderFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\realmd.pch" + PrecompiledHeaderFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.pch" AssemblerListingLocation=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" ObjectFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" ProgramDataBaseFileName=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" @@ -355,6 +358,7 @@ SuppressStartupBanner="true" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" + CallingConvention="0" CompileAs="0" /> <Tool @@ -370,17 +374,19 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="zthread.lib 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 winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRTD.LIB msvcrtd.lib" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories=""..\..\dep\lib\$(PlatformName)_$(ConfigurationName)";".\zthread__$(PlatformName)_$(ConfigurationName)"" + AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" GenerateDebugInformation="true" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb" GenerateMapFile="true" MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.map" SubSystem="1" + RandomizedBaseAddress="1" FixedBaseAddress="1" + DataExecutionPrevention="0" TargetMachine="17" /> <Tool @@ -406,6 +412,202 @@ CommandLine="copy ..\..\src\trinityrealm\trinityrealm.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.conf.dist" /> </Configuration> + <Configuration + Name="Debug_NoPCH|Win32" + OutputDirectory=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="1" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.tlb" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" + Optimization="0" + AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\TrinityRealm;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE" + IgnoreStandardIncludePath="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + EnableFunctionLevelLinking="true" + RuntimeTypeInfo="true" + PrecompiledHeaderFile=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.pch" + AssemblerListingLocation=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + CallingConvention="0" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <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" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_debug" + 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" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug_NoPCH|x64" + OutputDirectory=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="1" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + TypeLibraryName=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.tlb" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" + Optimization="0" + AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\TrinityRealm;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE" + IgnoreStandardIncludePath="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + EnableFunctionLevelLinking="true" + RuntimeTypeInfo="true" + PrecompiledHeaderFile=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)\TrinityRealm.pch" + AssemblerListingLocation=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\TrinityRealm__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + CallingConvention="0" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <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" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_debug" + GenerateDebugInformation="true" + ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb" + GenerateMapFile="true" + MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.map" + SubSystem="1" + RandomizedBaseAddress="1" + FixedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> </Configurations> <References> </References> @@ -427,15 +629,15 @@ > </File> <File - RelativePath="..\..\src\trinityrealm\RealmList.cpp" + RelativePath="..\..\src\trinityrealm\TrinityRealm.rc" > </File> <File - RelativePath="..\..\src\trinityrealm\RealmList.h" + RelativePath="..\..\src\trinityrealm\RealmList.cpp" > </File> <File - RelativePath="..\..\src\trinityrealm\TrinityRealm.rc" + RelativePath="..\..\src\trinityrealm\RealmList.h" > </File> <File diff --git a/win/VC90/framework.vcproj b/win/VC90/framework.vcproj index 3794c4b93a4..8639ac00d9b 100644 --- a/win/VC90/framework.vcproj +++ b/win/VC90/framework.vcproj @@ -5,8 +5,7 @@ Name="framework" ProjectGUID="{BF6F5D0E-33A5-4E23-9E7D-DD481B7B5B9E}" RootNamespace="framework" - Keyword="ManagedCProj" - TargetFrameworkVersion="131072" + Keyword="Win32Proj" > <Platforms> <Platform @@ -24,7 +23,6 @@ OutputDirectory=".\framework__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\framework__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" ManagedExtensions="0" > @@ -96,11 +94,86 @@ /> </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" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" ManagedExtensions="0" > @@ -172,11 +245,10 @@ /> </Configuration> <Configuration - Name="Debug|x64" + Name="Release|x64" OutputDirectory=".\framework__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\framework__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" ManagedExtensions="0" > @@ -199,6 +271,81 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/Zl /MP" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB" + 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> + <Configuration + Name="Debug_NoPCH|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" @@ -249,11 +396,10 @@ /> </Configuration> <Configuration - Name="Release|x64" + Name="Debug_NoPCH|x64" OutputDirectory=".\framework__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\framework__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" ManagedExtensions="0" > @@ -276,14 +422,13 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/Zl /MP" - InlineFunctionExpansion="1" + Optimization="0" AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB" - StringPooling="true" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB" MinimalRebuild="false" - RuntimeLibrary="2" + BasicRuntimeChecks="3" + RuntimeLibrary="3" EnableFunctionLevelLinking="true" - EnableEnhancedInstructionSet="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\framework__$(PlatformName)_$(ConfigurationName)\framework.pch" @@ -291,6 +436,7 @@ ObjectFile=".\framework__$(PlatformName)_$(ConfigurationName)\" ProgramDataBaseFileName=".\framework__$(PlatformName)_$(ConfigurationName)\" WarningLevel="3" + SuppressStartupBanner="true" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" CallingConvention="0" @@ -425,15 +571,15 @@ > </File> <File - RelativePath="..\..\src\framework\Utilities\UnorderedMap.h" + RelativePath="..\..\src\framework\Utilities\LinkedList.h" > </File> <File - RelativePath="..\..\src\framework\Utilities\LinkedList.h" + RelativePath="..\..\src\framework\Utilities\TypeList.h" > </File> <File - RelativePath="..\..\src\framework\Utilities\TypeList.h" + RelativePath="..\..\src\framework\Utilities\UnorderedMap.h" > </File> <Filter diff --git a/win/VC90/g3dlite.vcproj b/win/VC90/g3dlite.vcproj index 5eab1cfbad7..94b74589c74 100644 --- a/win/VC90/g3dlite.vcproj +++ b/win/VC90/g3dlite.vcproj @@ -4,8 +4,8 @@ Version="9,00" Name="g3dlite" ProjectGUID="{8072769E-CF10-48BF-B9E1-12752A5DAC6E}" + RootNamespace="sockets" Keyword="Win32Proj" - TargetFrameworkVersion="131072" > <Platforms> <Platform @@ -23,7 +23,6 @@ OutputDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" > <Tool @@ -92,11 +91,83 @@ /> </Configuration> <Configuration + Name="Debug|x64" + OutputDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" + Optimization="0" + AdditionalIncludeDirectories="..\..\dep\include\g3dlite" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + AssemblerListingLocation=".\g3dlite__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\g3dlite__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\g3dlite__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + CallingConvention="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)/g3dlite.lib" + IgnoreAllDefaultLibraries="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Release|Win32" OutputDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" > <Tool @@ -121,7 +192,6 @@ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="2" EnableEnhancedInstructionSet="1" - FloatingPointModel="2" UsePrecompiledHeader="0" AssemblerListingLocation=".\g3dlite__$(PlatformName)_$(ConfigurationName)\" ObjectFile=".\g3dlite__$(PlatformName)_$(ConfigurationName)\" @@ -162,11 +232,10 @@ /> </Configuration> <Configuration - Name="Debug|x64" + Name="Release|x64" OutputDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" > <Tool @@ -188,21 +257,89 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" + AdditionalIncludeDirectories="..\..\dep\include\g3dlite" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="2" + EnableEnhancedInstructionSet="0" + UsePrecompiledHeader="0" + AssemblerListingLocation=".\g3dlite__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\g3dlite__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\g3dlite__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + CallingConvention="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)/g3dlite.lib" + IgnoreAllDefaultLibraries="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug_NoPCH|Win32" + OutputDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include\g3dlite" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" - EnableFunctionLevelLinking="true" BufferSecurityCheck="true" + EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" AssemblerListingLocation=".\g3dlite__$(PlatformName)_$(ConfigurationName)\" ObjectFile=".\g3dlite__$(PlatformName)_$(ConfigurationName)\" ProgramDataBaseFileName=".\g3dlite__$(PlatformName)_$(ConfigurationName)\" WarningLevel="3" Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" + DebugInformationFormat="4" CallingConvention="0" /> <Tool @@ -236,11 +373,10 @@ /> </Configuration> <Configuration - Name="Release|x64" + Name="Debug_NoPCH|x64" OutputDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\g3dlite__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" > <Tool @@ -262,12 +398,15 @@ <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" + Optimization="0" AdditionalIncludeDirectories="..\..\dep\include\g3dlite" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="2" - EnableEnhancedInstructionSet="0" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + BufferSecurityCheck="true" + EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" - FloatingPointModel="2" AssemblerListingLocation=".\g3dlite__$(PlatformName)_$(ConfigurationName)\" ObjectFile=".\g3dlite__$(PlatformName)_$(ConfigurationName)\" ProgramDataBaseFileName=".\g3dlite__$(PlatformName)_$(ConfigurationName)\" diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj index bf01ae8bb5f..dfa15785972 100644 --- a/win/VC90/game.vcproj +++ b/win/VC90/game.vcproj @@ -5,7 +5,8 @@ Name="game" ProjectGUID="{1DC6C4DA-A028-41F3-877D-D5400C594F88}" RootNamespace="game" - TargetFrameworkVersion="131072" + Keyword="Win32Proj" + TargetFrameworkVersion="0" > <Platforms> <Platform @@ -23,7 +24,6 @@ OutputDirectory=".\game__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\game__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -45,7 +45,170 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/MP /openmp" + AdditionalOptions="/MP /Zm200" + Optimization="0" + AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;" + StringPooling="false" + MinimalRebuild="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + EnableFunctionLevelLinking="true" + RuntimeTypeInfo="true" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="pchdef.h" + PrecompiledHeaderFile=".\game__$(PlatformName)_$(ConfigurationName)\game.pch" + AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\game__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + CallingConvention="0" + CompileAs="0" + ForcedIncludeFiles="pchdef.h" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile=".\game__$(PlatformName)_$(ConfigurationName)\game.lib" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory=".\game__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\game__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP /Zm200" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;FASTBUILD" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="1" + RuntimeTypeInfo="true" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="pchdef.h" + PrecompiledHeaderFile=".\game__$(PlatformName)_$(ConfigurationName)\game.pch" + AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\game__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + CallingConvention="0" + CompileAs="0" + ForcedIncludeFiles="pchdef.h" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile=".\game__$(PlatformName)_$(ConfigurationName)\game.lib" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug_NoPCH|Win32" + OutputDirectory=".\game__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\game__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers" PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;" @@ -80,7 +243,6 @@ /> <Tool Name="VCLibrarianTool" - AdditionalDependencies=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" OutputFile=".\game__$(PlatformName)_$(ConfigurationName)\game.lib" SuppressStartupBanner="true" /> @@ -105,7 +267,6 @@ OutputDirectory=".\game__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\game__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -128,7 +289,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/MP /openmp" + AdditionalOptions="/MP /bigobj /Zm200" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers" PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;" @@ -138,7 +299,8 @@ RuntimeLibrary="3" EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" - UsePrecompiledHeader="0" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="pchdef.h" PrecompiledHeaderFile=".\game__$(PlatformName)_$(ConfigurationName)\game.pch" AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\" ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\" @@ -149,6 +311,7 @@ DebugInformationFormat="3" CallingConvention="0" CompileAs="0" + ForcedIncludeFiles="pchdef.h" /> <Tool Name="VCManagedResourceCompilerTool" @@ -184,11 +347,10 @@ /> </Configuration> <Configuration - Name="Release|Win32" + Name="Release|x64" OutputDirectory=".\game__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\game__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -207,20 +369,21 @@ /> <Tool Name="VCMIDLTool" + TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/MP /openmp" + AdditionalOptions="/MP /bigobj /Zm200" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;FASTBUILD" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" - EnableEnhancedInstructionSet="1" - FloatingPointModel="2" + EnableEnhancedInstructionSet="0" RuntimeTypeInfo="true" - UsePrecompiledHeader="0" + UsePrecompiledHeader="2" + PrecompiledHeaderThrough="pchdef.h" PrecompiledHeaderFile=".\game__$(PlatformName)_$(ConfigurationName)\game.pch" AssemblerListingLocation=".\game__$(PlatformName)_$(ConfigurationName)\" ObjectFile=".\game__$(PlatformName)_$(ConfigurationName)\" @@ -231,6 +394,7 @@ DebugInformationFormat="3" CallingConvention="0" CompileAs="0" + ForcedIncludeFiles="pchdef.h" /> <Tool Name="VCManagedResourceCompilerTool" @@ -266,11 +430,10 @@ /> </Configuration> <Configuration - Name="Release|x64" + Name="Debug_NoPCH|x64" OutputDirectory=".\game__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\game__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -293,15 +456,15 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/MP /openmp" - InlineFunctionExpansion="1" + AdditionalOptions="/MP /bigobj" + Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;" - StringPooling="true" - RuntimeLibrary="2" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;" + StringPooling="false" + MinimalRebuild="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" EnableFunctionLevelLinking="true" - EnableEnhancedInstructionSet="0" - FloatingPointModel="2" RuntimeTypeInfo="true" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\game__$(PlatformName)_$(ConfigurationName)\game.pch" @@ -320,7 +483,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool @@ -353,724 +516,714 @@ </References> <Files> <Filter - Name="World/Others" + Name="World/Handlers" > <File - RelativePath="..\..\src\game\Channel.cpp" + RelativePath="..\..\src\game\AccountMgr.cpp" > </File> <File - RelativePath="..\..\src\game\Channel.h" + RelativePath="..\..\src\game\AccountMgr.h" > </File> <File - RelativePath="..\..\src\game\Chat.cpp" + RelativePath="..\..\src\game\AchievementMgr.cpp" > </File> <File - RelativePath="..\..\src\game\Chat.h" + RelativePath="..\..\src\game\AchievementMgr.h" > </File> <File - RelativePath="..\..\src\game\GameEvent.cpp" + RelativePath="..\..\src\game\ArenaTeamHandler.cpp" > </File> <File - RelativePath="..\..\src\game\GameEvent.h" + RelativePath="..\..\src\game\AuctionHouseHandler.cpp" > </File> <File - RelativePath="..\..\src\game\GossipDef.cpp" + RelativePath="..\..\src\game\BattleGround.cpp" > </File> <File - RelativePath="..\..\src\game\GossipDef.h" + RelativePath="..\..\src\game\BattleGround.h" > </File> <File - RelativePath="..\..\src\game\Mail.cpp" + RelativePath="..\..\src\game\BattleGroundAA.cpp" > </File> <File - RelativePath="..\..\src\game\Mail.h" + RelativePath="..\..\src\game\BattleGroundAA.h" > </File> <File - RelativePath="..\..\src\game\QuestDef.cpp" + RelativePath="..\..\src\game\BattleGroundAB.cpp" > </File> <File - RelativePath="..\..\src\game\QuestDef.h" + RelativePath="..\..\src\game\BattleGroundAB.h" > </File> <File - RelativePath="..\..\src\game\UpdateData.cpp" + RelativePath="..\..\src\game\BattleGroundAV.cpp" > </File> <File - RelativePath="..\..\src\game\UpdateData.h" + RelativePath="..\..\src\game\BattleGroundAV.h" > </File> <File - RelativePath="..\..\src\game\World.cpp" + RelativePath="..\..\src\game\BattleGroundBE.cpp" > </File> <File - RelativePath="..\..\src\game\World.h" + RelativePath="..\..\src\game\BattleGroundBE.h" > </File> - </Filter> - <Filter - Name="AuctionHouseBot" - > <File - RelativePath="..\..\src\game\AuctionHouseBot.cpp"> + RelativePath="..\..\src\game\BattleGroundDS.cpp" + > </File> <File - RelativePath="..\..\src\game\AuctionHouseBot.h"> + RelativePath="..\..\src\game\BattleGroundDS.h" + > </File> - </Filter> - <Filter - Name="Objects" - > <File - RelativePath="..\..\src\game\ArenaTeam.cpp" + RelativePath="..\..\src\game\BattleGroundEY.cpp" > </File> <File - RelativePath="..\..\src\game\ArenaTeam.h" + RelativePath="..\..\src\game\BattleGroundEY.h" > </File> <File - RelativePath="..\..\src\game\Bag.cpp" + RelativePath="..\..\src\game\BattleGroundHandler.cpp" > </File> <File - RelativePath="..\..\src\game\Bag.h" + RelativePath="..\..\src\game\BattleGroundMgr.cpp" > </File> <File - RelativePath="..\..\src\game\Corpse.cpp" + RelativePath="..\..\src\game\BattleGroundMgr.h" > </File> <File - RelativePath="..\..\src\game\Corpse.h" + RelativePath="..\..\src\game\BattleGroundNA.cpp" > </File> <File - RelativePath="..\..\src\game\Creature.cpp" + RelativePath="..\..\src\game\BattleGroundNA.h" > </File> <File - RelativePath="..\..\src\game\Creature.h" + RelativePath="..\..\src\game\BattleGroundRL.cpp" > </File> <File - RelativePath="..\..\src\game\CreatureGroups.cpp" + RelativePath="..\..\src\game\BattleGroundRL.h" > </File> <File - RelativePath="..\..\src\game\CreatureGroups.h" + RelativePath="..\..\src\game\BattleGroundRV.cpp" > </File> <File - RelativePath="..\..\src\game\DestinationHolder.cpp" + RelativePath="..\..\src\game\BattleGroundRV.h" > </File> <File - RelativePath="..\..\src\game\DestinationHolder.h" + RelativePath="..\..\src\game\BattleGroundSA.cpp" > </File> <File - RelativePath="..\..\src\game\DestinationHolderImp.h" + RelativePath="..\..\src\game\BattleGroundSA.h" > </File> <File - RelativePath="..\..\src\game\DynamicObject.cpp" + RelativePath="..\..\src\game\BattleGroundWS.cpp" > </File> <File - RelativePath="..\..\src\game\DynamicObject.h" + RelativePath="..\..\src\game\BattleGroundWS.h" > </File> <File - RelativePath="..\..\src\game\Formulas.h" + RelativePath="..\..\src\game\CalendarHandler.cpp" > </File> <File - RelativePath="..\..\src\game\GameObject.cpp" + RelativePath="..\..\src\game\Cell.h" > </File> <File - RelativePath="..\..\src\game\GameObject.h" + RelativePath="..\..\src\game\CellImpl.h" > </File> <File - RelativePath="..\..\src\game\Group.cpp" + RelativePath="..\..\src\game\Channel.cpp" > </File> <File - RelativePath="..\..\src\game\Group.h" + RelativePath="..\..\src\game\Channel.h" > </File> <File - RelativePath="..\..\src\game\Guild.cpp" + RelativePath="..\..\src\game\ChannelHandler.cpp" > </File> <File - RelativePath="..\..\src\game\Guild.h" + RelativePath="..\..\src\game\ChannelMgr.h" > </File> <File - RelativePath="..\..\src\game\Item.cpp" + RelativePath="..\..\src\game\CharacterHandler.cpp" > </File> <File - RelativePath="..\..\src\game\Item.h" + RelativePath="..\..\src\game\Chat.cpp" > </File> <File - RelativePath="..\..\src\game\ItemPrototype.h" + RelativePath="..\..\src\game\Chat.h" > </File> <File - RelativePath="..\..\src\game\MotionMaster.cpp" + RelativePath="..\..\src\game\ChatHandler.cpp" > </File> <File - RelativePath="..\..\src\game\MotionMaster.h" + RelativePath="..\..\src\game\CombatHandler.cpp" > </File> <File - RelativePath="..\..\src\game\Object.cpp" + RelativePath="..\..\src\game\DuelHandler.cpp" > </File> <File - RelativePath="..\..\src\game\Object.h" + RelativePath="..\..\src\game\GameEventMgr.cpp" > </File> <File - RelativePath="..\..\src\game\ObjectAccessor.cpp" + RelativePath="..\..\src\game\GameEventMgr.h" > </File> <File - RelativePath="..\..\src\game\ObjectAccessor.h" + RelativePath="..\..\src\game\GossipDef.cpp" > </File> <File - RelativePath="..\..\src\game\ObjectDefines.h" + RelativePath="..\..\src\game\GossipDef.h" > </File> <File - RelativePath="..\..\src\game\Pet.cpp" + RelativePath="..\..\src\game\GridDefines.h" > </File> <File - RelativePath="..\..\src\game\Pet.h" + RelativePath="..\..\src\game\GridNotifiers.cpp" > </File> <File - RelativePath="..\..\src\game\Player.cpp" + RelativePath="..\..\src\game\GridNotifiers.h" > </File> <File - RelativePath="..\..\src\game\Player.h" + RelativePath="..\..\src\game\GridNotifiersImpl.h" > </File> <File - RelativePath="..\..\src\game\TemporarySummon.cpp" + RelativePath="..\..\src\game\GridStates.cpp" > </File> <File - RelativePath="..\..\src\game\TemporarySummon.h" + RelativePath="..\..\src\game\GridStates.h" > </File> <File - RelativePath="..\..\src\game\Totem.cpp" + RelativePath="..\..\src\game\Group.cpp" > </File> <File - RelativePath="..\..\src\game\Totem.h" + RelativePath="..\..\src\game\Group.h" > </File> <File - RelativePath="..\..\src\game\Traveller.h" + RelativePath="..\..\src\game\GroupHandler.cpp" > </File> <File - RelativePath="..\..\src\game\Unit.cpp" + RelativePath="..\..\src\game\GuildHandler.cpp" > </File> <File - RelativePath="..\..\src\game\Unit.h" + RelativePath="..\..\src\game\InstanceData.cpp" > </File> <File - RelativePath="..\..\src\game\UnitEvents.h" + RelativePath="..\..\src\game\InstanceData.h" > </File> <File - RelativePath="..\..\src\game\UpdateFields.h" + RelativePath="..\..\src\game\InstanceSaveMgr.cpp" > </File> <File - RelativePath="..\..\src\game\UpdateMask.h" + RelativePath="..\..\src\game\InstanceSaveMgr.h" > </File> - </Filter> - <Filter - Name="Server" - > <File - RelativePath="..\..\src\game\GlobalEvents.cpp" + RelativePath="..\..\src\game\ItemHandler.cpp" > </File> <File - RelativePath="..\..\src\game\GlobalEvents.h" + RelativePath="..\..\src\game\LFGHandler.cpp" > </File> <File - RelativePath="..\..\src\game\Opcodes.cpp" + RelativePath="..\..\src\game\LootHandler.cpp" > </File> <File - RelativePath="..\..\src\game\Opcodes.h" + RelativePath="..\..\src\game\Mail.cpp" > </File> <File - RelativePath="..\..\src\game\SharedDefines.h" + RelativePath="..\..\src\game\Mail.h" > </File> <File - RelativePath="..\..\src\game\WorldLog.cpp" + RelativePath="..\..\src\game\Map.cpp" > </File> <File - RelativePath="..\..\src\game\WorldLog.h" + RelativePath="..\..\src\game\Map.h" > </File> <File - RelativePath="..\..\src\game\WorldSession.cpp" + RelativePath="..\..\src\game\MapInstanced.cpp" > </File> <File - RelativePath="..\..\src\game\WorldSession.h" + RelativePath="..\..\src\game\MapInstanced.h" > </File> <File - RelativePath="..\..\src\game\WorldSocket.cpp" + RelativePath="..\..\src\game\MapManager.cpp" > </File> <File - RelativePath="..\..\src\game\WorldSocket.h" + RelativePath="..\..\src\game\MapManager.h" > </File> <File - RelativePath="..\..\src\game\WorldSocketMgr.cpp" + RelativePath="..\..\src\game\MiscHandler.cpp" > </File> <File - RelativePath="..\..\src\game\WorldSocketMgr.h" + RelativePath="..\..\src\game\MovementHandler.cpp" > </File> - </Filter> - <Filter - Name="Chat Commands" - > <File - RelativePath="..\..\src\game\Debugcmds.cpp" + RelativePath="..\..\src\game\NPCHandler.cpp" > </File> <File - RelativePath="..\..\src\game\Level0.cpp" + RelativePath="..\..\src\game\NPCHandler.h" > </File> <File - RelativePath="..\..\src\game\Level1.cpp" + RelativePath="..\..\src\game\ObjectGridLoader.cpp" > </File> <File - RelativePath="..\..\src\game\Level2.cpp" + RelativePath="..\..\src\game\ObjectGridLoader.h" > </File> <File - RelativePath="..\..\src\game\Level3.cpp" + RelativePath="..\..\src\game\Path.h" > </File> - </Filter> - <Filter - Name="Tools" - > <File - RelativePath="..\..\src\game\Language.h" + RelativePath="..\..\src\game\PetHandler.cpp" > </File> <File - RelativePath="..\..\src\game\PlayerDump.cpp" + RelativePath="..\..\src\game\PetitionsHandler.cpp" > </File> <File - RelativePath="..\..\src\game\PlayerDump.h" + RelativePath="..\..\src\game\PoolHandler.cpp" > </File> <File - RelativePath="..\..\src\game\ScriptCalls.cpp" + RelativePath="..\..\src\game\PoolHandler.h" > </File> <File - RelativePath="..\..\src\game\ScriptCalls.h" + RelativePath="..\..\src\game\QueryHandler.cpp" > </File> <File - RelativePath="..\..\src\game\Tools.cpp" + RelativePath="..\..\src\game\QuestDef.cpp" > </File> <File - RelativePath="..\..\src\game\Tools.h" + RelativePath="..\..\src\game\QuestDef.h" > </File> - </Filter> - <Filter - Name="References" - > <File - RelativePath="..\..\src\game\FollowerReference.cpp" + RelativePath="..\..\src\game\QuestHandler.cpp" > </File> <File - RelativePath="..\..\src\game\FollowerReference.h" + RelativePath="..\..\src\game\ScriptCalls.cpp" > </File> <File - RelativePath="..\..\src\game\FollowerRefManager.h" + RelativePath="..\..\src\game\ScriptCalls.h" > </File> <File - RelativePath="..\..\src\game\GroupReference.cpp" + RelativePath="..\..\src\game\SkillDiscovery.cpp" > </File> <File - RelativePath="..\..\src\game\GroupReference.h" + RelativePath="..\..\src\game\SkillDiscovery.h" > </File> <File - RelativePath="..\..\src\game\GroupRefManager.h" + RelativePath="..\..\src\game\SkillExtraItems.cpp" > </File> <File - RelativePath="..\..\src\game\HostilRefManager.cpp" + RelativePath="..\..\src\game\SkillExtraItems.h" > </File> <File - RelativePath="..\..\src\game\HostilRefManager.h" + RelativePath="..\..\src\game\SkillHandler.cpp" > </File> <File - RelativePath="..\..\src\game\ThreatManager.cpp" + RelativePath="..\..\src\game\Spell.cpp" > </File> <File - RelativePath="..\..\src\game\ThreatManager.h" + RelativePath="..\..\src\game\Spell.h" > </File> - </Filter> - <Filter - Name="Battlegrounds" - > <File - RelativePath="..\..\src\game\BattleGround.cpp" + RelativePath="..\..\src\game\SpellAuraDefines.h" > </File> <File - RelativePath="..\..\src\game\BattleGround.h" + RelativePath="..\..\src\game\SpellAuras.cpp" > </File> <File - RelativePath="..\..\src\game\BattleGroundAA.cpp" + RelativePath="..\..\src\game\SpellAuras.h" > </File> <File - RelativePath="..\..\src\game\BattleGroundAA.h" + RelativePath="..\..\src\game\SpellEffects.cpp" > </File> <File - RelativePath="..\..\src\game\BattleGroundAB.cpp" + RelativePath="..\..\src\game\SpellHandler.cpp" > </File> <File - RelativePath="..\..\src\game\BattleGroundAB.h" + RelativePath="..\..\src\game\TaxiHandler.cpp" > </File> <File - RelativePath="..\..\src\game\BattleGroundAV.cpp" + RelativePath="..\..\src\game\TicketHandler.cpp" > </File> <File - RelativePath="..\..\src\game\BattleGroundAV.h" + RelativePath="..\..\src\game\TradeHandler.cpp" > </File> <File - RelativePath="..\..\src\game\BattleGroundBE.cpp" + RelativePath="..\..\src\game\Transports.cpp" > </File> <File - RelativePath="..\..\src\game\BattleGroundBE.h" + RelativePath="..\..\src\game\Transports.h" > </File> <File - RelativePath="..\..\src\game\BattleGroundEY.cpp" + RelativePath="..\..\src\game\UpdateData.cpp" > </File> <File - RelativePath="..\..\src\game\BattleGroundEY.h" + RelativePath="..\..\src\game\UpdateData.h" > </File> <File - RelativePath="..\..\src\game\BattleGroundHandler.cpp" + RelativePath="..\..\src\game\VoiceChatHandler.cpp" > </File> <File - RelativePath="..\..\src\game\BattleGroundMgr.cpp" + RelativePath="..\..\src\game\WaypointManager.cpp" > </File> <File - RelativePath="..\..\src\game\BattleGroundMgr.h" + RelativePath="..\..\src\game\WaypointManager.h" > </File> <File - RelativePath="..\..\src\game\BattleGroundNA.cpp" + RelativePath="..\..\src\game\Weather.cpp" > </File> <File - RelativePath="..\..\src\game\BattleGroundNA.h" + RelativePath="..\..\src\game\Weather.h" > </File> <File - RelativePath="..\..\src\game\BattleGroundRL.cpp" + RelativePath="..\..\src\game\World.cpp" > </File> <File - RelativePath="..\..\src\game\BattleGroundRL.h" + RelativePath="..\..\src\game\World.h" > </File> + </Filter> + <Filter + Name="AuctionHouseBot" + > <File - RelativePath="..\..\src\game\BattleGroundWS.cpp" + RelativePath="..\..\src\game\AuctionHouseBot.cpp" > </File> <File - RelativePath="..\..\src\game\BattleGroundWS.h" + RelativePath="..\..\src\game\AuctionHouseBot.h" > </File> </Filter> <Filter - Name="Outdoor PvP" + Name="Object" > <File - RelativePath="..\..\src\game\OutdoorPvP.cpp" + RelativePath="..\..\src\game\AnimalRandomMovementGenerator.h" > </File> <File - RelativePath="..\..\src\game\OutdoorPvP.h" + RelativePath="..\..\src\game\ArenaTeam.cpp" > </File> <File - RelativePath="..\..\src\game\OutdoorPvPEP.cpp" + RelativePath="..\..\src\game\ArenaTeam.h" > </File> <File - RelativePath="..\..\src\game\OutdoorPvPEP.h" + RelativePath="..\..\src\game\AuctionHouseMgr.cpp" > </File> <File - RelativePath="..\..\src\game\OutdoorPvPHP.cpp" + RelativePath="..\..\src\game\AuctionHouseMgr.h" > </File> <File - RelativePath="..\..\src\game\OutdoorPvPHP.h" + RelativePath="..\..\src\game\Bag.cpp" > </File> <File - RelativePath="..\..\src\game\OutdoorPvPMgr.cpp" + RelativePath="..\..\src\game\Bag.h" > </File> <File - RelativePath="..\..\src\game\OutdoorPvPMgr.h" + RelativePath="..\..\src\game\Calendar.cpp" > </File> <File - RelativePath="..\..\src\game\OutdoorPvPNA.cpp" + RelativePath="..\..\src\game\Calendar.h" > </File> <File - RelativePath="..\..\src\game\OutdoorPvPNA.h" + RelativePath="..\..\src\game\ConfusedMovementGenerator.cpp" > </File> <File - RelativePath="..\..\src\game\OutdoorPvPObjectiveAI.cpp" + RelativePath="..\..\src\game\ConfusedMovementGenerator.h" > </File> <File - RelativePath="..\..\src\game\OutdoorPvPObjectiveAI.h" + RelativePath="..\..\src\game\Corpse.cpp" > </File> <File - RelativePath="..\..\src\game\OutdoorPvPSI.cpp" + RelativePath="..\..\src\game\Corpse.h" > </File> <File - RelativePath="..\..\src\game\OutdoorPvPSI.h" + RelativePath="..\..\src\game\Creature.cpp" > </File> <File - RelativePath="..\..\src\game\OutdoorPvPTF.cpp" + RelativePath="..\..\src\game\Creature.h" > </File> <File - RelativePath="..\..\src\game\OutdoorPvPTF.h" + RelativePath="..\..\src\game\CreatureGroups.cpp" > </File> <File - RelativePath="..\..\src\game\OutdoorPvPZM.cpp" + RelativePath="..\..\src\game\CreatureGroups.h" > </File> <File - RelativePath="..\..\src\game\OutdoorPvPZM.h" + RelativePath="..\..\src\game\DestinationHolder.cpp" > </File> - </Filter> - <Filter - Name="Artificial Intelligence" - > <File - RelativePath="..\..\src\game\AggressorAI.cpp" + RelativePath="..\..\src\game\DestinationHolder.h" > </File> <File - RelativePath="..\..\src\game\AggressorAI.h" + RelativePath="..\..\src\game\DestinationHolderImp.h" > </File> <File - RelativePath="..\..\src\game\CreatureAI.cpp" + RelativePath="..\..\src\game\DynamicObject.cpp" > </File> <File - RelativePath="..\..\src\game\CreatureAI.h" + RelativePath="..\..\src\game\DynamicObject.h" > </File> <File - RelativePath="..\..\src\game\CreatureAIImpl.h" + RelativePath="..\..\src\game\FleeingMovementGenerator.cpp" > </File> <File - RelativePath="..\..\src\game\CreatureAIRegistry.cpp" + RelativePath="..\..\src\game\FleeingMovementGenerator.h" > </File> <File - RelativePath="..\..\src\game\CreatureAIRegistry.h" + RelativePath="..\..\src\game\Formulas.h" > </File> <File - RelativePath="..\..\src\game\CreatureAISelector.cpp" + RelativePath="..\..\src\game\GameObject.cpp" > </File> <File - RelativePath="..\..\src\game\CreatureAISelector.h" + RelativePath="..\..\src\game\GameObject.h" > </File> <File - RelativePath="..\..\src\game\GuardAI.cpp" + RelativePath="..\..\src\game\Guild.cpp" > </File> <File - RelativePath="..\..\src\game\GuardAI.h" + RelativePath="..\..\src\game\Guild.h" > </File> <File - RelativePath="..\..\src\game\NullCreatureAI.cpp" + RelativePath="..\..\src\game\HomeMovementGenerator.cpp" > </File> <File - RelativePath="..\..\src\game\NullCreatureAI.h" + RelativePath="..\..\src\game\HomeMovementGenerator.h" > </File> <File - RelativePath="..\..\src\game\PetAI.cpp" + RelativePath="..\..\src\game\IdleMovementGenerator.cpp" > </File> <File - RelativePath="..\..\src\game\PetAI.h" + RelativePath="..\..\src\game\IdleMovementGenerator.h" > </File> <File - RelativePath="..\..\src\game\PossessedAI.cpp" + RelativePath="..\..\src\game\Item.cpp" > </File> <File - RelativePath="..\..\src\game\PossessedAI.h" + RelativePath="..\..\src\game\Item.h" > </File> <File - RelativePath="..\..\src\game\ReactorAI.cpp" + RelativePath="..\..\src\game\ItemEnchantmentMgr.cpp" > </File> <File - RelativePath="..\..\src\game\ReactorAI.h" + RelativePath="..\..\src\game\ItemEnchantmentMgr.h" > </File> <File - RelativePath="..\..\src\game\TotemAI.cpp" + RelativePath="..\..\src\game\ItemPrototype.h" > </File> <File - RelativePath="..\..\src\game\TotemAI.h" + RelativePath="..\..\src\game\LootMgr.cpp" > </File> - </Filter> - <Filter - Name="Movement Generators" - > <File - RelativePath="..\..\src\game\AnimalRandomMovementGenerator.h" + RelativePath="..\..\src\game\LootMgr.h" > </File> <File - RelativePath="..\..\src\game\ConfusedMovementGenerator.cpp" + RelativePath="..\..\src\game\MotionMaster.cpp" > </File> <File - RelativePath="..\..\src\game\ConfusedMovementGenerator.h" + RelativePath="..\..\src\game\MotionMaster.h" > </File> <File - RelativePath="..\..\src\game\FleeingMovementGenerator.cpp" + RelativePath="..\..\src\game\MovementGenerator.cpp" > </File> <File - RelativePath="..\..\src\game\FleeingMovementGenerator.h" + RelativePath="..\..\src\game\MovementGenerator.h" > </File> <File - RelativePath="..\..\src\game\HomeMovementGenerator.cpp" + RelativePath="..\..\src\game\Object.cpp" > </File> <File - RelativePath="..\..\src\game\HomeMovementGenerator.h" + RelativePath="..\..\src\game\Object.h" > </File> <File - RelativePath="..\..\src\game\IdleMovementGenerator.cpp" + RelativePath="..\..\src\game\ObjectAccessor.cpp" > </File> <File - RelativePath="..\..\src\game\IdleMovementGenerator.h" + RelativePath="..\..\src\game\ObjectAccessor.h" > </File> <File - RelativePath="..\..\src\game\MovementGenerator.cpp" + RelativePath="..\..\src\game\ObjectDefines.h" > </File> <File - RelativePath="..\..\src\game\MovementGenerator.h" + RelativePath="..\..\src\game\ObjectMgr.cpp" + > + </File> + <File + RelativePath="..\..\src\game\ObjectMgr.h" + > + </File> + <File + RelativePath="..\..\src\game\Pet.cpp" + > + </File> + <File + RelativePath="..\..\src\game\Pet.h" + > + </File> + <File + RelativePath="..\..\src\game\Player.cpp" + > + </File> + <File + RelativePath="..\..\src\game\Player.h" > </File> <File @@ -1090,378 +1243,502 @@ > </File> <File - RelativePath="..\..\src\game\TargetedMovementGenerator.cpp" + RelativePath="..\..\src\game\ReputationMgr.cpp" > </File> <File - RelativePath="..\..\src\game\TargetedMovementGenerator.h" + RelativePath="..\..\src\game\ReputationMgr.h" > </File> <File - RelativePath="..\..\src\game\WaypointMovementGenerator.cpp" + RelativePath="..\..\src\game\SocialMgr.cpp" > </File> <File - RelativePath="..\..\src\game\WaypointMovementGenerator.h" + RelativePath="..\..\src\game\SocialMgr.h" > </File> - </Filter> - <Filter - Name="Spells/Skills" - > <File - RelativePath="..\..\src\game\SkillDiscovery.cpp" + RelativePath="..\..\src\game\SpellMgr.cpp" > </File> <File - RelativePath="..\..\src\game\SkillDiscovery.h" + RelativePath="..\..\src\game\SpellMgr.h" > </File> <File - RelativePath="..\..\src\game\SkillExtraItems.cpp" + RelativePath="..\..\src\game\StatSystem.cpp" > </File> <File - RelativePath="..\..\src\game\SkillExtraItems.h" + RelativePath="..\..\src\game\TargetedMovementGenerator.cpp" > </File> <File - RelativePath="..\..\src\game\SkillHandler.cpp" + RelativePath="..\..\src\game\TargetedMovementGenerator.h" > </File> <File - RelativePath="..\..\src\game\Spell.cpp" + RelativePath="..\..\src\game\TemporarySummon.cpp" > </File> <File - RelativePath="..\..\src\game\Spell.h" + RelativePath="..\..\src\game\TemporarySummon.h" > </File> <File - RelativePath="..\..\src\game\SpellAuraDefines.h" + RelativePath="..\..\src\game\Totem.cpp" > </File> <File - RelativePath="..\..\src\game\SpellAuras.cpp" + RelativePath="..\..\src\game\Totem.h" > </File> <File - RelativePath="..\..\src\game\SpellAuras.h" + RelativePath="..\..\src\game\Traveller.h" > </File> <File - RelativePath="..\..\src\game\SpellEffects.cpp" + RelativePath="..\..\src\game\Unit.cpp" > </File> <File - RelativePath="..\..\src\game\SpellHandler.cpp" + RelativePath="..\..\src\game\Unit.h" > </File> <File - RelativePath="..\..\src\game\SpellMgr.cpp" + RelativePath="..\..\src\game\UnitEvents.h" > </File> <File - RelativePath="..\..\src\game\SpellMgr.h" + RelativePath="..\..\src\game\UpdateFields.h" > </File> <File - RelativePath="..\..\src\game\StatSystem.cpp" + RelativePath="..\..\src\game\UpdateMask.h" > </File> - </Filter> - <Filter - Name="Maps/Grids" - > <File - RelativePath="..\..\src\game\Cell.h" + RelativePath="..\..\src\game\Vehicle.cpp" > </File> <File - RelativePath="..\..\src\game\CellImpl.h" + RelativePath="..\..\src\game\Vehicle.h" > </File> <File - RelativePath="..\..\src\game\GridDefines.h" + RelativePath="..\..\src\game\WaypointMovementGenerator.cpp" > </File> <File - RelativePath="..\..\src\game\GridNotifiers.cpp" + RelativePath="..\..\src\game\WaypointMovementGenerator.h" > </File> <File - RelativePath="..\..\src\game\GridNotifiers.h" + RelativePath="..\..\src\game\ZoneScript.h" > </File> + </Filter> + <Filter + Name="Server" + > <File - RelativePath="..\..\src\game\GridNotifiersImpl.h" + RelativePath="..\..\src\game\DBCEnums.h" > </File> <File - RelativePath="..\..\src\game\GridStates.cpp" + RelativePath="..\..\src\game\DBCfmt.h" > </File> <File - RelativePath="..\..\src\game\GridStates.h" + RelativePath="..\..\src\game\DBCStores.cpp" > </File> <File - RelativePath="..\..\src\game\InstanceData.cpp" + RelativePath="..\..\src\game\DBCStores.h" > </File> <File - RelativePath="..\..\src\game\InstanceData.h" + RelativePath="..\..\src\game\DBCStructure.h" > </File> <File - RelativePath="..\..\src\game\InstanceSaveMgr.cpp" + RelativePath="..\..\src\game\GlobalEvents.cpp" > </File> <File - RelativePath="..\..\src\game\InstanceSaveMgr.h" + RelativePath="..\..\src\game\GlobalEvents.h" > </File> <File - RelativePath="..\..\src\game\Map.cpp" + RelativePath="..\..\src\game\Opcodes.cpp" > </File> <File - RelativePath="..\..\src\game\Map.h" + RelativePath="..\..\src\game\Opcodes.h" > </File> <File - RelativePath="..\..\src\game\MapInstanced.cpp" + RelativePath="..\..\src\game\SharedDefines.h" > </File> <File - RelativePath="..\..\src\game\MapInstanced.h" + RelativePath="..\..\src\game\WorldLog.cpp" > </File> <File - RelativePath="..\..\src\game\MapManager.cpp" + RelativePath="..\..\src\game\WorldLog.h" > </File> <File - RelativePath="..\..\src\game\MapManager.h" + RelativePath="..\..\src\game\WorldSession.cpp" > </File> <File - RelativePath="..\..\src\game\MapReference.h" + RelativePath="..\..\src\game\WorldSession.h" > </File> <File - RelativePath="..\..\src\game\MapRefManager.h" + RelativePath="..\..\src\game\WorldSocket.cpp" > </File> <File - RelativePath="..\..\src\game\ObjectGridLoader.cpp" + RelativePath="..\..\src\game\WorldSocket.h" > </File> <File - RelativePath="..\..\src\game\ObjectGridLoader.h" + RelativePath="..\..\src\game\WorldSocketMgr.cpp" > </File> <File - RelativePath="..\..\src\game\Path.h" + RelativePath="..\..\src\game\WorldSocketMgr.h" > </File> + </Filter> + <Filter + Name="Chat Commands" + > <File - RelativePath="..\..\src\game\Transports.cpp" + RelativePath="..\..\src\game\debugcmds.cpp" > </File> <File - RelativePath="..\..\src\game\Transports.h" + RelativePath="..\..\src\game\Level0.cpp" > </File> <File - RelativePath="..\..\src\game\Weather.cpp" + RelativePath="..\..\src\game\Level1.cpp" > </File> <File - RelativePath="..\..\src\game\Weather.h" + RelativePath="..\..\src\game\Level2.cpp" + > + </File> + <File + RelativePath="..\..\src\game\Level3.cpp" > </File> </Filter> <Filter - Name="Handlers" + Name="Tool" > <File - RelativePath="..\..\src\game\AddonHandler.cpp" + RelativePath="..\..\src\game\Language.h" > </File> <File - RelativePath="..\..\src\game\AddonHandler.h" + RelativePath="..\..\src\game\PlayerDump.cpp" > </File> <File - RelativePath="..\..\src\game\ArenaTeamHandler.cpp" + RelativePath="..\..\src\game\PlayerDump.h" > </File> + </Filter> + <Filter + Name="References" + > <File - RelativePath="..\..\src\game\AuctionHouseHandler.cpp" + RelativePath="..\..\src\game\FollowerReference.cpp" > </File> <File - RelativePath="..\..\src\game\ChannelHandler.cpp" + RelativePath="..\..\src\game\FollowerReference.h" > </File> <File - RelativePath="..\..\src\game\CharacterHandler.cpp" + RelativePath="..\..\src\game\FollowerRefManager.h" > </File> <File - RelativePath="..\..\src\game\ChatHandler.cpp" + RelativePath="..\..\src\game\GroupReference.cpp" > </File> <File - RelativePath="..\..\src\game\CombatHandler.cpp" + RelativePath="..\..\src\game\GroupReference.h" > </File> <File - RelativePath="..\..\src\game\DuelHandler.cpp" + RelativePath="..\..\src\game\GroupRefManager.h" > </File> <File - RelativePath="..\..\src\game\GroupHandler.cpp" + RelativePath="..\..\src\game\HostilRefManager.cpp" > </File> <File - RelativePath="..\..\src\game\GuildHandler.cpp" + RelativePath="..\..\src\game\HostilRefManager.h" > </File> <File - RelativePath="..\..\src\game\ItemHandler.cpp" + RelativePath="..\..\src\game\MapReference.h" > </File> <File - RelativePath="..\..\src\game\LFGHandler.cpp" + RelativePath="..\..\src\game\MapRefManager.h" > </File> <File - RelativePath="..\..\src\game\LootHandler.cpp" + RelativePath="..\..\src\game\ThreatManager.cpp" > </File> <File - RelativePath="..\..\src\game\MiscHandler.cpp" + RelativePath="..\..\src\game\ThreatManager.h" > </File> + </Filter> + <Filter + Name="AI" + > <File - RelativePath="..\..\src\game\MovementHandler.cpp" + RelativePath="..\..\src\game\AggressorAI.cpp" > </File> <File - RelativePath="..\..\src\game\NPCHandler.cpp" + RelativePath="..\..\src\game\AggressorAI.h" > </File> <File - RelativePath="..\..\src\game\NPCHandler.h" + RelativePath="..\..\src\game\CreatureAI.cpp" > </File> <File - RelativePath="..\..\src\game\PetHandler.cpp" + RelativePath="..\..\src\game\CreatureAI.h" > </File> <File - RelativePath="..\..\src\game\PetitionsHandler.cpp" + RelativePath="..\..\src\game\CreatureAIFactory.h" > </File> <File - RelativePath="..\..\src\game\QueryHandler.cpp" + RelativePath="..\..\src\game\CreatureAIImpl.h" > </File> <File - RelativePath="..\..\src\game\QuestHandler.cpp" + RelativePath="..\..\src\game\CreatureAIRegistry.cpp" > </File> <File - RelativePath="..\..\src\game\TaxiHandler.cpp" + RelativePath="..\..\src\game\CreatureAIRegistry.h" > </File> <File - RelativePath="..\..\src\game\TicketHandler.cpp" + RelativePath="..\..\src\game\CreatureAISelector.cpp" > </File> <File - RelativePath="..\..\src\game\TradeHandler.cpp" + RelativePath="..\..\src\game\CreatureAISelector.h" > </File> <File - RelativePath="..\..\src\game\VoiceChatHandler.cpp" + RelativePath="..\..\src\game\CreatureEventAI.cpp" > </File> <File - RelativePath="..\..\src\game\WaypointManager.cpp" + RelativePath="..\..\src\game\CreatureEventAI.h" > </File> <File - RelativePath="..\..\src\game\WaypointManager.h" + RelativePath="..\..\src\game\CreatureEventAIMgr.cpp" + > + </File> + <File + RelativePath="..\..\src\game\CreatureEventAIMgr.h" + > + </File> + <File + RelativePath="..\..\src\game\GuardAI.cpp" + > + </File> + <File + RelativePath="..\..\src\game\GuardAI.h" + > + </File> + <File + RelativePath="..\..\src\game\NullCreatureAI.cpp" + > + </File> + <File + RelativePath="..\..\src\game\NullCreatureAI.h" + > + </File> + <File + RelativePath="..\..\src\game\PetAI.cpp" + > + </File> + <File + RelativePath="..\..\src\game\PetAI.h" + > + </File> + <File + RelativePath="..\..\src\game\ReactorAI.cpp" + > + </File> + <File + RelativePath="..\..\src\game\ReactorAI.h" + > + </File> + <File + RelativePath="..\..\src\game\TotemAI.cpp" + > + </File> + <File + RelativePath="..\..\src\game\TotemAI.h" + > + </File> + <File + RelativePath="..\..\src\game\UnitAI.cpp" + > + </File> + <File + RelativePath="..\..\src\game\UnitAI.h" > </File> </Filter> <Filter - Name="Managers" + Name="OutdoorPvP" > <File - RelativePath="..\..\src\game\AccountMgr.cpp" + RelativePath="..\..\src\game\OutdoorPvP.cpp" > </File> <File - RelativePath="..\..\src\game\AccountMgr.h" + RelativePath="..\..\src\game\OutdoorPvP.h" > </File> <File - RelativePath="..\..\src\game\AuctionHouseMgr.cpp" + RelativePath="..\..\src\game\OutdoorPvPEP.cpp" > </File> <File - RelativePath="..\..\src\game\AuctionHouseMgr.h" + RelativePath="..\..\src\game\OutdoorPvPEP.h" > </File> <File - RelativePath="..\..\src\game\ChannelMgr.h" + RelativePath="..\..\src\game\OutdoorPvPHP.cpp" > </File> <File - RelativePath="..\..\src\game\ItemEnchantmentMgr.cpp" + RelativePath="..\..\src\game\OutdoorPvPHP.h" > </File> <File - RelativePath="..\..\src\game\ItemEnchantmentMgr.h" + RelativePath="..\..\src\game\OutdoorPvPImpl.h" > </File> <File - RelativePath="..\..\src\game\LootMgr.cpp" + RelativePath="..\..\src\game\OutdoorPvPMgr.cpp" > </File> <File - RelativePath="..\..\src\game\LootMgr.h" + RelativePath="..\..\src\game\OutdoorPvPMgr.h" > </File> <File - RelativePath="..\..\src\game\ObjectMgr.cpp" + RelativePath="..\..\src\game\OutdoorPvPNA.cpp" > </File> <File - RelativePath="..\..\src\game\ObjectMgr.h" + RelativePath="..\..\src\game\OutdoorPvPNA.h" > </File> <File - RelativePath="..\..\src\game\SocialMgr.cpp" + RelativePath="..\..\src\game\OutdoorPvPSI.cpp" > </File> <File - RelativePath="..\..\src\game\SocialMgr.h" + RelativePath="..\..\src\game\OutdoorPvPSI.h" + > + </File> + <File + RelativePath="..\..\src\game\OutdoorPvPTF.cpp" + > + </File> + <File + RelativePath="..\..\src\game\OutdoorPvPTF.h" + > + </File> + <File + RelativePath="..\..\src\game\OutdoorPvPZM.cpp" > </File> <File - RelativePath="..\..\src\game\TicketMgr.cpp" + RelativePath="..\..\src\game\OutdoorPvPZM.h" + > + </File> + <File + RelativePath="..\..\src\game\Wintergrasp.cpp" > </File> <File - RelativePath="..\..\src\game\TicketMgr.h" + RelativePath="..\..\src\game\Wintergrasp.h" > </File> </Filter> + <File + RelativePath="..\..\src\game\pchdef.cpp" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1" + PrecompiledHeaderThrough="pchdef.h" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1" + PrecompiledHeaderThrough="pchdef.h" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1" + PrecompiledHeaderThrough="pchdef.h" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCLCompilerTool" + UsePrecompiledHeader="1" + PrecompiledHeaderThrough="pchdef.h" + /> + </FileConfiguration> + </File> + <File + RelativePath="..\..\src\game\pchdef.h" + > + </File> </Files> <Globals> </Globals> diff --git a/win/VC90/genrevision.vcproj b/win/VC90/genrevision.vcproj index 94148f3fa26..0cb0138bb91 100644 --- a/win/VC90/genrevision.vcproj +++ b/win/VC90/genrevision.vcproj @@ -1,329 +1,475 @@ <?xml version="1.0" encoding="windows-1251"?> <VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="genrevision" - ProjectGUID="{803F488E-4C5A-4866-8D5C-1E6C03C007C2}" - RootNamespace="genrevision" - Keyword="Win32Proj" - TargetFrameworkVersion="196613" - > - <Platforms> - <Platform - Name="Win32" - /> - <Platform - Name="x64" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" - ConfigurationType="1" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - UsePrecompiledHeader="0" - WarningLevel="3" - DebugInformationFormat="4" - CallingConvention="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - LinkIncremental="2" - GenerateDebugInformation="true" - SubSystem="1" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" - ConfigurationType="1" - CharacterSet="1" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="0" - WarningLevel="3" - DebugInformationFormat="3" - CallingConvention="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - LinkIncremental="1" - GenerateDebugInformation="true" - SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Debug|x64" - OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" - ConfigurationType="1" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - UsePrecompiledHeader="0" - WarningLevel="3" - DebugInformationFormat="3" - CallingConvention="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - LinkIncremental="2" - GenerateDebugInformation="true" - SubSystem="1" - TargetMachine="17" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|x64" - OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" - ConfigurationType="1" - CharacterSet="1" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - EnableIntrinsicFunctions="true" - PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" - RuntimeLibrary="2" - EnableFunctionLevelLinking="true" - UsePrecompiledHeader="0" - WarningLevel="3" - DebugInformationFormat="3" - CallingConvention="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - LinkIncremental="1" - GenerateDebugInformation="true" - SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" - TargetMachine="17" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\..\src\tools\genrevision\genrevision.cpp" - > - </File> - </Files> - <Globals> - </Globals> + ProjectType="Visual C++" + Version="9,00" + Name="genrevision" + ProjectGUID="{803F488E-4C5A-4866-8D5C-1E6C03C007C2}" + RootNamespace="genrevision" + Keyword="Win32Proj" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + CallingConvention="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + CallingConvention="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + CallingConvention="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|x64" + OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + CallingConvention="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug_NoPCH|Win32" + OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="4" + CallingConvention="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateManifest="true" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug_NoPCH|x64" + OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="1" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="3" + DebugInformationFormat="3" + CallingConvention="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + GenerateManifest="true" + GenerateDebugInformation="true" + SubSystem="1" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath="..\..\src\tools\genrevision\genrevision.cpp" + > + </File> + </Files> + <Globals> + </Globals> </VisualStudioProject> diff --git a/win/VC90/shared.vcproj b/win/VC90/shared.vcproj index 3187dbd470a..721b3ffd5c8 100644 --- a/win/VC90/shared.vcproj +++ b/win/VC90/shared.vcproj @@ -5,7 +5,7 @@ Name="shared" ProjectGUID="{90297C34-F231-4DF4-848E-A74BCC0E40ED}" RootNamespace="shared" - TargetFrameworkVersion="131072" + Keyword="Win32Proj" > <Platforms> <Platform @@ -23,7 +23,6 @@ OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -46,7 +45,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/MP /openmp" + AdditionalOptions="/MP" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" @@ -54,7 +53,6 @@ RuntimeLibrary="2" EnableFunctionLevelLinking="true" EnableEnhancedInstructionSet="1" - FloatingPointModel="2" RuntimeTypeInfo="true" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)/shared.pch" @@ -81,8 +79,8 @@ /> <Tool Name="VCLibrarianTool" - AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib" OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" + AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)" SuppressStartupBanner="true" /> <Tool @@ -106,7 +104,6 @@ OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -130,7 +127,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/MP /openmp" + AdditionalOptions="/MP" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" @@ -138,7 +135,6 @@ RuntimeLibrary="2" EnableFunctionLevelLinking="true" EnableEnhancedInstructionSet="0" - FloatingPointModel="2" RuntimeTypeInfo="true" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)/shared.pch" @@ -167,6 +163,7 @@ Name="VCLibrarianTool" AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib" OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" + AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)" SuppressStartupBanner="true" /> <Tool @@ -190,7 +187,6 @@ OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -213,7 +209,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/MP /openmp" + AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers" PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" @@ -246,8 +242,8 @@ /> <Tool Name="VCLibrarianTool" - AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib" OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" + AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)" SuppressStartupBanner="true" /> <Tool @@ -271,7 +267,6 @@ OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -295,7 +290,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/MP /openmp" + AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers" PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" @@ -330,6 +325,169 @@ Name="VCLibrarianTool" AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib" OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" + AdditionalLibraryDirectories="dep\lib\$(PlatformName)_$(ConfigurationName)" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug_NoPCH|Win32" + OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" + Optimization="0" + AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + EnableFunctionLevelLinking="true" + RuntimeTypeInfo="true" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.pch" + AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + CallingConvention="0" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" + AdditionalLibraryDirectories="dep\lib\$(PlatformName)_debug" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug_NoPCH|x64" + OutputDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\shared__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + CommandLine="" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" + Optimization="0" + AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + EnableFunctionLevelLinking="true" + RuntimeTypeInfo="true" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.pch" + AssemblerListingLocation=".\shared__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\shared__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\shared__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + CallingConvention="0" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + AdditionalDependencies=".\g3dlite__$(PlatformName)_$(ConfigurationName)\g3dlite.lib" + OutputFile=".\shared__$(PlatformName)_$(ConfigurationName)\shared.lib" + AdditionalLibraryDirectories="dep\lib\$(PlatformName)_debug" SuppressStartupBanner="true" /> <Tool @@ -380,14 +538,6 @@ > </File> <File - RelativePath="..\..\src\shared\Database\DatabaseSqlite.cpp" - > - </File> - <File - RelativePath="..\..\src\shared\Database\DatabaseSqlite.h" - > - </File> - <File RelativePath="..\..\src\shared\Database\Field.cpp" > </File> @@ -412,14 +562,6 @@ > </File> <File - RelativePath="..\..\src\shared\Database\QueryResultSqlite.cpp" - > - </File> - <File - RelativePath="..\..\src\shared\Database\QueryResultSqlite.h" - > - </File> - <File RelativePath="..\..\src\shared\Database\SqlDelayThread.cpp" > </File> @@ -443,63 +585,23 @@ RelativePath="..\..\src\shared\Database\SQLStorage.h" > </File> + <File + RelativePath="..\..\src\shared\Database\SQLStorageImpl.h" + > + </File> <Filter Name="DataStores" > <File - RelativePath="..\..\src\shared\Database\dbcfile.cpp" - > - </File> - <File - RelativePath="..\..\src\shared\Database\dbcfile.h" + RelativePath="..\..\src\shared\Database\DBCFileLoader.cpp" > </File> <File - RelativePath="..\..\src\shared\Database\DBCfmt.cpp" + RelativePath="..\..\src\shared\Database\DBCFileLoader.h" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)/$(InputName)1.obj" - /> - </FileConfiguration> </File> <File - RelativePath="..\..\src\shared\Database\DBCStores.cpp" - > - </File> - <File - RelativePath="..\..\src\shared\Database\DBCStores.h" - > - </File> - <File - RelativePath="..\..\src\shared\Database\DBCStructure.h" + RelativePath="..\..\src\shared\Database\DBCStore.h" > </File> </Filter> @@ -520,14 +622,6 @@ Name="Util" > <File - RelativePath="..\..\src\shared\Base.cpp" - > - </File> - <File - RelativePath="..\..\src\shared\Base.h" - > - </File> - <File RelativePath="..\..\src\shared\ByteBuffer.h" > </File> @@ -540,14 +634,6 @@ > </File> <File - RelativePath="..\..\src\shared\Mthread.cpp" - > - </File> - <File - RelativePath="..\..\src\shared\Mthread.h" - > - </File> - <File RelativePath="..\..\src\shared\ProgressBar.cpp" > </File> @@ -567,6 +653,10 @@ RelativePath="..\..\src\shared\Util.h" > </File> + <File + RelativePath="..\..\src\shared\WorldPacket.h" + > + </File> </Filter> <Filter Name="Config" @@ -632,6 +722,14 @@ > </File> <File + RelativePath="..\..\src\shared\Auth\SARC4.cpp" + > + </File> + <File + RelativePath="..\..\src\shared\Auth\SARC4.h" + > + </File> + <File RelativePath="..\..\src\shared\Auth\Sha1.cpp" > </File> @@ -760,55 +858,81 @@ RelativePath="..\..\src\shared\Common.h" > </File> - <File - RelativePath="..\..\src\shared\revision.h" - > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCustomBuildTool" - Description="Getting Version... :)" - CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "..\.."
" - AdditionalDependencies="$(SolutionDir)../.hg/branch.cache" - Outputs="revision.h" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCustomBuildTool" - Description="Getting Version... :)" - CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "..\.."
" - AdditionalDependencies="$(SolutionDir)../.hg/branch.cache" - Outputs="revision.h" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|x64" - > - <Tool - Name="VCCustomBuildTool" - Description="Getting Version... :)" - CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "..\.."
" - AdditionalDependencies="$(SolutionDir)../.hg/branch.cache" - Outputs="revision.h" - /> - </FileConfiguration> - <FileConfiguration - Name="Debug|x64" - > - <Tool - Name="VCCustomBuildTool" - Description="Getting Version... :)" - CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "..\.."
" - AdditionalDependencies="$(SolutionDir)../.hg/branch.cache" - Outputs="revision.h" - /> - </FileConfiguration> + <File + RelativePath="..\..\src\shared\LockedQueue.h" + > </File> - <File + <File + RelativePath="..\..\src\shared\revision.h" + > + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Getting Version..." + CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "..\.."
" + AdditionalDependencies="$(SolutionDir)../.hg/branch.cache" + Outputs="revision.h" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="Getting Version..." + CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "..\.."
" + AdditionalDependencies="$(SolutionDir)../.hg/branch.cache" + Outputs="revision.h" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Getting Version..." + CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "..\.."
" + AdditionalDependencies="$(SolutionDir)../.hg/branch.cache" + Outputs="revision.h" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="Getting Version..." + CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "..\.."
" + AdditionalDependencies="$(SolutionDir)../.hg/branch.cache" + Outputs="revision.h" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_NoPCH|Win32" + > + <Tool + Name="VCCustomBuildTool" + Description="Getting Version..." + CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "..\.."
" + AdditionalDependencies="$(SolutionDir)../.hg/branch.cache" + Outputs="revision.h" + /> + </FileConfiguration> + <FileConfiguration + Name="Debug_NoPCH|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="Getting Version..." + CommandLine="cd $(InputDir)
"$(TargetDir)\..\genrevision__$(PlatformName)_$(ConfigurationName)\genrevision.exe" "..\.."
" + AdditionalDependencies="$(SolutionDir)../.hg/branch.cache" + Outputs="revision.h" + /> + </FileConfiguration> + </File> + <File RelativePath="..\..\src\shared\ServiceWin32.cpp" > </File> @@ -820,6 +944,14 @@ RelativePath="..\..\src\shared\SystemConfig.h" > </File> + <File + RelativePath="..\..\src\shared\Threading.cpp" + > + </File> + <File + RelativePath="..\..\src\shared\Threading.h" + > + </File> </Files> <Globals> </Globals> diff --git a/win/VC90/sockets.vcproj b/win/VC90/sockets.vcproj index 50f86dbd3c1..9c3c0e80185 100644 --- a/win/VC90/sockets.vcproj +++ b/win/VC90/sockets.vcproj @@ -4,7 +4,8 @@ Version="9,00" Name="sockets" ProjectGUID="{04BAF755-0D67-46F8-B1C6-77AE5368F3CB}" - TargetFrameworkVersion="0" + RootNamespace="sockets" + Keyword="Win32Proj" > <Platforms> <Platform @@ -22,7 +23,6 @@ OutputDirectory=".\sockets__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\sockets__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -98,11 +98,167 @@ /> </Configuration> <Configuration + Name="Release|x64" + OutputDirectory=".\sockets__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\sockets__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="4" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\..\dep\include\sockets" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="0" + RuntimeTypeInfo="true" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\sockets__$(PlatformName)_$(ConfigurationName)\sockets.pch" + AssemblerListingLocation=".\sockets__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\sockets__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\sockets__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + CallingConvention="0" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile=".\sockets__$(PlatformName)_$(ConfigurationName)\sockets.lib" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Debug|Win32" OutputDirectory=".\sockets__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\sockets__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" + Optimization="0" + AdditionalIncludeDirectories="..\..\dep\include\sockets" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + EnableFunctionLevelLinking="true" + RuntimeTypeInfo="true" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\sockets__$(PlatformName)_$(ConfigurationName)/sockets.pch" + AssemblerListingLocation=".\sockets__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\sockets__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\sockets__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + CallingConvention="0" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile=".\sockets__$(PlatformName)_$(ConfigurationName)\sockets.lib" + SuppressStartupBanner="true" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug|x64" + OutputDirectory=".\sockets__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\sockets__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="4" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -177,11 +333,10 @@ /> </Configuration> <Configuration - Name="Release|x64" + Name="Debug_NoPCH|Win32" OutputDirectory=".\sockets__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\sockets__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -200,21 +355,19 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" - InlineFunctionExpansion="1" + Optimization="0" AdditionalIncludeDirectories="..\..\dep\include\sockets" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" - 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=".\sockets__$(PlatformName)_$(ConfigurationName)/sockets.pch" + PrecompiledHeaderFile=".\sockets__$(PlatformName)_$(ConfigurationName)\sockets.pch" AssemblerListingLocation=".\sockets__$(PlatformName)_$(ConfigurationName)\" ObjectFile=".\sockets__$(PlatformName)_$(ConfigurationName)\" ProgramDataBaseFileName=".\sockets__$(PlatformName)_$(ConfigurationName)\" @@ -230,7 +383,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool @@ -258,11 +411,10 @@ /> </Configuration> <Configuration - Name="Debug|x64" + Name="Debug_NoPCH|x64" OutputDirectory=".\sockets__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\sockets__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" @@ -281,7 +433,6 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" /> <Tool Name="VCCLCompilerTool" diff --git a/win/VC90/zlib.vcproj b/win/VC90/zlib.vcproj index 19f5ffd5aa4..e36dd7e0999 100644 --- a/win/VC90/zlib.vcproj +++ b/win/VC90/zlib.vcproj @@ -4,7 +4,8 @@ Version="9,00" Name="zlib" ProjectGUID="{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}" - TargetFrameworkVersion="131072" + RootNamespace="zlib" + Keyword="Win32Proj" > <Platforms> <Platform @@ -22,7 +23,6 @@ OutputDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" > <Tool @@ -87,11 +87,79 @@ /> </Configuration> <Configuration + Name="Debug|x64" + OutputDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\dep\include" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + EnableFunctionLevelLinking="true" + RuntimeTypeInfo="true" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\zlib__$(PlatformName)_$(ConfigurationName)\zlib.pch" + WarningLevel="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + CallingConvention="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)/zlib.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration Name="Release|Win32" OutputDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" > <Tool @@ -154,11 +222,10 @@ /> </Configuration> <Configuration - Name="Debug|x64" + Name="Release|x64" OutputDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" > <Tool @@ -179,6 +246,72 @@ /> <Tool Name="VCCLCompilerTool" + AdditionalOptions="/MP" + AdditionalIncludeDirectories="..\..\dep\include" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + RuntimeLibrary="2" + EnableEnhancedInstructionSet="0" + RuntimeTypeInfo="true" + UsePrecompiledHeader="0" + PrecompiledHeaderFile=".\zlib__$(PlatformName)_$(ConfigurationName)\zlib.pch" + WarningLevel="3" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + CallingConvention="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLibrarianTool" + OutputFile="$(OutDir)/zlib.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Debug_NoPCH|Win32" + OutputDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="4" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" @@ -224,11 +357,10 @@ /> </Configuration> <Configuration - Name="Release|x64" + Name="Debug_NoPCH|x64" OutputDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)" ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" CharacterSet="2" > <Tool @@ -249,11 +381,13 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/MP" + Optimization="0" AdditionalIncludeDirectories="..\..\dep\include" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" - RuntimeLibrary="2" - EnableEnhancedInstructionSet="0" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + EnableFunctionLevelLinking="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" PrecompiledHeaderFile=".\zlib__$(PlatformName)_$(ConfigurationName)\zlib.pch" diff --git a/win/VC90/zthread.vcproj b/win/VC90/zthread.vcproj deleted file mode 100644 index 72cc8150c2f..00000000000 --- a/win/VC90/zthread.vcproj +++ /dev/null @@ -1,666 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9,00" - Name="zthread" - ProjectGUID="{262199E8-EEDF-4700-A1D1-E9CC901CF480}" - RootNamespace="zthread" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - <Platform - Name="x64" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory=".\zthread__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\zthread__$(PlatformName)_$(ConfigurationName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\dep\include" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - EnableFunctionLevelLinking="true" - RuntimeTypeInfo="true" - UsePrecompiledHeader="0" - PrecompiledHeaderFile=".\zthread__$(PlatformName)_$(ConfigurationName)\zthread.pch" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" - CallingConvention="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/zthread.lib" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory=".\zthread__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\zthread__$(PlatformName)_$(ConfigurationName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/MP" - AdditionalIncludeDirectories="..\..\dep\include" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" - RuntimeLibrary="2" - EnableEnhancedInstructionSet="1" - RuntimeTypeInfo="true" - UsePrecompiledHeader="0" - PrecompiledHeaderFile=".\zthread__$(PlatformName)_$(ConfigurationName)\zthread.pch" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" - CallingConvention="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/zthread.lib" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Debug|x64" - OutputDirectory=".\zthread__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\zthread__$(PlatformName)_$(ConfigurationName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="..\..\dep\include" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - EnableFunctionLevelLinking="true" - RuntimeTypeInfo="true" - UsePrecompiledHeader="0" - PrecompiledHeaderFile=".\zthread__$(PlatformName)_$(ConfigurationName)\zthread.pch" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" - CallingConvention="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/zthread.lib" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|x64" - OutputDirectory=".\zthread__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\zthread__$(PlatformName)_$(ConfigurationName)" - ConfigurationType="4" - InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" - CharacterSet="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - TargetEnvironment="3" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalOptions="/MP" - AdditionalIncludeDirectories="..\..\dep\include" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" - RuntimeLibrary="2" - EnableEnhancedInstructionSet="0" - RuntimeTypeInfo="true" - UsePrecompiledHeader="0" - PrecompiledHeaderFile=".\zthread__$(PlatformName)_$(ConfigurationName)\zthread.pch" - WarningLevel="3" - Detect64BitPortabilityProblems="false" - DebugInformationFormat="3" - CallingConvention="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLibrarianTool" - OutputFile="$(OutDir)/zthread.lib" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <Filter - Name="Source Files" - Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" - UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" - > - <File - RelativePath="..\..\dep\src\zthread\AtomicCount.cxx" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\ConcurrentExecutor.cxx" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\Condition.cxx" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\ConditionImpl.h" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\config.h" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\CountingSemaphore.cxx" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\Debug.h" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\DeferredInterruptionScope.h" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\FastLock.h" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\FastMutex.cxx" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\FastRecursiveLock.h" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\FastRecursiveMutex.cxx" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\IntrusivePtr.h" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\Monitor.cxx" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\Monitor.h" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\Mutex.cxx" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\MutexImpl.h" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\PoolExecutor.cxx" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\PriorityCondition.cxx" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\PriorityInheritanceMutex.cxx" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\PriorityMutex.cxx" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\PrioritySemaphore.cxx" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\RecursiveMutex.cxx" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\RecursiveMutexImpl.cxx" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\RecursiveMutexImpl.h" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\Scheduling.h" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\Semaphore.cxx" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\SemaphoreImpl.h" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\State.h" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\Status.h" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\SynchronousExecutor.cxx" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\Thread.cxx" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\ThreadedExecutor.cxx" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\ThreadImpl.cxx" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\ThreadImpl.h" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\ThreadLocalImpl.cxx" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\ThreadOps.cxx" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\ThreadOps.h" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\ThreadQueue.cxx" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\ThreadQueue.h" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\Time.cxx" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\TimeStrategy.h" - > - </File> - <File - RelativePath="..\..\dep\src\zthread\TSS.h" - > - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" - > - <File - RelativePath="..\..\dep\include\zthread\AtomicCount.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\Barrier.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\BiasedReadWriteLock.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\BlockingQueue.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\BoundedQueue.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\Cancelable.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\ClassLockable.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\ConcurrentExecutor.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\Condition.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\Config.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\CountedPtr.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\CountingSemaphore.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\Exceptions.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\Executor.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\FairReadWriteLock.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\FastMutex.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\FastRecursiveMutex.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\Guard.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\GuardedClass.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\Lockable.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\LockedQueue.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\MonitoredQueue.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\Mutex.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\NonCopyable.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\PoolExecutor.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\Priority.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\PriorityCondition.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\PriorityInheritanceMutex.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\PriorityMutex.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\PrioritySemaphore.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\Queue.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\ReadWriteLock.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\RecursiveMutex.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\Runnable.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\Semaphore.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\Singleton.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\SynchronousExecutor.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\Task.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\Thread.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\ThreadedExecutor.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\ThreadLocal.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\ThreadLocalImpl.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\Time.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\Waitable.h" - > - </File> - <File - RelativePath="..\..\dep\include\zthread\ZThread.h" - > - </File> - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> |