From a22c0f05b924e7b14c879ac392d47d49872497b7 Mon Sep 17 00:00:00 2001
From: VladimirMangos <vladimir@getmangos.com>
Date: Mon, 26 Oct 2009 12:35:48 +0300
Subject: [PATCH] [8738] Restore some some VC90 build modes work after TBB lib
 add.

* 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
---
 src/shared/revision_nr.h  |  2 +-
 win/VC80/tbb.vcproj       |  4 ++--
 win/VC80/tbbmalloc.vcproj |  4 ++--
 win/VC90/mangosd.vcproj   |  8 ++++----
 win/VC90/tbb.vcproj       | 12 ++++++------
 win/VC90/tbbmalloc.vcproj |  4 ++--
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index cce49b22e..823ec5100 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "8737"
+ #define REVISION_NR "8738"
 #endif // __REVISION_NR_H__
diff --git a/win/VC80/tbb.vcproj b/win/VC80/tbb.vcproj
index c3b354d80..5ee57d580 100644
--- a/win/VC80/tbb.vcproj
+++ b/win/VC80/tbb.vcproj
@@ -354,7 +354,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug_NoPCH|Win32"
-			OutputDirectory=".\tbb__$(PlatformName)_debug"
+			OutputDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
 			IntermediateDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="0"
@@ -436,7 +436,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug_NoPCH|x64"
-			OutputDirectory=".\tbb__$(PlatformName)_debug"
+			OutputDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
 			IntermediateDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="0"
diff --git a/win/VC80/tbbmalloc.vcproj b/win/VC80/tbbmalloc.vcproj
index 4a2e2402b..fe6f943c4 100644
--- a/win/VC80/tbbmalloc.vcproj
+++ b/win/VC80/tbbmalloc.vcproj
@@ -364,7 +364,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug_NoPCH|Win32"
-			OutputDirectory=".\tbbmalloc__$(PlatformName)_debug"
+			OutputDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)"
 			IntermediateDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="0"
@@ -448,7 +448,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug_NoPCH|x64"
-			OutputDirectory=".\tbbmalloc__$(PlatformName)_debug"
+			OutputDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)"
 			IntermediateDirectory=".\tbbmalloc__$(PlatformName)_$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="0"
diff --git a/win/VC90/mangosd.vcproj b/win/VC90/mangosd.vcproj
index 2f2c6f5ea..0d686b33c 100644
--- a/win/VC90/mangosd.vcproj
+++ b/win/VC90/mangosd.vcproj
@@ -42,7 +42,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\..\..\bin\Release\mangosd.tlb"
+				TypeLibraryName=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -143,7 +143,7 @@
 			<Tool
 				Name="VCMIDLTool"
 				TargetEnvironment="3"
-				TypeLibraryName=".\..\..\bin\Release\mangosd.tlb"
+				TypeLibraryName=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -487,7 +487,7 @@
 				Version=""
 				LinkIncremental="1"
 				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"
 				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.pdb"
 				GenerateMapFile="true"
@@ -588,7 +588,7 @@
 				Version=""
 				LinkIncremental="1"
 				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"
 				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\mangosd.pdb"
 				GenerateMapFile="true"
diff --git a/win/VC90/tbb.vcproj b/win/VC90/tbb.vcproj
index 8a26e9a4f..c63e3ab05 100644
--- a/win/VC90/tbb.vcproj
+++ b/win/VC90/tbb.vcproj
@@ -351,8 +351,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug_NoPCH|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
+			IntermediateDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="0"
 			>
@@ -400,7 +400,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"
@@ -432,8 +432,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug_NoPCH|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
+			IntermediateDirectory=".\tbb__$(PlatformName)_$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="0"
 			>
@@ -483,7 +483,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"
diff --git a/win/VC90/tbbmalloc.vcproj b/win/VC90/tbbmalloc.vcproj
index 54f0968c5..2ad796961 100644
--- a/win/VC90/tbbmalloc.vcproj
+++ b/win/VC90/tbbmalloc.vcproj
@@ -412,7 +412,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"
@@ -497,7 +497,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"