josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Windows-build (YES, IT COMPILES!) - partial revert of revision a9386a2655

Browse Source 
- Use minihack on ACE to avoid using config.h on Windows platforms
- Put include-locations for ACE in AFTER everything else (for later use)
An insane thanks to paradox for being patient with testing changes and swapouts

--HG--
branch : trunk
This commit is contained in:
click
2010-08-16 09:51:37 +02:00
parent ced7262646
commit b4bef54b7a
17 changed files with 93 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
externals/ace/config-macros.h
Vendored
+5 -1
View File
@@ -21,7 +21,11 @@
#ifndef ACE_CONFIG_MACROS_H
#define ACE_CONFIG_MACROS_H
#include "ace/config.h"
#ifdef _WIN32
#include "ace/config-win32.h"
#else
#include "ace/config.h"
#endif
#include "ace/Version.h"
#include "ace/Versioned_Namespace.h"
externals/ace/config.h
Vendored
-1
View File
@@ -1 +0,0 @@
#include "ace/config-win32.h"
src/genrevision/genrevision.cpp
+13 -42
View File
@@ -299,56 +299,26 @@ bool extractDataFromArchive(std::string filename, std::string path, bool url, Ra
std::string generateHeader(char const* rev_str, char const* date_str, char const* time_str, char const* hash_str)
{
std::ostringstream newData;
newData << "/*" << std::endl;
newData << " * This is an autogenerated header - direct modifications to this file is NOT recommended." << std::endl;
newData << " * Any changes will be overwritten on next revision change or rebuild." << std::endl;
newData << " */" << std::endl;
newData << std::endl;
newData << "#ifndef __REVISION_H__" << std::endl;
newData << "#define __REVISION_H__" << std::endl;
newData << std::endl;
newData << "#include \"Define.h\"" << std::endl;
newData << std::endl;
newData << "#define _PACKAGENAME \"TrinityCore\"" << std::endl;
newData << "#define _CODENAME \"LONG_COLD_WINTER\"" << std::endl;
newData << std::endl;
newData << "#if TRINITY_ENDIAN == TRINITY_BIGENDIAN" << std::endl;
newData << " #define _ENDIAN_STRING \"big-endian\"" << std::endl;
newData << "#else" << std::endl;
newData << " #define _ENDIAN_STRING \"little-endian\"" << std::endl;
newData << "#endif" << std::endl;
newData << std::endl;
newData << "#define _BUILD_DIRECTIVE \"" << build_directive << "\"" << std::endl;
newData << std::endl;
newData << "#define _REVISION \"" << rev_str << "\"" << std::endl;
newData << "#define _HASH \"" << hash_str << "\"" << std::endl;
newData << "#define _REVISION_DATE \"" << date_str << "\"" << std::endl;
newData << "#define _REVISION_TIME \"" << time_str << "\""<< std::endl;
newData << std::endl;
newData << "#if PLATFORM == PLATFORM_WINDOWS" << std::endl;
newData << " #ifdef _WIN64" << std::endl;
newData << " #define _FULLVERSION _PACKAGENAME \" Rev. " << rev_str << "/" << hash_str << " (" << build_directive << ") (Win64,\" _ENDIAN_STRING \")\"" << std::endl;
newData << " #else" << std::endl;
newData << " #define _FULLVERSION _PACKAGENAME \" Rev. " << rev_str << "/" << hash_str << " (" << build_directive << ") (Win32,\" _ENDIAN_STRING \")\"" << std::endl;
newData << " #endif" << std::endl;
newData << "#else" << std::endl;
newData << " #define _FULLVERSION _PACKAGENAME \" Rev. " << rev_str << "/" << hash_str << " (" << build_directive << ") (Unix,\" _ENDIAN_STRING \")\"" << std::endl;
newData << "#endif" << std::endl;
newData << std::endl;
newData << " #define _BUILD_DIRECTIVE \"" << build_directive << "\"" << std::endl;
newData << " #define _REVISION \"" << rev_str << "\"" << std::endl;
newData << " #define _HASH \"" << hash_str << "\"" << std::endl;
newData << " #define _REVISION_DATE \"" << date_str << "\"" << std::endl;
newData << " #define _REVISION_TIME \"" << time_str << "\""<< std::endl;
if (!strcmp(rev_str,"Archive") || !strcmp(rev_str,"*"))
{
newData << "#define FILEVER 0,0,0,0"<< std::endl;
newData << "#define PRODUCTVER 0,0,0,0"<< std::endl;
newData << " #define FILEVER 0,0,0,0"<< std::endl;
newData << " #define PRODUCTVER 0,0,0,0"<< std::endl;
}
else
{
newData << "#define FILEVER 0,0," << rev_str << ",0"<< std::endl;
newData << "#define PRODUCTVER 0,0," << rev_str << ",0"<< std::endl;
newData << " #define FILEVER 0,0," << rev_str << ",0"<< std::endl;
newData << " #define PRODUCTVER 0,0," << rev_str << ",0"<< std::endl;
}
newData << "#define STRFILEVER \"0, 0, " << rev_str << ", " << hash_str << "\""<< std::endl;
newData << "#define STRPRODUCTVER \"0, 0, " << rev_str << ", " << hash_str << "\""<< std::endl;
newData << std::endl;
newData << "#endif /* __REVISION_H__ */" << std::endl;
newData << " #define STRFILEVER \"0, 0, " << rev_str << ", " << hash_str << "\""<< std::endl;
newData << " #define STRPRODUCTVER \"0, 0, " << rev_str << ", " << hash_str << "\""<< std::endl;
newData << "#endif // __REVISION_H__" << std::endl;
return newData.str();
}
@@ -537,3 +507,4 @@ int main(int argc, char **argv)
return 0;
}
src/server/authserver/CMakeLists.txt
+3 -3
View File
@@ -31,9 +31,6 @@ set(authserver_SRCS
endif()
include_directories(
${ACE_INCLUDE_DIR}
${MYSQL_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src/server/shared
${CMAKE_SOURCE_DIR}/src/server/shared/Database
@@ -46,6 +43,9 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/server/authserver/Authentication
${CMAKE_SOURCE_DIR}/src/server/authserver/Realms
${CMAKE_SOURCE_DIR}/src/server/authserver/Server
${ACE_INCLUDE_DIR}
${MYSQL_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIR}
)
set(authserver_LINK_FLAGS "")
src/server/authserver/Main.cpp
+1 -2
View File
@@ -22,14 +22,13 @@
/// @{
/// \file
#include "revision.h"
#include "Common.h"
#include "Database/DatabaseEnv.h"
#include "Database/PreparedStatements.h"
#include "Configuration/Config.h"
#include "Log.h"
#include "SystemConfig.h"
#include "Util.h"
#include "SignalHandler.h"
#include "RealmList.h"
src/server/collision/CMakeLists.txt
+3 -3
View File
@@ -21,9 +21,6 @@ set(collision_STAT_SRCS
)
include_directories(
${ACE_INCLUDE_DIR}
${MYSQL_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIR}
${CMAKE_SOURCE_DIR}/externals/g3dlite
${CMAKE_SOURCE_DIR}/src/server/shared
${CMAKE_SOURCE_DIR}/src/server/shared/Debugging
@@ -34,6 +31,9 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/server/collision/Maps
${CMAKE_SOURCE_DIR}/src/server/collision/Models
${CMAKE_BINARY_DIR}
${ACE_INCLUDE_DIR}
${MYSQL_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIR}
)
add_library(collision STATIC ${collision_STAT_SRCS})
src/server/game/CMakeLists.txt
+3 -3
View File
@@ -96,9 +96,6 @@ if(MSVC)
endif()
include_directories(
${ACE_INCLUDE_DIR}
${MYSQL_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/externals/mersennetwister
${CMAKE_SOURCE_DIR}/externals/zlib
@@ -185,6 +182,9 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/server/game/Weather
${CMAKE_SOURCE_DIR}/src/server/game/World
${CMAKE_SOURCE_DIR}/src/server/scripts/PrecompiledHeaders
${ACE_INCLUDE_DIR}
${MYSQL_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIR}
)
add_library(game STATIC ${game_STAT_SRCS})
src/server/game/Chat/Commands/Level0.cpp
+2 -2
View File
@@ -18,8 +18,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "revision.h"
#include "Common.h"
#include "DatabaseEnv.h"
#include "World.h"
@@ -29,6 +27,8 @@
#include "ObjectAccessor.h"
#include "Language.h"
#include "AccountMgr.h"
#include "SystemConfig.h"
#include "revision.h"
#include "Util.h"
bool ChatHandler::HandleHelpCommand(const char* args)
src/server/game/Chat/Commands/Level3.cpp
+1
View File
@@ -44,6 +44,7 @@
#include "TargetedMovementGenerator.h"
#include "SkillDiscovery.h"
#include "SkillExtraItems.h"
#include "SystemConfig.h"
#include "Config.h"
#include "Util.h"
#include "ItemEnchantmentMgr.h"
src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
+1 -2
View File
@@ -18,11 +18,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "revision.h"
#include "Common.h"
#include "ObjectAccessor.h"
#include "ObjectMgr.h"
#include "SystemConfig.h"
#include "World.h"
#include "WorldPacket.h"
#include "WorldSession.h"
src/server/game/World/World.cpp
+1 -2
View File
@@ -22,11 +22,10 @@
\ingroup world
*/
#include "revision.h"
#include "Common.h"
#include "DatabaseEnv.h"
#include "Config.h"
#include "SystemConfig.h"
#include "Log.h"
#include "Opcodes.h"
#include "WorldSession.h"
src/server/scripts/CMakeLists.txt
+1 -1
View File
@@ -51,7 +51,6 @@ endif()
message("-- Added Script Library to SCRIPTS lib")
include_directories(
${ACE_INCLUDE_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/externals/mersennetwister
${CMAKE_SOURCE_DIR}/externals/zlib
@@ -136,6 +135,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/server/game/Weather
${CMAKE_SOURCE_DIR}/src/server/game/World
${CMAKE_SOURCE_DIR}/src/server/scripts/PrecompiledHeaders
${ACE_INCLUDE_DIR}
${MYSQL_INCLUDE_DIR}
)
src/server/shared/CMakeLists.txt
+3 -3
View File
@@ -39,9 +39,6 @@ set(shared_STAT_SRCS
)
include_directories(
${ACE_INCLUDE_DIR}
${MYSQL_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/externals/mersennetwister
${CMAKE_SOURCE_DIR}/externals/SFMT
@@ -60,6 +57,9 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/server/shared/Threading
${CMAKE_SOURCE_DIR}/src/server/shared/Utilities
${CMAKE_SOURCE_DIR}/src/server/game/Entities/Object
${ACE_INCLUDE_DIR}
${MYSQL_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIR}
)
src/server/shared/Debugging/WheatyExceptionReport.cpp
+3 -2
View File
@@ -13,9 +13,10 @@
#include <stdio.h>
#include <tchar.h>
#define _NO_CVCONST_H
#include "revision.h"
#include <dbghelp.h>
#include "WheatyExceptionReport.h"
#include "SystemConfig.h"
#include "revision.h"
#define CrashFolder _T("Crashes")
#pragma comment(linker, "/DEFAULTLIB:dbghelp.lib")
@@ -1037,4 +1038,4 @@ int __cdecl WheatyExceptionReport::_tprintf(const TCHAR * format, ...)
return retValue;
}
#endif // _WIN32
#endif // _WIN32
src/server/shared/SystemConfig.h
+49
View File
@@ -0,0 +1,49 @@
/*
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*
* Copyright (C) 2008-2010 Trinity <http://www.trinitycore.org/>
*
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
// THIS FILE IS DEPRECATED
#ifndef TRINITY_SYSTEMCONFIG_H
#define TRINITY_SYSTEMCONFIG_H
#include "Define.h"
#include "revision.h"
#define _PACKAGENAME "TrinityCore "
#define _CODENAME "LONG_COLD_WINTER"
#if TRINITY_ENDIAN == TRINITY_BIGENDIAN
# define _ENDIAN_STRING "big-endian"
#else
# define _ENDIAN_STRING "little-endian"
#endif
#if PLATFORM == PLATFORM_WINDOWS
# ifdef _WIN64
# define _FULLVERSION _PACKAGENAME "Rev: " _REVISION " " _BUILD_DIRECTIVE " Hash: " _HASH " (Win64," _ENDIAN_STRING ")"
# else
# define _FULLVERSION _PACKAGENAME "Rev: " _REVISION " " _BUILD_DIRECTIVE " Hash: " _HASH " (Win32," _ENDIAN_STRING ")"
# endif
#else
# define _FULLVERSION _PACKAGENAME "Rev: " _REVISION " " _BUILD_DIRECTIVE " Hash: " _HASH " (Unix," _ENDIAN_STRING ")"
#endif
#endif
src/server/worldserver/CMakeLists.txt
+3 -3
View File
@@ -31,9 +31,6 @@ if( WIN32 )
endif()
include_directories(
${ACE_INCLUDE_DIR}
${MYSQL_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/externals/gsoap
${CMAKE_SOURCE_DIR}/externals/sockets/include
@@ -126,6 +123,9 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/server/worldserver/RemoteAccess
${CMAKE_SOURCE_DIR}/src/server/worldserver/TCSoap
${CMAKE_SOURCE_DIR}/src/server/worldserver/WorldThread
${ACE_INCLUDE_DIR}
${MYSQL_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIR}
)
set(worldserver_LINK_FLAGS "")
src/server/worldserver/Master.cpp
+1 -2
View File
@@ -24,9 +24,8 @@
#include <ace/Sig_Handler.h>
#include "revision.h"
#include "Common.h"
#include "SystemConfig.h"
#include "SignalHandler.h"
#include "World.h"
#include "WorldRunnable.h"