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

--HG--
branch : trunk

10 files changed, 65 insertions, 66 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5de4aa22154..346501166c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,15 +80,15 @@ add_custom_target(uninstall
 )
 endif()
 
-option(DO_AUTHSERVER "Build authserver" 1)
-option(DO_WORLDSERVER "Build worldserver" 1)
-option(DO_CLI "With CLI" 1)
-option(DO_DEBUG "Debug mode" 0)
-option(DO_PCH "Use precompiled headers" 1)
-option(DO_SCRIPTS "With trinityscripts" 1)
-option(DO_SQL "Copy SQL files" 0)
-option(DO_TOOLS "Build tools" 0)
-option(DO_WARN "Enable all compile warnings" 0)
+option(AUTHSERVER "Build authserver" 1)
+option(WORLDSERVER "Build worldserver" 1)
+option(CLI "With CLI" 1)
+option(DEBUG "Debug mode" 0)
+option(PCH "Use precompiled headers" 1)
+option(SCRIPTS "With trinityscripts" 1)
+option(SQL "Copy SQL files" 0)
+option(TOOLS "Build tools" 0)
+option(WARNINGS "Enable all compile warnings" 0)
 
 if( UNIX )
   option(CENTOS "CENTOS" 0)
@@ -110,7 +110,7 @@ set(GENREV_SRC
 )
 
 # Handle debugmode compiles (this will require further work for proper WIN32-setups)
-if( DO_DEBUG )
+if( DEBUG )
   set(CMAKE_BUILD_TYPE Debug)
 endif()
 
@@ -159,52 +159,52 @@ message("* Install libraries to  : ${LIBSDIR}")
 message("* Install configs to    : ${CONF_DIR}")
 message("")
 
-if( DO_AUTHSERVER )
+if( AUTHSERVER )
   message("* Build authserver      : Yes (default)")
 else()
   message("* Build authserver      : No")
 endif()
 
-if( DO_WORLDSERVER )
+if( WORLDSERVER )
   message("* Build worldserver     : Yes (default)")
 else()
   message("* Build worldserver     : No")
 endif()
 
-if( DO_SCRIPTS )
+if( SCRIPTS )
   message("* Build Trinityscripts  : Yes (default)")
-  add_definitions(-DDO_SCRIPTS)
+  add_definitions(-DSCRIPTS)
 else()
   message("* Build Trinityscripts  : No")
 endif()
 
-if( DO_TOOLS )
+if( TOOLS )
   message("* Build map/vmap tools  : Yes")
 else()
   message("* Build map/vmap tools  : No  (default)")
 endif()
 
-if( DO_CLI )
+if( CLI )
   message("* Build with CLI        : Yes (default)")
   add_definitions(-DENABLE_CLI)
 else()
   message("* Build with CLI        : No")
 endif()
 
-if( DO_DEBUG )
+if( DEBUG )
   message("* Build in debug-mode   : Yes")
   add_definitions(-g -DTRINITY_DEBUG)
 else()
   message("* Build in debug-mode   : No  (default)")
 endif()
 
-if( DO_PCH )
+if( PCH )
   message("* Use PCH               : Yes (default)")
 else()
   message("* Use PCH               : No")
 endif()
 
-if( DO_WARN )
+if( WARNINGS )
   message("* Show all warnings     : Yes")
   if( UNIX )
     add_definitions(-Wall -Wfatal-errors -Wextra)
@@ -225,7 +225,7 @@ else()
   endif()
 endif()
 
-if( DO_SQL )
+if( SQL )
   message("* Install SQL-files     : Yes")
 else()
   message("* Install SQL-files     : No  (default)")
@@ -257,7 +257,7 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH 1)
 
 add_subdirectory(externals)
 add_subdirectory(src)
-if( DO_SQL )
+if( SQL )
   add_subdirectory(sql)
 endif()
 
diff --git a/docs/UnixInstall.txt b/docs/UnixInstall.txt
index a0bd7e07715..45431f679e4 100644
--- a/docs/UnixInstall.txt
+++ b/docs/UnixInstall.txt
@@ -1,11 +1,10 @@
 = TrinityCore -- Linux installation =
-
-Copyright (C) Trinity Core (http://www.trinitycore.org)
+Copyright (C) 2008-2010 TrinityCore (http://www.trinitycore.org)
 
 CHECK http://www.trinitycore.info/w/Linux_Build_HOWTO FOR FURTHER HELP
 
-Installing Trinity Core is fairly simple on a Linux machine, assuming
-you have all required applications
+Installing TrinityCore is fairly simple on a Linux machine, assuming you 
+have all required applications
 
 The most important ones are:
 
@@ -25,37 +24,37 @@ The most important ones are:
     build-essential
     mysql-client
     
-Most of these are included on common Linux distros, others you may have to install by your self. 
-Please check your distro's repos.
+Most of these are included on common Linux distros, others you may have 
+to install by your self. Please check your distro's repos.
 
-Make a directory to build in, you can call it anything you want like build or bin etc, then go into 
-the directory and cmake and make. E.G. you created a dir named build ad want to have your final
- compiled product installed in /home/trinity/server, an example sequence of commands can be : 
+Make a directory to build in, you can call it anything you want like 
+build or bin etc, then go into the directory and cmake and make. E.G. 
+you created a dir named build ad want to have your finalcompiled product 
+installed in /home/trinity/server, an example sequence of commands can 
+be :
 
     cmake ../ -DPREFIX=/home/trinity/server
     make
     make install
     
-Thats just about all thats needed. You can however tweak more settings than where to install using flags built into our cmake files. Just open up CMakeLists.txt in the main folder and take a look at some of the flags like 
-
-    DO_MYSQL --mysql database support (enabled or disabled by a 1 or 0, enabled by default)
-    DO_SCRIPTS --enable or disable trinity script (enabled or disabled by a 1 or 0, enabled by default)
-    DO_RA --remote administration (enabled or disabled by a 1 or 0)
-    DO_DEBUG --enable debugging (enabled or disabled by a 1 or 0)
-    DO_CLI --enable command line support (enabled or disabled by a 1 or 0, enabled by default)
-    LARGE_CELL --enable large cells (enabled or disabled by a 1 or 0, disabled by default, enabling can cause CPU spikes)
-    SHORT_SLEEP --changes sleep time from 100ms to 50ms
+Thats just about all thats needed. You can however tweak more settings 
+than where to install using flags built into our cmake files. Just open 
+up CMakeLists.txt in the main folder and take a look at some of the 
+flags like
+
+    SCRIPTS --enable or disable trinity script (enabled or disabled by a 1 or 0, enabled by default)
+    DEBUG --enable debugging (enabled or disabled by a 1 or 0)
+    CLI --enable command line support (enabled or disabled by a 1 or 0, enabled by default)
     PREFIX --prefix directory for install (see example for use)
     CONF_DIR --location for your trinity config files
     CMAKE_C_FLAGS --advanced users only
     CMAKE_CXX_FLAGS --advanced users only
 
 
-Of course, replace the paths in prefix, conf_dir with the directories you wish to install 
-Trinity Core to. The datadir is where maps, DBCs, and SQLs are stored. The sysconfdir
-is where configuration files are stored.
+Of course, replace the paths in prefix, conf_dir with the directories 
+you wish to install TrinityCore to. The datadir is where maps, DBCs, and 
+SQLs are stored. The sysconfdir is where configuration files are stored.
 
-Once Trinity Core is installed you will need to
-apply database updates where necessary. Furthermore, you must
-configure your installation by editing the config files in the
-sysconfdir.
+Once TrinityCore is installed you will need to apply database updates 
+where necessary. Furthermore, you must configure your installation by 
+editing the config files in the sysconfdir.
diff --git a/externals/ace/CMakeLists.txt b/externals/ace/CMakeLists.txt
index db0dc7cdfee..f80015f0b41 100644
--- a/externals/ace/CMakeLists.txt
+++ b/externals/ace/CMakeLists.txt
@@ -332,6 +332,6 @@ add_definitions(-DACE_BUILD_DLL)
 
 add_library(ace SHARED ${ace_STAT_SRCS})
 
-if(DO_PCH)
+if(PCH)
   add_native_precompiled_header(ace ${CMAKE_SOURCE_DIR}/externals/ace/PrecompiledHeaders/WinAcePCH)
 endif()
\ No newline at end of file
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 "")
diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj
index bd058c4da3a..a023869ac8e 100644
--- a/win/VC90/game.vcproj
+++ b/win/VC90/game.vcproj
@@ -49,7 +49,7 @@
 				AdditionalOptions="/MP /Zm200"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\externals;..\..\externals\g3dlite;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\collision\Maps;..\..\src\server\collision\Models;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World"
-				PreprocessorDefinitions="WIN32;TRINITY_DEBUG;_CRT_SECURE_NO_WARNINGS;DO_SCRIPTS"
+				PreprocessorDefinitions="WIN32;TRINITY_DEBUG;_CRT_SECURE_NO_WARNINGS;SCRIPTS"
 				StringPooling="false"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
@@ -136,7 +136,7 @@
 				AdditionalOptions="/MP /bigobj /Zm200"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\externals;..\..\externals\g3dlite;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\collision\Maps;..\..\src\server\collision\Models;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World"
-				PreprocessorDefinitions="WIN32;TRINITY_DEBUG;_CRT_SECURE_NO_WARNINGS;DO_SCRIPTS"
+				PreprocessorDefinitions="WIN32;TRINITY_DEBUG;_CRT_SECURE_NO_WARNINGS;SCRIPTS"
 				StringPooling="false"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
@@ -220,7 +220,7 @@
 				AdditionalOptions="/MP /Zm200"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\externals;..\..\externals\g3dlite;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\collision\Maps;..\..\src\server\collision\Models;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;DO_SCRIPTS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;SCRIPTS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -303,7 +303,7 @@
 				AdditionalOptions="/MP /bigobj /Zm200"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\externals;..\..\externals\g3dlite;..\..\externals\mersennetwister;..\..\externals\zlib;..\..\src\server\collision;..\..\src\server\collision\Management;..\..\src\server\collision\Maps;..\..\src\server\collision\Models;..\..\src\server\shared;..\..\src\server\shared\Configuration;..\..\src\server\shared\Cryptography;..\..\src\server\shared\Cryptography\Authentication;..\..\src\server\shared\Database;..\..\src\server\shared\DataStores;..\..\src\server\shared\Debugging;..\..\src\server\shared\Dynamic\CountedReference;..\..\src\server\shared\Dynamic\LinkedReference;..\..\src\server\shared\Dynamic;..\..\src\server\shared\Logging;..\..\src\server\shared\Packets;..\..\src\server\shared\Policies;..\..\src\server\shared\Threading;..\..\src\server\shared\Utilities;..\..\src\server\game;..\..\src\server\game\Accounts;..\..\src\server\game\Achievements;..\..\src\server\game\Addons;..\..\src\server\game\AI;..\..\src\server\game\AI\CoreAI;..\..\src\server\game\AI\EventAI;..\..\src\server\game\AI\ScriptedAI;..\..\src\server\game\AuctionHouse;..\..\src\server\game\AuctionHouse\AuctionHouseBot;..\..\src\server\game\BattleGrounds;..\..\src\server\game\BattleGrounds\Zones;..\..\src\server\game\Calendar;..\..\src\server\game\Chat;..\..\src\server\game\Chat\Channels;..\..\src\server\game\Chat\Commands;..\..\src\server\game\Combat;..\..\src\server\game\Conditions;..\..\src\server\game\DataStores;..\..\src\server\game\DungeonFinding;..\..\src\server\game\Entities;..\..\src\server\game\Entities\Creature;..\..\src\server\game\Entities\Corpse;..\..\src\server\game\Entities\DynamicObject;..\..\src\server\game\Entities\GameObject;..\..\src\server\game\Entities\Item;..\..\src\server\game\Entities\Item\Container;..\..\src\server\game\Entities\Object;..\..\src\server\game\Entities\Object\Updates;..\..\src\server\game\Entities\Pet;..\..\src\server\game\Entities\Player;..\..\src\server\game\Entities\Totem;..\..\src\server\game\Entities\Unit;..\..\src\server\game\Entities\Vehicle;..\..\src\server\game\Entities\Transport;..\..\src\server\game\Events;..\..\src\server\game\Globals;..\..\src\server\game\Grids\Cells;..\..\src\server\game\Grids\Notifiers;..\..\src\server\game\Grids;..\..\src\server\game\Groups;..\..\src\server\game\Guilds;..\..\src\server\game\Instances;..\..\src\server\game\Loot;..\..\src\server\game\Mails;..\..\src\server\game\Maps;..\..\src\server\game\Miscellaneous;..\..\src\server\game\Movement;..\..\src\server\game\Movement\MovementGenerators;..\..\src\server\game\Movement\Waypoints;..\..\src\server\game\OutdoorPvP;..\..\src\server\game\OutdoorPvP\Zones;..\..\src\server\game\Pools;..\..\src\server\game\PrecompiledHeaders;..\..\src\server\game\Quests;..\..\src\server\game\Reputation;..\..\src\server\game\Scripting;..\..\src\server\game\Server;..\..\src\server\game\Server\Protocol;..\..\src\server\game\Server\Protocol\Handlers;..\..\src\server\game\Skills;..\..\src\server\game\Spells;..\..\src\server\game\Spells\Auras;..\..\src\server\game\Tools;..\..\src\server\game\Weather;..\..\src\server\game\World"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;DO_SCRIPTS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;SCRIPTS"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"