* Nearly done with fixing the Linux build.

* Thanks to samccstudios for saving me some time with the Outlands scripts.

--HG--
branch : trunk
This commit is contained in:
Brian
2010-06-07 15:59:21 -06:00
parent c834449400
commit 6650068b5e
6 changed files with 215 additions and 213 deletions
+2 -1
View File
@@ -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
@@ -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)
{
+2 -2
View File
@@ -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"
+2 -2
View File
@@ -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"
+1 -1
View File
@@ -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