Fix TrinityScript vcproj files more properly

--HG--
branch : trunk

1 files changed, 212 insertions, 196 deletions

diff --git a/src/bindings/scripts/VC80/80ScriptDev2.vcproj b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
index 696a21c39db..89d6aff0dc9 100644
--- a/src/bindings/scripts/VC80/80ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
@@ -47,15 +47,15 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\..\..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT"
+				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_WINDOWS;_USRDLL;SCRIPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="precompiled.h"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -73,7 +73,7 @@
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\..\win\VC80\zthread__$(PlatformName)_$(ConfigurationName);..\..\..\..\win\VC80\trinitycore__$(PlatformName)_$(ConfigurationName)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/MaNGOSScript.pdb"
+				ProgramDatabaseFile="$(OutDir)/TrinityScript.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -215,7 +215,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\..\..\..\dep\ACE_wrappers"
-				PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT"
+				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_WINDOWS;_USRDLL;SCRIPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -241,7 +241,7 @@
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\..\win\VC80\zthread__$(PlatformName)_$(ConfigurationName);..\..\..\..\win\VC80\trinitycore__$(PlatformName)_$(ConfigurationName)"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/MaNGOSScript.pdb"
+				ProgramDatabaseFile="$(OutDir)/TrinityScript.pdb"
 				SubSystem="2"
 				ImportLibrary="$(OutDir)/TrinityScript.lib"
 				TargetMachine="17"
@@ -759,6 +759,190 @@
 					>
 				</Filter>
 				<Filter
+					Name="Borean Tundra"
+					>
+					<File
+						RelativePath="..\scripts\zone\borean_tundra\borean_tundra.cpp"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="Howling Fjord"
+					>
+				</Filter>
+				<Filter
+					Name="Crystalsong Forest"
+					>
+				</Filter>
+				<Filter
+					Name="Dalaran"
+					>
+				</Filter>
+				<Filter
+					Name="Dragonblight"
+					>
+				</Filter>
+				<Filter
+					Name="Grizzly Hills"
+					>
+				</Filter>
+				<Filter
+					Name="Icecrown"
+					>
+				</Filter>
+				<Filter
+					Name="Sholazar Basin"
+					>
+				</Filter>
+				<Filter
+					Name="The Storm Peaks"
+					>
+				</Filter>
+				<Filter
+					Name="Zul&apos;Drak"
+					>
+				</Filter>
+				<Filter
+					Name="Azjol-Nerub"
+					>
+					<Filter
+						Name="Ahn&apos;kahet"
+						>
+						<File
+							RelativePath="..\scripts\zone\Azjol-Nerub\Ahn&apos;kahet\boss_amanitar.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\Azjol-Nerub\Ahn&apos;kahet\boss_elder_nadox.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\Azjol-Nerub\Ahn&apos;kahet\boss_herald_volazj.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\Azjol-Nerub\Ahn&apos;kahet\boss_jedoga_shadowseeker.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\Azjol-Nerub\Ahn&apos;kahet\boss_prince_taldaram.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\Azjol-Nerub\Ahn&apos;kahet\def_ahnkahet.h"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\Azjol-Nerub\Ahn&apos;kahet\instance_ahnkahet.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Azjol-Nerub"
+						>
+						<File
+							RelativePath="..\scripts\zone\Azjol-Nerub\Azjol-Nerub\boss_anubarak.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\Azjol-Nerub\Azjol-Nerub\boss_hadronox.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\Azjol-Nerub\Azjol-Nerub\boss_krikthir_the_gatewatcher.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\Azjol-Nerub\Azjol-Nerub\def_azjol_nerub.h"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\Azjol-Nerub\Azjol-Nerub\instance_azjol_nerub.cpp"
+							>
+						</File>
+					</Filter>
+				</Filter>
+				<Filter
+					Name="Drak&apos;Tharon Keep"
+					>
+				</Filter>
+				<Filter
+					Name="Gundrak"
+					>
+				</Filter>
+				<Filter
+					Name="Nexus"
+					>
+					<Filter
+						Name="Nexus"
+						>
+					</Filter>
+					<Filter
+						Name="Oculus"
+						>
+					</Filter>
+					<Filter
+						Name="Eye of Eternity"
+						>
+					</Filter>
+				</Filter>
+				<Filter
+					Name="Violet Hold"
+					>
+				</Filter>
+				<Filter
+					Name="Ulduar"
+					>
+					<Filter
+						Name="Halls of Stone"
+						>
+					</Filter>
+					<Filter
+						Name="Halls of Lightning"
+						>
+					</Filter>
+				</Filter>
+				<Filter
+					Name="Utgarde Keep"
+					>
+					<Filter
+						Name="Utgarde Keep"
+						>
+						<File
+							RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_ingvar_the_plunderer.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_keleseth.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_skarvald_dalronn.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\def_utgarde_keep.h"
+							>
+						</File>
+						<File
+							RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\instance_utgarde_keep.cpp"
+							>
+						</File>
+					</Filter>
+					<Filter
+						Name="Utgarde Pinnacle"
+						>
+					</Filter>
+				</Filter>
+				<Filter
+					Name="Obsidian Sanctum"
+					>
+				</Filter>
+				<Filter
+					Name="Vault of Archavon"
+					>
+				</Filter>
+				<Filter
 					Name="Scarlet Monastery"
 					>
 					<File
@@ -1078,166 +1262,6 @@
 					Name="Ragefire Chasm"
 					>
 				</Filter>
-								  <Filter
-	 	                                         Name="Borean Tundra">
-											<File
-												RelativePath="..\scripts\zone\borean_tundra\borean_tundra.cpp"
-											>
-											</File>
-	 	                                 </Filter>
-	 	                                 <Filter
-	 	                                         Name="Howling Fjord">
-	 	                                 </Filter>
-	 	                                 <Filter
-	 	                                         Name="Crystalsong Forest">
-	 	                                 </Filter>
-	 	                                 <Filter
-	 	                                         Name="Dalaran">
-	 	                                 </Filter>
-	 	                                 <Filter
-	 	                                         Name="Dragonblight">
-	 	                                 </Filter>
-	 	                                 <Filter
-	 	                                         Name="Grizzly Hills">
-	 	                                 </Filter>
-	 	                                 <Filter
-	 	                                         Name="Icecrown">
-	 	                                 </Filter>
-	 	                                 <Filter
-	 	                                         Name="Sholazar Basin">
-	 	                                 </Filter>
-	 	                                 <Filter
-	 	                                         Name="The Storm Peaks">
-	 	                                 </Filter>
-	 	                                 <Filter
-	 	                                         Name="Zul&apos;Drak">
-	 	                                 </Filter>
-	 	                                 <Filter
-	 	                                         Name="Azjol-Nerub">
-					<Filter
-						Name="Ahn&apos;kahet"
-						>
-						<File
-							RelativePath="..\scripts\zone\Azjol-Nerub\Ahn&apos;kahet\boss_amanitar.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\scripts\zone\Azjol-Nerub\Ahn&apos;kahet\boss_elder_nadox.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\scripts\zone\Azjol-Nerub\Ahn&apos;kahet\boss_herald_volazj.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\scripts\zone\Azjol-Nerub\Ahn&apos;kahet\boss_jedoga_shadowseeker.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\scripts\zone\Azjol-Nerub\Ahn&apos;kahet\boss_prince_taldaram.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\scripts\zone\Azjol-Nerub\Ahn&apos;kahet\def_ahnkahet.h"
-							>
-						</File>
-						<File
-							RelativePath="..\scripts\zone\Azjol-Nerub\Ahn&apos;kahet\instance_ahnkahet.cpp"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="Azjol-Nerub"
-						>
-						<File
-							RelativePath="..\scripts\zone\Azjol-Nerub\Azjol-Nerub\boss_anubarak.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\scripts\zone\Azjol-Nerub\Azjol-Nerub\boss_hadronox.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\scripts\zone\Azjol-Nerub\Azjol-Nerub\boss_krikthir_the_gatewatcher.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\scripts\zone\Azjol-Nerub\Azjol-Nerub\def_azjol_nerub.h"
-							>
-						</File>
-						<File
-							RelativePath="..\scripts\zone\Azjol-Nerub\Azjol-Nerub\instance_azjol_nerub.cpp"
-							>
-						</File>
-					</Filter>
-
-	 	                                 </Filter>
-	 	                                 <Filter
-	 	                                         Name="Drak&apos;Tharon Keep">
-	 	                                 </Filter>
- 	                                 <Filter
-	 	                                         Name="Gundrak">
-	 	                                 </Filter>
-	 	                                 <Filter
-	 	                                         Name="Nexus">
-	 	                                         <Filter
-	 	                                                 Name="Nexus">
-	 	                                         </Filter>
-	 	                                         <Filter
-	 	                                                 Name="Oculus">
-	 	                                         </Filter>
-	 	                                         <Filter
-	 	                                                 Name="Eye of Eternity">
-	 	                                         </Filter>
-	 	                                 </Filter>
-	 	                                 <Filter
-	 	                                         Name="Violet Hold">
-	 	                                 </Filter>
-	 	                                 <Filter
-	 	                                         Name="Ulduar"
-	 	                                         >
-	 	                                         <Filter
-	 	                                                 Name="Halls of Stone">
-	 	                                         </Filter>
-	 	                                         <Filter
-	 	                                                 Name="Halls of Lightning">
-	 	                                         </Filter>
-	 	                                 </Filter>
-	 	                                 <Filter
-	 	                                         Name="Utgarde Keep">
-	 	                                         <Filter
-	 	                                                 Name="Utgarde Keep">
-														 	<File
-														 	RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_keleseth.cpp"
-														 	>
-														 	</File>
-														 	<File
-															RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_skarvald_dalronn.cpp"
-															>
-															</File>
-															<File
-															RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\boss_ingvar_the_plunderer.cpp"
-															>
-															</File>
-															<File
-														 	RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\def_utgarde_keep.h"
-														 	>
-														 	</File>
-														 	<File
-														 	RelativePath="..\scripts\zone\utgarde_keep\utgarde_keep\instance_utgarde_keep.cpp"
-														 	>
-														 	</File>
-	 	                                         </Filter>
-	 	                                         <Filter
-	 	                                                 Name="Utgarde Pinnacle">
-	 	                                         </Filter>
-	 	                                 </Filter>
-	 	                                 <Filter
-	 	                                         Name="Obsidian Sanctum">
-	 	                                 </Filter>
-	 	                                 <Filter
-	 	                                         Name="Vault of Archavon">
-	 	                                 </Filter>
 				<Filter
 					Name="Razorfen Downs"
 					>
@@ -1410,9 +1434,9 @@
 					Name="Thousand Needles"
 					>
 					<File
-                        RelativePath="..\scripts\zone\thousand_needles\thousand_needles.cpp"
-                        >
-                    </File>
+						RelativePath="..\scripts\zone\thousand_needles\thousand_needles.cpp"
+						>
+					</File>
 				</Filter>
 				<Filter
 					Name="Silithus"
@@ -1574,9 +1598,9 @@
 					Name="Un&apos;Goro Crater"
 					>
 					<File
-                            RelativePath="..\scripts\zone\ungoro_crater\ungoro_crater.cpp"
-                            >
-                        </File>
+						RelativePath="..\scripts\zone\ungoro_crater\ungoro_crater.cpp"
+						>
+					</File>
 				</Filter>
 				<Filter
 					Name="Aunchindoun"
@@ -1801,11 +1825,11 @@
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\hellfire_citadel\hellfire_ramparts\boss_watchkeeper_gargolmar.cpp"
+							RelativePath="..\scripts\zone\hellfire_citadel\hellfire_ramparts\boss_vazruden_the_herald.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\scripts\zone\hellfire_citadel\hellfire_ramparts\boss_vazruden_the_herald.cpp"
+							RelativePath="..\scripts\zone\hellfire_citadel\hellfire_ramparts\boss_watchkeeper_gargolmar.cpp"
 							>
 						</File>
 					</Filter>
@@ -2273,6 +2297,7 @@
 					<Filter
 						Name="Culling of Stratholme"
 						>
+					</Filter>
 					<Filter
 						Name="Old Hillsbrad"
 						>
@@ -2470,21 +2495,13 @@
 						>
 					</File>
 					<File
-						RelativePath="..\scripts\zone\blackrock_depths\def_blackrock_depths.h"
-						>
-					</File>
-					<File
-						RelativePath="..\scripts\zone\blackrock_depths\instance_blackrock_depths.cpp"
-						>
-					</File>
-					<File
 						RelativePath="..\scripts\zone\blackrock_depths\boss_ambassador_flamelash.cpp"
 						>
-					</File>				
+					</File>
 					<File
 						RelativePath="..\scripts\zone\blackrock_depths\boss_anubshiah.cpp"
 						>
-					</File>									
+					</File>
 					<File
 						RelativePath="..\scripts\zone\blackrock_depths\boss_emperor_dagran_thaurissan.cpp"
 						>
@@ -2492,7 +2509,7 @@
 					<File
 						RelativePath="..\scripts\zone\blackrock_depths\boss_general_angerforge.cpp"
 						>
-					</File>					
+					</File>
 					<File
 						RelativePath="..\scripts\zone\blackrock_depths\boss_gorosh_the_dervish.cpp"
 						>
@@ -2500,7 +2517,7 @@
 					<File
 						RelativePath="..\scripts\zone\blackrock_depths\boss_grizzle.cpp"
 						>
-					</File>					
+					</File>
 					<File
 						RelativePath="..\scripts\zone\blackrock_depths\boss_high_interrogator_gerstahn.cpp"
 						>
@@ -2512,11 +2529,19 @@
 					<File
 						RelativePath="..\scripts\zone\blackrock_depths\boss_moira_bronzebeard.cpp"
 						>
-					</File>					
+					</File>
 					<File
 						RelativePath="..\scripts\zone\blackrock_depths\boss_tomb_of_seven.cpp"
 						>
 					</File>
+					<File
+						RelativePath="..\scripts\zone\blackrock_depths\def_blackrock_depths.h"
+						>
+					</File>
+					<File
+						RelativePath="..\scripts\zone\blackrock_depths\instance_blackrock_depths.cpp"
+						>
+					</File>
 				</Filter>
 				<Filter
 					Name="Loch Modan"
@@ -2593,10 +2618,6 @@
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\config.h"
-			>
-		</File>
-		<File
 			RelativePath="..\ScriptMgr.cpp"
 			>
 		</File>
@@ -2605,14 +2626,9 @@
 			>
 		</File>
 		<File
-			RelativePath="..\svn_revision.h"
-			>
-		</File>
-		<File
 			RelativePath="..\system.cpp"
 			>
 		</File>
-		</Filter>
 	</Files>
 	<Globals>
 	</Globals>