From bfc6dec0728dddb531fbe003c741b784c7f02592 Mon Sep 17 00:00:00 2001 From: click Date: Tue, 27 Jul 2010 05:40:21 +0200 Subject: Cut away DO_*-parts from buildsystem and specific files checking for it. --HG-- branch : trunk --- src/server/game/CMakeLists.txt | 6 +++--- src/server/game/Scripting/ScriptLoader.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/server/game') diff --git a/src/server/game/CMakeLists.txt b/src/server/game/CMakeLists.txt index 5738d7b8fc7..00a70cf0e46 100644 --- a/src/server/game/CMakeLists.txt +++ b/src/server/game/CMakeLists.txt @@ -11,7 +11,7 @@ ######## game ######## # Enable precompiled headers when using the GCC compiler. -if(DO_PCH) +if(PCH) include_directories(${CMAKE_CURRENT_BINARY_DIR}) endif() @@ -271,7 +271,7 @@ include_directories( ${ACE_INCLUDE_DIR} ) -if(NOT DO_SCRIPTS) +if(NOT SCRIPTS) set(game_STAT_SRCS ${game_STAT_SRCS} AI/ScriptedAI/ScriptedEscortAI.cpp @@ -295,7 +295,7 @@ add_library(game STATIC ${game_STAT_SRCS}) add_dependencies(game revision.h) # Generate precompiled header -if(DO_PCH) +if(PCH) if(CMAKE_COMPILER_IS_GNUCXX) add_precompiled_header(game ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/gamePCH.h) elseif(MSVC) diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp index 54bd9150a91..48e03783f48 100644 --- a/src/server/game/Scripting/ScriptLoader.cpp +++ b/src/server/game/Scripting/ScriptLoader.cpp @@ -16,7 +16,7 @@ #include "ScriptPCH.h" -#ifdef DO_SCRIPTS +#ifdef SCRIPTS //custom //examples @@ -531,7 +531,7 @@ void AddSC_example_spell_scripts(); void AddScripts() { -#ifdef DO_SCRIPTS +#ifdef SCRIPTS //custom -- cgit v1.2.3