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

--HG--
branch : trunk

6 files changed, 15 insertions, 15 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b7fd8c75336..7eb2c78fee2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,7 +10,7 @@
 
 add_subdirectory(server)
 
-if(DO_TOOLS)
+if(TOOLS)
   add_subdirectory(tools)
-endif(DO_TOOLS)
+endif(TOOLS)
 
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 5d9b3b2ef9f..6c7a27d61e0 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -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)
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
 
diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index 9f0cd8ad452..01b7d3e561e 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -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)
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 69beb4e69ba..9237f59a102 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -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 "")