From 6337c3adfb6b7ee6326f2bfa9f0b0992ce412ae1 Mon Sep 17 00:00:00 2001
From: Kudlaty <none@none>
Date: Sun, 16 Aug 2009 00:53:16 +0200
Subject: Merge [SD2] r1288 Update include guards with better naming. r1289 Fix
 typo in makefile.am - skip r1290 Move AI remaining in misc folders to own
 folder base.       Rename file to same as others for consistency and update
 includes accordingly.

--HG--
branch : trunk
---
 src/bindings/scripts/VC80/80ScriptDev2.vcproj | 80 ++++++++++++---------------
 1 file changed, 36 insertions(+), 44 deletions(-)

(limited to 'src/bindings/scripts/VC80')

diff --git a/src/bindings/scripts/VC80/80ScriptDev2.vcproj b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
index 5518d35f66f..f2df15cf407 100644
--- a/src/bindings/scripts/VC80/80ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
@@ -46,7 +46,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\..\..\..\dep\ACE_wrappers"
+				AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\base\;..\..\..\..\dep\ACE_wrappers"
 				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_WINDOWS;_USRDLL;SCRIPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -131,7 +131,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\..\..\..\dep\ACE_wrappers"
+				AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\base\;..\..\..\..\dep\ACE_wrappers"
 				PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_WINDOWS;_USRDLL;SCRIPT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -215,7 +215,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
-				AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\..\..\..\dep\ACE_wrappers"
+				AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\base\;..\..\..\..\dep\ACE_wrappers"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT;_SECURE_SCL=0"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
@@ -300,7 +300,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
-				AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\..\..\..\dep\ACE_wrappers"
+				AdditionalIncludeDirectories="..\..\..\..\dep\include\;..\..\..\shared\;..\..\..\framework\;..\..\..\game\;..\include\;..\base\;..\..\..\..\dep\ACE_wrappers"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SCRIPT;_SECURE_SCL=0"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
@@ -361,20 +361,40 @@
 	</References>
 	<Files>
         <Filter
-            Name="scripts"
+            Name="base"
             >
-            <Filter
-                Name="creature"
+            <File
+                RelativePath="..\base\escortAI.cpp"
                 >
-                <File
-                    RelativePath="..\scripts\creature\simple_ai.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\creature\simple_ai.h"
-                    >
-                </File>
-            </Filter>
+            </File>
+            <File
+                RelativePath="..\base\escortAI.h"
+                >
+            </File>
+            <File
+                RelativePath="..\base\guard_ai.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\base\guard_ai.h"
+                >
+            </File>
+            <File
+                RelativePath="..\base\guards.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\base\simple_ai.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\base\simple_ai.h"
+                >
+            </File>
+        </Filter>
+        <Filter
+            Name="scripts"
+            >
             <Filter
                 Name="eastern_kingdoms"
                 >
@@ -487,22 +507,6 @@
                     >
                 </File>
             </Filter>
-            <Filter
-                Name="guard"
-                >
-                <File
-                    RelativePath="..\scripts\guard\guard_ai.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\guard\guard_ai.h"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\guard\guards.cpp"
-                    >
-                </File>
-            </Filter>
             <Filter
                 Name="kalimdor"
                 >
@@ -618,18 +622,6 @@
                     >
                 </File>
             </Filter>
-            <Filter
-                Name="npc"
-                >
-                <File
-                    RelativePath="..\scripts\npc\npc_escortAI.cpp"
-                    >
-                </File>
-                <File
-                    RelativePath="..\scripts\npc\npc_escortAI.h"
-                    >
-                </File>
-            </Filter>
             <Filter
                 Name="outland"
                 >
-- 
cgit v1.2.3