From eef1faa7ff63d1b2b36e5efe48c87c4469d21550 Mon Sep 17 00:00:00 2001
From: VladimirMangos <vladimir@getmangos.com>
Date: Mon, 26 Oct 2009 08:54:39 +0300
Subject: [PATCH] [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.
---
 dep/lib/win32_debug/.gitignore   |   1 +
 dep/lib/win32_release/.gitignore |   1 +
 dep/lib/x64_Debug/.gitignore     |   1 +
 dep/lib/x64_release/.gitignore   |   1 +
 src/shared/revision_nr.h         |   2 +-
 win/VC80/ACE_vc8.vcproj          |  46 +++++++-------
 win/VC80/mangosd.vcproj          |  14 ++--
 win/VC80/realmd.vcproj           |   2 +-
 win/VC80/tbb.vcproj              | 106 +++++++++++++++----------------
 win/VC80/tbbmalloc.vcproj        |   8 +--
 win/mangosdVC80.sln              |   4 +-
 11 files changed, 95 insertions(+), 91 deletions(-)

diff --git a/dep/lib/win32_debug/.gitignore b/dep/lib/win32_debug/.gitignore
index ae0b42bd7..bf1241d78 100644
--- a/dep/lib/win32_debug/.gitignore
+++ b/dep/lib/win32_debug/.gitignore
@@ -12,3 +12,4 @@
 
 ACE*
 ADE*
+tbb*
diff --git a/dep/lib/win32_release/.gitignore b/dep/lib/win32_release/.gitignore
index ae0b42bd7..bf1241d78 100644
--- a/dep/lib/win32_release/.gitignore
+++ b/dep/lib/win32_release/.gitignore
@@ -12,3 +12,4 @@
 
 ACE*
 ADE*
+tbb*
diff --git a/dep/lib/x64_Debug/.gitignore b/dep/lib/x64_Debug/.gitignore
index ae0b42bd7..bf1241d78 100644
--- a/dep/lib/x64_Debug/.gitignore
+++ b/dep/lib/x64_Debug/.gitignore
@@ -12,3 +12,4 @@
 
 ACE*
 ADE*
+tbb*
diff --git a/dep/lib/x64_release/.gitignore b/dep/lib/x64_release/.gitignore
index ae0b42bd7..bf1241d78 100644
--- a/dep/lib/x64_release/.gitignore
+++ b/dep/lib/x64_release/.gitignore
@@ -12,3 +12,4 @@
 
 ACE*
 ADE*
+tbb*
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 7ab52c7f1..cce49b22e 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 "8736"
+ #define REVISION_NR "8737"
 #endif // __REVISION_NR_H__
diff --git a/win/VC80/ACE_vc8.vcproj b/win/VC80/ACE_vc8.vcproj
index b2a3930aa..8cd57f22c 100644
--- a/win/VC80/ACE_vc8.vcproj
+++ b/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="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
@@ -5450,22 +5450,6 @@
 						Name="VCCustomBuildTool"
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug_NoPCH|Win32"
 					ExcludedFromBuild="true"
@@ -5482,6 +5466,22 @@
 						Name="VCCustomBuildTool"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
diff --git a/win/VC80/mangosd.vcproj b/win/VC80/mangosd.vcproj
index 0e1a61c4a..4987d7ad5 100644
--- a/win/VC80/mangosd.vcproj
+++ b/win/VC80/mangosd.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=&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"
 				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=&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"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -486,7 +486,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"
@@ -587,7 +587,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/VC80/realmd.vcproj b/win/VC80/realmd.vcproj
index acb32315d..c09e1247f 100644
--- a/win/VC80/realmd.vcproj
+++ b/win/VC80/realmd.vcproj
@@ -571,7 +571,7 @@
 				OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;..\..\dep\lib\$(PlatformName)_debug"
+				AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_debug"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\realmd.pdb"
 				GenerateMapFile="true"
diff --git a/win/VC80/tbb.vcproj b/win/VC80/tbb.vcproj
index 56aa744e1..c3b354d80 100644
--- a/win/VC80/tbb.vcproj
+++ b/win/VC80/tbb.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"
@@ -527,52 +527,6 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			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
 				RelativePath="..\..\dep\tbb\src\tbb\intel64-masm\atomic_support.asm"
 				>
@@ -631,6 +585,52 @@
 					/>
 				</FileConfiguration>
 			</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
 				RelativePath="..\..\dep\tbb\src\tbb\cache_aligned_allocator.cpp"
 				>
diff --git a/win/VC80/tbbmalloc.vcproj b/win/VC80/tbbmalloc.vcproj
index 1a890c291..4a2e2402b 100644
--- a/win/VC80/tbbmalloc.vcproj
+++ b/win/VC80/tbbmalloc.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"
diff --git a/win/mangosdVC80.sln b/win/mangosdVC80.sln
index b177a1e00..c636b379f 100644
--- a/win/mangosdVC80.sln
+++ b/win/mangosdVC80.sln
@@ -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