From 0758e9f78ad228176fb73630512d03588f8b84c5 Mon Sep 17 00:00:00 2001
From: Shauren <none@none>
Date: Sun, 8 Aug 2010 12:41:22 +0200
Subject: More cleaning for CMakeLists Moved ScriptPCH from game directory to
 scripts

--HG--
branch : trunk
rename : src/server/game/PrecompiledHeaders/ScriptPCH.cpp => src/server/scripts/PrecompiledHeaders/ScriptPCH.cpp
rename : src/server/game/PrecompiledHeaders/ScriptPCH.h => src/server/scripts/PrecompiledHeaders/ScriptPCH.h
---
 src/server/game/CMakeLists.txt                     | 10 +++----
 src/server/game/PrecompiledHeaders/ScriptPCH.cpp   |  6 ----
 src/server/game/PrecompiledHeaders/ScriptPCH.h     | 32 ----------------------
 src/server/scripts/CMakeLists.txt                  | 16 ++++++-----
 .../scripts/PrecompiledHeaders/ScriptPCH.cpp       |  6 ++++
 src/server/scripts/PrecompiledHeaders/ScriptPCH.h  | 32 ++++++++++++++++++++++
 src/server/shared/CMakeLists.txt                   |  9 ------
 7 files changed, 51 insertions(+), 60 deletions(-)
 delete mode 100644 src/server/game/PrecompiledHeaders/ScriptPCH.cpp
 delete mode 100644 src/server/game/PrecompiledHeaders/ScriptPCH.h
 create mode 100644 src/server/scripts/PrecompiledHeaders/ScriptPCH.cpp
 create mode 100644 src/server/scripts/PrecompiledHeaders/ScriptPCH.h

(limited to 'src')

diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index 64828b7a09e..9eaa359b6c2 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -90,14 +90,11 @@ set(game_STAT_SRCS
   ${sources_World}
 )
 
-if( MSVC )
-  set(sources_PrecompiledHeaders 
-    PrecompiledHeaders/gamePCH.cpp
-    PrecompiledHeaders/gamePCH.h
-  )
+if(MSVC)
   set(game_STAT_SRCS
     ${game_STAT_SRCS}
-    ${sources_PrecompiledHeaders}
+    PrecompiledHeaders/gamePCH.cpp
+    PrecompiledHeaders/gamePCH.h
   )
 endif()
 
@@ -190,6 +187,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/game/Tools
   ${CMAKE_SOURCE_DIR}/src/server/game/Weather
   ${CMAKE_SOURCE_DIR}/src/server/game/World
+  ${CMAKE_SOURCE_DIR}/src/server/scripts/PrecompiledHeaders
 )
 
 add_library(game STATIC ${game_STAT_SRCS})
diff --git a/src/server/game/PrecompiledHeaders/ScriptPCH.cpp b/src/server/game/PrecompiledHeaders/ScriptPCH.cpp
deleted file mode 100644
index 41fecf3c60d..00000000000
--- a/src/server/game/PrecompiledHeaders/ScriptPCH.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
-* This program is free software licensed under GPL version 2
-* Please see the included DOCS/LICENSE.TXT for more information */
-
-#include "ScriptPCH.h"
-
diff --git a/src/server/game/PrecompiledHeaders/ScriptPCH.h b/src/server/game/PrecompiledHeaders/ScriptPCH.h
deleted file mode 100644
index 227a5de15ae..00000000000
--- a/src/server/game/PrecompiledHeaders/ScriptPCH.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright (C) 2006 - 2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
-* This program is free software licensed under GPL version 2
-* Please see the included DOCS/LICENSE.TXT for more information */
-
-#ifndef SC_PRECOMPILED_H
-#define SC_PRECOMPILED_H
-
-#include "ScriptMgr.h"
-#include "Cell.h"
-#include "CellImpl.h"
-#include "GameEventMgr.h"
-#include "GridNotifiers.h"
-#include "GridNotifiersImpl.h"
-#include "Unit.h"
-#include "GameObject.h"
-#include "ScriptedCreature.h"
-#include "ScriptedGossip.h"
-#include "ScriptedInstance.h"
-#include "CombatAI.h"
-#include "PassiveAI.h"
-#include "Chat.h"
-#include "DBCStructure.h"
-#include "DBCStores.h"
-#include "ObjectMgr.h"
-#include "SpellScript.h"
-
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-#endif
-
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index 951a4c7b52e..7d3de01f02b 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -40,6 +40,14 @@ set(scripts_STAT_SRCS
   ../game/AI/ScriptedAI/ScriptedSimpleAI.cpp
 )
 
+if(MSVC)
+  set(scripts_STAT_SRCS
+    ${scripts_STAT_SRCS}
+    PrecompiledHeaders/scriptPCH.cpp
+    PrecompiledHeaders/scriptPCH.h
+  )
+endif()
+
 message("-- Added Script Library to SCRIPTS lib")
 
 include_directories(
@@ -125,16 +133,10 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/game/Tools
   ${CMAKE_SOURCE_DIR}/src/server/game/Weather
   ${CMAKE_SOURCE_DIR}/src/server/game/World
+  ${CMAKE_SOURCE_DIR}/src/server/scripts/PrecompiledHeaders
   ${MYSQL_INCLUDE_DIR}
 )
 
-# Add ScriptPCH.cpp to project on Windows
-if(MSVC)
-set(scripts_STAT_SRCS
-    ../game/PrecompiledHeaders/ScriptPCH.cpp
-    ${scripts_STAT_SRCS})
-endif()
-
 add_library(scripts STATIC ${scripts_STAT_SRCS})
 
 # Generate precompiled header
diff --git a/src/server/scripts/PrecompiledHeaders/ScriptPCH.cpp b/src/server/scripts/PrecompiledHeaders/ScriptPCH.cpp
new file mode 100644
index 00000000000..41fecf3c60d
--- /dev/null
+++ b/src/server/scripts/PrecompiledHeaders/ScriptPCH.cpp
@@ -0,0 +1,6 @@
+/* Copyright (C) 2006 - 2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
+* This program is free software licensed under GPL version 2
+* Please see the included DOCS/LICENSE.TXT for more information */
+
+#include "ScriptPCH.h"
+
diff --git a/src/server/scripts/PrecompiledHeaders/ScriptPCH.h b/src/server/scripts/PrecompiledHeaders/ScriptPCH.h
new file mode 100644
index 00000000000..227a5de15ae
--- /dev/null
+++ b/src/server/scripts/PrecompiledHeaders/ScriptPCH.h
@@ -0,0 +1,32 @@
+/* Copyright (C) 2006 - 2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
+* This program is free software licensed under GPL version 2
+* Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef SC_PRECOMPILED_H
+#define SC_PRECOMPILED_H
+
+#include "ScriptMgr.h"
+#include "Cell.h"
+#include "CellImpl.h"
+#include "GameEventMgr.h"
+#include "GridNotifiers.h"
+#include "GridNotifiersImpl.h"
+#include "Unit.h"
+#include "GameObject.h"
+#include "ScriptedCreature.h"
+#include "ScriptedGossip.h"
+#include "ScriptedInstance.h"
+#include "CombatAI.h"
+#include "PassiveAI.h"
+#include "Chat.h"
+#include "DBCStructure.h"
+#include "DBCStores.h"
+#include "ObjectMgr.h"
+#include "SpellScript.h"
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
+#endif
+
diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt
index b5a23b1b7d4..85d8c1a971b 100644
--- a/src/server/shared/CMakeLists.txt
+++ b/src/server/shared/CMakeLists.txt
@@ -39,15 +39,6 @@ set(shared_STAT_SRCS
   ${sources_localdir}
 )
 
-# Windows specific files
-if(WIN32)
-  set(shared_STAT_SRCS
-    ${shared_STAT_SRCS}
-    Debugging/WheatyExceptionReport.cpp
-    Utilities/ServiceWin32.cpp
-  )
-endif()
-
 include_directories(
   ${ACE_INCLUDE_DIR}
   ${MYSQL_INCLUDE_DIR}
-- 
cgit v1.2.3