@@ -12,3 +12,4 @@ ACE* ADE* +tbb* dep/lib/win32_debug/.gitignore @@ -12,3 +12,4 @@ ACE* ADE* +tbb* dep/lib/win32_release/.gitignore @@ -12,3 +12,4 @@ ACE* ADE* +tbb* dep/lib/x64_Debug/.gitignore @@ -12,3 +12,4 @@ ACE* ADE* +tbb* dep/lib/x64_release/.gitignore @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8736" + #define REVISION_NR "8737" #endif // __REVISION_NR_H__ src/shared/revision_nr.h @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="8,00" + Version="8.00" Name="ACE_Wrappers" ProjectGUID="{AD537C9A-FECA-1BAD-6757-8A6348EA12C8}" RootNamespace="ACE" @@ -3055,11 +3055,11 @@ > </File> <File - RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_errno.h" + RelativePath="..\..\dep\ACE_wrappers\ace\OS_Errno.h" > </File> <File - RelativePath="..\..\dep\ACE_wrappers\ace\OS_Errno.h" + RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_errno.h" > </File> <File @@ -3439,11 +3439,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 @@ -3487,11 +3487,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 @@ -5451,7 +5451,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|Win32" + Name="Debug_NoPCH|Win32" ExcludedFromBuild="true" > <Tool @@ -5459,7 +5459,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="Debug_NoPCH|x64" ExcludedFromBuild="true" > <Tool @@ -5467,7 +5467,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug_NoPCH|Win32" + Name="Release|Win32" ExcludedFromBuild="true" > <Tool @@ -5475,7 +5475,7 @@ /> </FileConfiguration> <FileConfiguration - Name="Debug_NoPCH|x64" + Name="Release|x64" ExcludedFromBuild="true" > <Tool win/VC80/ACE_vc8.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" - Version="8,00" + Version="8.00" Name="mangosd" ProjectGUID="{A3A04E47-43A2-4C08-90B3-029CEF558594}" RootNamespace="mangosd" @@ -41,7 +41,7 @@ /> <Tool Name="VCMIDLTool" - TypeLibraryName=".\..\..\bin\Release\mangosd.tlb" + TypeLibraryName=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.tlb" /> <Tool Name="VCCLCompilerTool" @@ -143,14 +143,14 @@ <Tool Name="VCMIDLTool" TargetEnvironment="3" - TypeLibraryName=".\..\..\bin\Release\mangosd.tlb" + TypeLibraryName=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.tlb" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/MP" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\mangosd;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="VERSION="0.14.0-DEV";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;_SECURE_SCL=0" + PreprocessorDefinitions="VERSION="0.15.0-DEV";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;_SECURE_SCL=0" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -352,7 +352,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\mangosd;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="VERSION="0.14.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI" + PreprocessorDefinitions="VERSION="0.15.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI" IgnoreStandardIncludePath="false" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -486,7 +486,7 @@ Version="" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories=""..\..\dep\lib\$(PlatformName)_$(ConfigurationName)";".\framework__$(PlatformName)_$(ConfigurationName)"" + AdditionalLibraryDirectories=""..\..\dep\lib\$(PlatformName)_debug";".\framework__$(PlatformName)_$(ConfigurationName)"" GenerateDebugInformation="true" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.pdb" GenerateMapFile="true" @@ -587,7 +587,7 @@ Version="" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories=""..\..\dep\lib\$(PlatformName)_$(ConfigurationName)";".\framework__$(PlatformName)_$(ConfigurationName)"" + AdditionalLibraryDirectories=""..\..\dep\lib\$(PlatformName)_debug";".\framework__$(PlatformName)_$(ConfigurationName)"" GenerateDebugInformation="true" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.pdb" GenerateMapFile="true" win/VC80/mangosd.vcproj @@ -571,7 +571,7 @@ OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories=""..\..\dep\lib\$(PlatformName)_debug" + AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_debug" GenerateDebugInformation="true" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.pdb" GenerateMapFile="true" win/VC80/realmd.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="windows-1251"?> <VisualStudioProject ProjectType="Visual C++" - Version="8,00" + Version="8.00" Name="tbb" ProjectGUID="{F62787DD-1327-448B-9818-030062BCFAA5}" RootNamespace="tbb" @@ -354,8 +354,8 @@ </Configuration> <Configuration Name="Debug_NoPCH|Win32" - OutputDirectory="$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" + OutputDirectory=".\tbb__$(PlatformName)_debug" + IntermediateDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)" ConfigurationType="2" CharacterSet="0" > @@ -403,7 +403,7 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO /DEF:$(IntDir)\tbb.def" - OutputFile="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\tbb_debug.dll" + OutputFile="..\..\dep\lib\$(PlatformName)_debug\tbb_debug.dll" LinkIncremental="1" GenerateDebugInformation="true" SubSystem="2" @@ -436,8 +436,8 @@ </Configuration> <Configuration Name="Debug_NoPCH|x64" - OutputDirectory="$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" + OutputDirectory=".\tbb__$(PlatformName)_debug" + IntermediateDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)" ConfigurationType="2" CharacterSet="0" > @@ -487,7 +487,7 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/nologo /DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO /DEF:$(IntDir)\tbb.def" - OutputFile="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\tbb_debug.dll" + OutputFile="..\..\dep\lib\$(PlatformName)_debug\tbb_debug.dll" LinkIncremental="1" GenerateDebugInformation="true" SubSystem="2" @@ -528,106 +528,106 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > <File - RelativePath="..\..\dep\tbb\src\tbb\ia32-masm\atomic_support.asm" + RelativePath="..\..\dep\tbb\src\tbb\intel64-masm\atomic_support.asm" > <FileConfiguration Name="Debug|Win32" + ExcludedFromBuild="true" > <Tool Name="MASM" - AdditionalOptions="/coff /Zi" /> </FileConfiguration> <FileConfiguration Name="Debug|x64" + > + <Tool + Name="VCCustomBuildTool" + Description="building atomic_support.obj" + CommandLine="ml64 /Fo"..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
" + Outputs="..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" ExcludedFromBuild="true" > <Tool Name="MASM" - AdditionalOptions="/coff /Zi" /> </FileConfiguration> <FileConfiguration Name="Release|x64" - ExcludedFromBuild="true" > <Tool - Name="MASM" + Name="VCCustomBuildTool" + Description="building atomic_support.obj" + CommandLine="ml64 /Fo"..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj" /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
" + Outputs="..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj" /> </FileConfiguration> <FileConfiguration Name="Debug_NoPCH|Win32" + ExcludedFromBuild="true" > <Tool Name="MASM" - AdditionalOptions="/coff /Zi" /> </FileConfiguration> <FileConfiguration Name="Debug_NoPCH|x64" - ExcludedFromBuild="true" > <Tool - Name="MASM" - AdditionalOptions="/coff /Zi" + Name="VCCustomBuildTool" + Description="building atomic_support.obj" + CommandLine="ml64 /Fo..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
" + Outputs="..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj" /> </FileConfiguration> </File> <File - RelativePath="..\..\dep\tbb\src\tbb\intel64-masm\atomic_support.asm" + RelativePath="..\..\dep\tbb\src\tbb\ia32-masm\atomic_support.asm" > <FileConfiguration Name="Debug|Win32" - ExcludedFromBuild="true" > <Tool Name="MASM" + AdditionalOptions="/coff /Zi" /> </FileConfiguration> <FileConfiguration Name="Debug|x64" - > - <Tool - Name="VCCustomBuildTool" - Description="building atomic_support.obj" - CommandLine="ml64 /Fo"..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
" - Outputs="..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" ExcludedFromBuild="true" > <Tool Name="MASM" + AdditionalOptions="/coff /Zi" /> </FileConfiguration> <FileConfiguration Name="Release|x64" + ExcludedFromBuild="true" > <Tool - Name="VCCustomBuildTool" - Description="building atomic_support.obj" - CommandLine="ml64 /Fo"..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj" /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
" - Outputs="..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj" + Name="MASM" /> </FileConfiguration> <FileConfiguration Name="Debug_NoPCH|Win32" - ExcludedFromBuild="true" > <Tool Name="MASM" + AdditionalOptions="/coff /Zi" /> </FileConfiguration> <FileConfiguration Name="Debug_NoPCH|x64" + ExcludedFromBuild="true" > <Tool - Name="VCCustomBuildTool" - Description="building atomic_support.obj" - CommandLine="ml64 /Fo..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj" /DUSE_FRAME_POINTER /DEM64T=1 /c /Zi ../../dep/tbb/src/tbb/intel64-masm/atomic_support.asm
" - Outputs="..\..\bin\$(PlatformName)_$(ConfigurationName)\atomic_support.obj" + Name="MASM" + AdditionalOptions="/coff /Zi" /> </FileConfiguration> </File> win/VC80/tbb.vcproj @@ -364,7 +364,7 @@ </Configuration> <Configuration Name="Debug_NoPCH|Win32" - OutputDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)" + OutputDirectory=".\tbbmalloc__$(PlatformName)_debug" IntermediateDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)" ConfigurationType="2" CharacterSet="0" @@ -415,7 +415,7 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO /DEF:$(IntDir)\tbbmalloc.def" - OutputFile="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\tbbmalloc_debug.dll" + OutputFile="..\..\dep\lib\$(PlatformName)_debug\tbbmalloc_debug.dll" LinkIncremental="1" GenerateDebugInformation="true" SubSystem="2" @@ -448,7 +448,7 @@ </Configuration> <Configuration Name="Debug_NoPCH|x64" - OutputDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)" + OutputDirectory=".\tbbmalloc__$(PlatformName)_debug" IntermediateDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)" ConfigurationType="2" CharacterSet="0" @@ -501,7 +501,7 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/nologo /DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO /DEF:$(IntDir)\tbbmalloc.def" - OutputFile="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\tbbmalloc_debug.dll" + OutputFile="..\..\dep\lib\$(PlatformName)_debug\tbbmalloc_debug.dll" LinkIncremental="1" GenerateDebugInformation="true" SubSystem="2" win/VC80/tbbmalloc.vcproj @@ -181,8 +181,8 @@ Global {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|x64.Build.0 = Debug|Win32 {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|Win32.ActiveCfg = Release|Win32 {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|Win32.Build.0 = Release|Win32 - {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.ActiveCfg = Release|x64 - {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.Build.0 = Release|x64 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.ActiveCfg = Release|Win32 + {803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.Build.0 = Release|Win32 {AD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 {AD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 {AD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 win/mangosdVC80.sln 3a88f0a4daaaa51927447bc44b05f69a7a22d67d VladimirMangos vladimir@getmangos.com http://github.com/mangos/mangos/commit/82a2e5a0a7a5d5a5a84d4b8b99474d1f5e1e9f2c 82a2e5a0a7a5d5a5a84d4b8b99474d1f5e1e9f2c

2009-10-26T00:58:12-07:00

2009-10-25T22:54:39-07:00

[8737] Restore some some VC80 build modes work after TBB lib add. * Hide TBB libs in lib dirs in simialr way as hide ACE libs. * Avoid use broken lib/*_debug_nppch dirs, and restore use debug version for debug_nopch mode * Avoid unexpected creating .tlb fiel in bin subdirs * Restore 0.15-dev as current developed release version in mangosd. * Set to correct values debug_nopch mode fields in tbb.vcproj Note: VC90 fixes will be in next commit. bfb92b1203673d1c7d1eb57eb147fc844ce5ef80 VladimirMangos vladimir@getmangos.com