aboutsummaryrefslogtreecommitdiff
path: root/src/server/game
diff options
context:
space:
mode:
authorXanadu <none@none>2010-06-23 01:47:41 +0200
committerXanadu <none@none>2010-06-23 01:47:41 +0200
commitffaffe3fd753b0afc75679c9730276871a9d034a (patch)
treef51f59797532a307b6f8f426fd22e593c4418070 /src/server/game
parent27062ffd6173b0ea1181353eeade6935e355e351 (diff)
* Renamed several VS projects and the executables they produce to reflect the new naming convention.
* Cleaned up some useless and redundant preprocessor definitions. * Fixed the win build so that it correctly uses the mysql lib it built from the sources. * Note that you still need to use 8615_mysql_openssl_libs.zip for the OpenSSL binaries. * Also note that Win x64 build from the existing VS files is still fubar (mysql lib...). --HG-- branch : trunk
Diffstat (limited to 'src/server/game')
-rw-r--r--src/server/game/PrecompiledHeaders/ScriptPCH.h2
-rw-r--r--src/server/game/Scripting/ScriptLoader.cpp2
-rw-r--r--src/server/game/Spells/Spell.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/PrecompiledHeaders/ScriptPCH.h b/src/server/game/PrecompiledHeaders/ScriptPCH.h
index 1e83a88b87a..f8515e99f89 100644
--- a/src/server/game/PrecompiledHeaders/ScriptPCH.h
+++ b/src/server/game/PrecompiledHeaders/ScriptPCH.h
@@ -23,7 +23,7 @@
#include "DBCStores.h"
#include "ObjectMgr.h"
-#ifdef WIN32
+#ifdef _WIN32
#include <windows.h>
#endif
diff --git a/src/server/game/Scripting/ScriptLoader.cpp b/src/server/game/Scripting/ScriptLoader.cpp
index 37af3c50691..7bdf7eb6e4e 100644
--- a/src/server/game/Scripting/ScriptLoader.cpp
+++ b/src/server/game/Scripting/ScriptLoader.cpp
@@ -16,7 +16,7 @@
#include "ScriptPCH.h"
-#ifdef WIN32
+#ifdef _WIN32
#define DO_SCRIPTS
#endif
diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h
index a987e35e65d..372c668d2de 100644
--- a/src/server/game/Spells/Spell.h
+++ b/src/server/game/Spells/Spell.h
@@ -769,14 +769,14 @@ namespace Trinity
}
}
- #ifdef WIN32
+ #ifdef _WIN32
template<> inline void Visit(CorpseMapType &) {}
template<> inline void Visit(GameObjectMapType &) {}
template<> inline void Visit(DynamicObjectMapType &) {}
#endif
};
- #ifndef WIN32
+ #ifndef _WIN32
template<> inline void SpellNotifierCreatureAndPlayer::Visit(CorpseMapType&) {}
template<> inline void SpellNotifierCreatureAndPlayer::Visit(GameObjectMapType&) {}
template<> inline void SpellNotifierCreatureAndPlayer::Visit(DynamicObjectMapType&) {}