Cut away DO_*-parts from buildsystem and specific files checking for it.

--HG--
branch : trunk
This commit is contained in:
click
2010-07-27 05:40:21 +02:00
parent 2b9275424e
commit bfc6dec072
10 changed files with 64 additions and 65 deletions
+5 -5
View File
@@ -8,22 +8,22 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
if(DO_WORLDSERVER)
if(WORLDSERVER)
add_subdirectory(shared)
add_subdirectory(game)
add_subdirectory(collision)
if(DO_SCRIPTS)
if(SCRIPTS)
add_subdirectory(scripts)
endif()
add_subdirectory(worldserver)
else()
if(DO_TOOLS)
if(TOOLS)
add_subdirectory(collision)
endif()
endif()
if (DO_AUTHSERVER)
if(NOT DO_WORLDSERVER)
if (AUTHSERVER)
if(NOT WORLDSERVER)
add_subdirectory(shared)
endif()
add_subdirectory(authserver)
+3 -3
View File
@@ -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)
+2 -2
View File
@@ -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
+2 -2
View File
@@ -17,7 +17,7 @@ file(GLOB_RECURSE scripts_spells Spells/*.cpp)
file(GLOB_RECURSE scripts_examples Examples/*.cpp)
# Enable precompiled headers when using the GCC compiler.
if(DO_PCH)
if(PCH)
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
@@ -135,7 +135,7 @@ endif()
add_library(scripts STATIC ${scripts_STAT_SRCS})
# Generate precompiled header
if(DO_PCH)
if(PCH)
if(CMAKE_COMPILER_IS_GNUCXX)
add_precompiled_header(scripts ${CMAKE_SOURCE_DIR}/src/server/game/PrecompiledHeaders/ScriptPCH.h)
elseif(MSVC)
+1 -1
View File
@@ -139,7 +139,7 @@ endif()
set_target_properties(worldserver PROPERTIES LINK_FLAGS "${worldserver_LINK_FLAGS}")
if( DO_SCRIPTS )
if( SCRIPTS )
set(SCRIPT_LIB "scripts")
else()
set(SCRIPT_LIB "")