* Added missing include paths that got lost in the merge a few revs ago

* Fixed realative path to Reference.h
* Re-enabled PCH building by default
* Re-enabled scripts building by default
* Linux compile now fully functional again.

--HG--
branch : trunk
This commit is contained in:
Brian
2010-06-09 00:34:22 -06:00
parent 9cf85c0549
commit 02efe02b43
6 changed files with 7 additions and 5 deletions

View File

@@ -33,9 +33,9 @@ option(CENTOS "CENTOS" 0)
option(DO_CLI "With CLI" 1)
option(DO_DEBUG "Debug mode" 0)
option(DO_MYSQL "With MySQL support" 1)
option(DO_PCH "Use precompiled headers" 0)
option(DO_PCH "Use precompiled headers" 1)
option(DO_RA "With RA" 0)
option(DO_SCRIPTS "With trinityscripts" 0)
option(DO_SCRIPTS "With trinityscripts" 1)
option(DO_SQL "Copy SQL files" 0)
option(DO_TOOLS "Compile tools" 0)
option(DO_WARN "Enable all compile warnings" 0)

View File

@@ -325,6 +325,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/server/shared
${CMAKE_SOURCE_DIR}/src/server/shared/Configuration
${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography
${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography/Authentication
${CMAKE_SOURCE_DIR}/src/server/shared/Database
${CMAKE_SOURCE_DIR}/src/server/shared/DataStores
${CMAKE_SOURCE_DIR}/src/server/shared/Debugging

View File

@@ -23,7 +23,7 @@
#include "Common.h"
#include "SharedDefines.h"
#include "Reference.h"
#include "LinkedReference/Reference.h"
#include "UnitEvents.h"
#include <list>

View File

@@ -21,7 +21,7 @@
#ifndef _GRIDREFERENCE_H
#define _GRIDREFERENCE_H
#include "Reference.h"
#include "LinkedReference/Reference.h"
template<class OBJECT>
class GridRefManager;

View File

@@ -21,7 +21,7 @@
#ifndef _GROUPREFERENCE_H
#define _GROUPREFERENCE_H
#include "Reference.h"
#include "LinkedReference/Reference.h"
class Group;
class Player;

View File

@@ -24,6 +24,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/server/shared
${CMAKE_SOURCE_DIR}/src/server/shared/Configuration
${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography
${CMAKE_SOURCE_DIR}/src/server/shared/Cryptography/Authentication
${CMAKE_SOURCE_DIR}/src/server/shared/Database
${CMAKE_SOURCE_DIR}/src/server/shared/DataStores
${CMAKE_SOURCE_DIR}/src/server/shared/Debugging