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

[8738] Restore some some VC90 build modes work after TBB lib add.

Browse source 
* Avoid use broken lib/*_debug_nppch dirs, and restore use debug version for debug_nopch mode
* Avoid unexpected creating .tlb file in bin subdirs
* Set to correct values debug_nopch mode fields in tbb.vcproj
This commit is contained in:
VladimirMangos 2009-10-26 12:35:48 +03:00
parent eef1faa7ff
commit a22c0f05b9
6 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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 "8737" #define REVISION_NR "8738"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__

4
win/VC80/tbb.vcproj
View file

@ -354,7 +354,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug_NoPCH|Win32" Name="Debug_NoPCH|Win32"
OutputDirectory=".\tbb__$(PlatformName)_debug" OutputDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="0" CharacterSet="0"
@ -436,7 +436,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug_NoPCH|x64" Name="Debug_NoPCH|x64"
OutputDirectory=".\tbb__$(PlatformName)_debug" OutputDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="0" CharacterSet="0"

4
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)_debug" OutputDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="0" CharacterSet="0"
@ -448,7 +448,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug_NoPCH|x64" Name="Debug_NoPCH|x64"
OutputDirectory=".\tbbmalloc__$(PlatformName)_debug" OutputDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="0" CharacterSet="0"

8
win/VC90/mangosd.vcproj
View file

@ -42,7 +42,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,7 +143,7 @@
<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"
@ -487,7 +487,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"
@ -588,7 +588,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"

12
win/VC90/tbb.vcproj
View file

@ -351,8 +351,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug_NoPCH|Win32" Name="Debug_NoPCH|Win32"
OutputDirectory="$(ConfigurationName)" OutputDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="0" CharacterSet="0"
> >
@ -400,7 +400,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"
@ -432,8 +432,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug_NoPCH|x64" Name="Debug_NoPCH|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)" OutputDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
CharacterSet="0" CharacterSet="0"
> >
@ -483,7 +483,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"

4
win/VC90/tbbmalloc.vcproj
View file

@ -412,7 +412,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"
@ -497,7 +497,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"