mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[8737] Restore some some VC80 build modes work after TBB lib add.

Browse source 
* 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.
This commit is contained in:
VladimirMangos 2009-10-26 08:54:39 +03:00
parent b0ea8848a5
commit eef1faa7ff
11 changed files with 95 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dep/lib/win32_debug/.gitignore vendored
View file

@ -12,3 +12,4 @@
ACE* ACE*
ADE* ADE*
tbb*

1
dep/lib/win32_release/.gitignore vendored
View file

@ -12,3 +12,4 @@
ACE* ACE*
ADE* ADE*
tbb*

1
dep/lib/x64_Debug/.gitignore vendored
View file

@ -12,3 +12,4 @@
ACE* ACE*
ADE* ADE*
tbb*

1
dep/lib/x64_release/.gitignore vendored
View file

@ -12,3 +12,4 @@
ACE* ACE*
ADE* ADE*
tbb*

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "8736" #define REVISION_NR "8737"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__

46
win/VC80/ACE_vc8.vcproj
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="8.00"
Name="ACE_Wrappers" Name="ACE_Wrappers"
ProjectGUID="{AD537C9A-FECA-1BAD-6757-8A6348EA12C8}" ProjectGUID="{AD537C9A-FECA-1BAD-6757-8A6348EA12C8}"
RootNamespace="ACE" RootNamespace="ACE"
@ -3055,11 +3055,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_errno.h" RelativePath="..\..\dep\ACE_wrappers\ace\OS_Errno.h"
> >
</File> </File>
<File <File
RelativePath="..\..\dep\ACE_wrappers\ace\OS_Errno.h" RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_errno.h"
> >
</File> </File>
<File <File
@ -3439,11 +3439,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_string.h" RelativePath="..\..\dep\ACE_wrappers\ace\OS_String.h"
> >
</File> </File>
<File <File
RelativePath="..\..\dep\ACE_wrappers\ace\OS_String.h" RelativePath="..\..\dep\ACE_wrappers\ace\os_include\os_string.h"
> >
</File> </File>
<File <File
@ -3487,11 +3487,11 @@
> >
</File> </File>
<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>
<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>
<File <File
@ -5450,22 +5450,6 @@
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Debug_NoPCH|Win32" Name="Debug_NoPCH|Win32"
ExcludedFromBuild="true" ExcludedFromBuild="true"
@ -5482,6 +5466,22 @@
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
</File> </File>
</Filter> </Filter>
<Filter <Filter

14
win/VC80/mangosd.vcproj
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="8.00"
Name="mangosd" Name="mangosd"
ProjectGUID="{A3A04E47-43A2-4C08-90B3-029CEF558594}" ProjectGUID="{A3A04E47-43A2-4C08-90B3-029CEF558594}"
RootNamespace="mangosd" RootNamespace="mangosd"
@ -41,7 +41,7 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TypeLibraryName=".\..\..\bin\Release\mangosd.tlb" TypeLibraryName=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.tlb"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
@ -143,14 +143,14 @@
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TargetEnvironment="3" TargetEnvironment="3"
TypeLibraryName=".\..\..\bin\Release\mangosd.tlb" TypeLibraryName=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.tlb"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP" AdditionalOptions="/MP"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\mangosd;..\..\dep\ACE_wrappers" AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\mangosd;..\..\dep\ACE_wrappers"
PreprocessorDefinitions="VERSION=&quot;0.14.0-DEV&quot;;WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;_SECURE_SCL=0" PreprocessorDefinitions="VERSION=&quot;0.15.0-DEV&quot;;WIN32;NDEBUG;_CONSOLE;ENABLE_CLI;_SECURE_SCL=0"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
@ -352,7 +352,7 @@
AdditionalOptions="/MP" AdditionalOptions="/MP"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\mangosd;..\..\dep\ACE_wrappers" AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\mangosd;..\..\dep\ACE_wrappers"
PreprocessorDefinitions="VERSION=&quot;0.14.0-DEV&quot;;WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI" PreprocessorDefinitions="VERSION=&quot;0.15.0-DEV&quot;;WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI"
IgnoreStandardIncludePath="false" IgnoreStandardIncludePath="false"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -486,7 +486,7 @@
Version="" Version=""
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;..\..\dep\lib\$(PlatformName)_$(ConfigurationName)&quot;;&quot;.\framework__$(PlatformName)_$(ConfigurationName)&quot;" AdditionalLibraryDirectories="&quot;..\..\dep\lib\$(PlatformName)_debug&quot;;&quot;.\framework__$(PlatformName)_$(ConfigurationName)&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.pdb" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.pdb"
GenerateMapFile="true" GenerateMapFile="true"
@ -587,7 +587,7 @@
Version="" Version=""
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;..\..\dep\lib\$(PlatformName)_$(ConfigurationName)&quot;;&quot;.\framework__$(PlatformName)_$(ConfigurationName)&quot;" AdditionalLibraryDirectories="&quot;..\..\dep\lib\$(PlatformName)_debug&quot;;&quot;.\framework__$(PlatformName)_$(ConfigurationName)&quot;"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.pdb" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.pdb"
GenerateMapFile="true" GenerateMapFile="true"

2
win/VC80/realmd.vcproj
View file

@ -571,7 +571,7 @@
OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.exe" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
AdditionalLibraryDirectories="&quot;..\..\dep\lib\$(PlatformName)_debug" AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_debug"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.pdb" ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.pdb"
GenerateMapFile="true" GenerateMapFile="true"

106
win/VC80/tbb.vcproj
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1251"?> <?xml version="1.0" encoding="windows-1251"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="8.00"
Name="tbb" Name="tbb"
ProjectGUID="{F62787DD-1327-448B-9818-030062BCFAA5}" ProjectGUID="{F62787DD-1327-448B-9818-030062BCFAA5}"
RootNamespace="tbb" RootNamespace="tbb"
@ -354,8 +354,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug_NoPCH|Win32" Name="Debug_NoPCH|Win32"
OutputDirectory="$(ConfigurationName)" OutputDirectory=".\tbb__$(PlatformName)_debug"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="0" CharacterSet="0"
> >
@ -403,7 +403,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="/DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO /DEF:$(IntDir)\tbb.def" 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" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
@ -436,8 +436,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug_NoPCH|x64" Name="Debug_NoPCH|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)" OutputDirectory=".\tbb__$(PlatformName)_debug"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="0" CharacterSet="0"
> >
@ -487,7 +487,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="/nologo /DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO /DEF:$(IntDir)\tbb.def" 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" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
@ -527,52 +527,6 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File
RelativePath="..\..\dep\tbb\src\tbb\ia32-masm\atomic_support.asm"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="MASM"
AdditionalOptions="/coff /Zi"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
Name="MASM"
AdditionalOptions="/coff /Zi"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
Name="MASM"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_NoPCH|Win32"
>
<Tool
Name="MASM"
AdditionalOptions="/coff /Zi"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_NoPCH|x64"
ExcludedFromBuild="true"
>
<Tool
Name="MASM"
AdditionalOptions="/coff /Zi"
/>
</FileConfiguration>
</File>
<File <File
RelativePath="..\..\dep\tbb\src\tbb\intel64-masm\atomic_support.asm" RelativePath="..\..\dep\tbb\src\tbb\intel64-masm\atomic_support.asm"
> >
@ -631,6 +585,52 @@
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath="..\..\dep\tbb\src\tbb\ia32-masm\atomic_support.asm"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="MASM"
AdditionalOptions="/coff /Zi"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
ExcludedFromBuild="true"
>
<Tool
Name="MASM"
AdditionalOptions="/coff /Zi"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
ExcludedFromBuild="true"
>
<Tool
Name="MASM"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_NoPCH|Win32"
>
<Tool
Name="MASM"
AdditionalOptions="/coff /Zi"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug_NoPCH|x64"
ExcludedFromBuild="true"
>
<Tool
Name="MASM"
AdditionalOptions="/coff /Zi"
/>
</FileConfiguration>
</File>
<File <File
RelativePath="..\..\dep\tbb\src\tbb\cache_aligned_allocator.cpp" RelativePath="..\..\dep\tbb\src\tbb\cache_aligned_allocator.cpp"
> >

8
win/VC80/tbbmalloc.vcproj
View file

@ -364,7 +364,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug_NoPCH|Win32" Name="Debug_NoPCH|Win32"
OutputDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)" OutputDirectory=".\tbbmalloc__$(PlatformName)_debug"
IntermediateDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="0" CharacterSet="0"
@ -415,7 +415,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="/DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO /DEF:$(IntDir)\tbbmalloc.def" 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" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
@ -448,7 +448,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug_NoPCH|x64" Name="Debug_NoPCH|x64"
OutputDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)" OutputDirectory=".\tbbmalloc__$(PlatformName)_debug"
IntermediateDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="0" CharacterSet="0"
@ -501,7 +501,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="/nologo /DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO /DEF:$(IntDir)\tbbmalloc.def" 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" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"

4
win/mangosdVC80.sln
View file

@ -181,8 +181,8 @@ Global
{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Debug|x64.Build.0 = Debug|Win32 {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.ActiveCfg = Release|Win32
{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|Win32.Build.0 = 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.ActiveCfg = Release|Win32
{803F488E-4C5A-4866-8D5C-1E6C03C007C2}.Release|x64.Build.0 = Release|x64 {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.ActiveCfg = Debug_NoPCH|Win32
{AD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|Win32.Build.0 = 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 {AD537C9A-FECA-1BAD-6757-8A6348EA12C8}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64