* 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

View File

@@ -45,7 +45,7 @@
# define _TRINITY_REALM_CONFIG "authserver.conf"
#endif //_TRINITY_REALM_CONFIG
#ifdef WIN32
#ifdef _WIN32
#include "ServiceWin32.h"
char serviceName[] = "TrinityRealm";
char serviceLongName[] = "Trinity realm service";
@@ -92,7 +92,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"
@@ -122,7 +122,7 @@ extern int main(int argc, char **argv)
cfg_file = argv[c];
}
#ifdef WIN32
#ifdef _WIN32
////////////
//Services//
////////////
@@ -243,7 +243,7 @@ extern int main(int argc, char **argv)
#endif /* _WIN32 */();
///- Handle affinity for multiple processors and process priority on Windows
#ifdef WIN32
#ifdef _WIN32
{
HANDLE hProcess = GetCurrentProcess();
@@ -315,7 +315,7 @@ extern int main(int argc, char **argv)
sLog.outDetail("Ping MySQL to keep connection alive");
LoginDatabase.Query("SELECT 1 FROM realmlist LIMIT 1");
}
#ifdef WIN32
#ifdef _WIN32
if (m_ServiceStatus == 0) stopEvent = true;
while (m_ServiceStatus == 2) Sleep(1000);
#endif