* 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
This commit is contained in:
Xanadu
2010-06-23 01:47:41 +02:00
parent 27062ffd61
commit ffaffe3fd7
37 changed files with 867 additions and 821 deletions
+3 -3
View File
@@ -37,7 +37,7 @@
# define _TRINITY_CORE_CONFIG "worldserver.conf"
#endif //_TRINITY_CORE_CONFIG
#ifdef WIN32
#ifdef _WIN32
#include "ServiceWin32.h"
char serviceName[] = "TrinityCore";
char serviceLongName[] = "Trinity core service";
@@ -62,7 +62,7 @@ void usage(const char *prog)
{
sLog.outString("Usage: \n %s [<options>]\n"
" -c config_file use config_file as configuration file\n\r"
#ifdef WIN32
#ifdef _WIN32
" Running as service functions:\n\r"
" --service run as service\n\r"
" -s install install service\n\r"
@@ -91,7 +91,7 @@ extern int main(int argc, char **argv)
cfg_file = argv[c];
}
#ifdef WIN32
#ifdef _WIN32
////////////
//Services//
////////////
+4 -4
View File
@@ -50,7 +50,7 @@
#include "ListenSocket.h"
#include "BigNumber.h"
#ifdef WIN32
#ifdef _WIN32
#include "ServiceWin32.h"
extern int m_ServiceStatus;
#endif
@@ -285,7 +285,7 @@ int Master::Run()
ACE_Based::Thread* cliThread = NULL;
#ifdef WIN32
#ifdef _WIN32
if (sConfig.GetBoolDefault("Console.Enable", true) && (m_ServiceStatus == -1)/* need disable console in service mode*/)
#else
if (sConfig.GetBoolDefault("Console.Enable", true))
@@ -298,7 +298,7 @@ int Master::Run()
ACE_Based::Thread rar_thread(new RARunnable);
///- Handle affinity for multiple processors and process priority on Windows
#ifdef WIN32
#ifdef _WIN32
{
HANDLE hProcess = GetCurrentProcess();
@@ -386,7 +386,7 @@ int Master::Run()
if (cliThread)
{
#ifdef WIN32
#ifdef _WIN32
// this only way to terminate CLI thread exist at Win32 (alt. way exist only in Windows Vista API)
//_exit(1);
@@ -35,7 +35,7 @@
#define WORLD_SLEEP_CONST 50
#ifdef WIN32
#ifdef _WIN32
#include "ServiceWin32.h"
extern int m_ServiceStatus;
#endif
@@ -76,7 +76,7 @@ void WorldRunnable::run()
else
prevSleepTime = 0;
#ifdef WIN32
#ifdef _WIN32
if (m_ServiceStatus == 0) World::StopNow(SHUTDOWN_EXIT_CODE);
while (m_ServiceStatus == 2) Sleep(1000);
#endif