From 6650068b5e6b007e6534445cf39f45dbfdb292f5 Mon Sep 17 00:00:00 2001
From: Brian <runningnak3d@gmail.com>
Date: Mon, 7 Jun 2010 15:59:21 -0600
Subject: * Nearly done with fixing the Linux build. * Thanks to samccstudios
 for saving me some time with the Outlands scripts.

--HG--
branch : trunk
---
 src/server/game/CMakeLists.txt                         | 3 ++-
 src/server/game/Entities/Object/Updates/UpdateData.cpp | 2 +-
 src/server/game/Maps/Map.cpp                           | 4 ++--
 src/server/game/Maps/MapManager.cpp                    | 4 ++--
 src/server/game/Scripting/ScriptLoader.cpp             | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/server/game')

diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt
index 44c5e32baa1..7f9c936cff9 100644
--- a/src/server/game/CMakeLists.txt
+++ b/src/server/game/CMakeLists.txt
@@ -316,8 +316,8 @@ SET(game_STAT_SRCS
 
 include_directories(
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/externals
   ${CMAKE_SOURCE_DIR}/externals/mersennetwister
+  ${CMAKE_SOURCE_DIR}/externals/zlib
   ${CMAKE_SOURCE_DIR}/src/server/collision
   ${CMAKE_SOURCE_DIR}/src/server/collision/Management
   ${CMAKE_SOURCE_DIR}/src/server/shared
@@ -386,6 +386,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP
   ${CMAKE_SOURCE_DIR}/src/server/game/OutdoorPvP/Zones
   ${CMAKE_SOURCE_DIR}/src/server/game/Pools
+  ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders
   ${CMAKE_SOURCE_DIR}/src/server/game/Quests
   ${CMAKE_SOURCE_DIR}/src/server/game/Reputation
   ${CMAKE_SOURCE_DIR}/src/server/game/Scripting
diff --git a/src/server/game/Entities/Object/Updates/UpdateData.cpp b/src/server/game/Entities/Object/Updates/UpdateData.cpp
index 68f0501f304..0b7a553d666 100644
--- a/src/server/game/Entities/Object/Updates/UpdateData.cpp
+++ b/src/server/game/Entities/Object/Updates/UpdateData.cpp
@@ -25,7 +25,7 @@
 #include "Log.h"
 #include "Opcodes.h"
 #include "World.h"
-#include <zlib/zlib.h>
+#include "zlib.h"
 
 UpdateData::UpdateData() : m_blockCount(0)
 {
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 11bfdcd6f99..72337452d07 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -28,8 +28,8 @@
 #include "InstanceData.h"
 #include "Map.h"
 #include "GridNotifiersImpl.h"
-#include "Config/ConfigEnv.h"
-#include "Transports.h"
+#include "Configuration/ConfigEnv.h"
+#include "Transport.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
 #include "World.h"
diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp
index de3d0ebbaff..0585098cae0 100644
--- a/src/server/game/Maps/MapManager.cpp
+++ b/src/server/game/Maps/MapManager.cpp
@@ -24,12 +24,12 @@
 #include "Database/DatabaseEnv.h"
 #include "Log.h"
 #include "ObjectAccessor.h"
-#include "Transports.h"
+#include "Transport.h"
 #include "GridDefines.h"
 #include "MapInstanced.h"
 #include "InstanceData.h"
 #include "DestinationHolderImp.h"
-#include "Config/ConfigEnv.h"
+#include "Configuration/ConfigEnv.h"
 #include "World.h"
 #include "CellImpl.h"
 #include "Corpse.h"
diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp
index 2006c091287..37af3c50691 100644
--- a/src/server/game/Scripting/ScriptLoader.cpp
+++ b/src/server/game/Scripting/ScriptLoader.cpp
@@ -14,7 +14,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "ScriptedPch.h"
+#include "ScriptPCH.h"
 
 #ifdef WIN32
   #define DO_SCRIPTS
-- 
cgit v1.2.3