Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-15 12:04:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix boost locale linkage

Browse Source
This commit is contained in:
Eduardo Bart
2013-01-09 14:57:18 -02:00
parent a8c9adb052
commit aeb31f0669
7 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/const.h
View File

@@ -20,8 +20,8 @@
* THE SOFTWARE.
*/
#ifndef OTCLIENT_CONST_H
#define OTCLIENT_CONST_H
#ifndef CLIENT_CONST_H
#define CLIENT_CONST_H
namespace Otc
{

4
src/client/declarations.h
View File

@@ -20,8 +20,8 @@
* THE SOFTWARE.
*/
#ifndef OTCLIENT_DECLARATIONS_H
#define OTCLIENT_DECLARATIONS_H
#ifndef CLIENT_DECLARATIONS_H
#define CLIENT_DECLARATIONS_H
#include "global.h"
#include <framework/net/declarations.h>

1
src/client/game.cpp
View File

@@ -38,7 +38,6 @@ Game g_game;
Game::Game()
{
resetGameStates();
m_protocolVersion = 0;
m_clientVersion = 0;
m_online = false;

4
src/client/global.h
View File

@@ -20,8 +20,8 @@
* THE SOFTWARE.
*/
#ifndef OTCLIENT_GLOBAL_H
#define OTCLIENT_GLOBAL_H
#ifndef CLIENT_GLOBAL_H
#define CLIENT_GLOBAL_H
#include <framework/global.h>

7
src/framework/CMakeLists.txt
View File

@@ -169,11 +169,14 @@ message(STATUS "Build revision: ${BUILD_REVISION}")
add_definitions(-D"BUILD_REVISION=\\\"${BUILD_REVISION}\\\"")
# find boost
set(REQUIRED_BOOST_COMPONENTS system filesystem regex locale)
set(REQUIRED_BOOST_COMPONENTS locale system filesystem regex thread)
if(WIN32)
set(Boost_THREADAPI win32)
set(framework_DEFINITIONS ${framework_DEFINITIONS} -DBOOST_THREAD_USE_LIB) # fix boost thread linkage
set(REQUIRED_BOOST_COMPONENTS ${REQUIRED_BOOST_COMPONENTS} thread chrono) # mingw32 does not have std::thread
set(REQUIRED_BOOST_COMPONENTS ${REQUIRED_BOOST_COMPONENTS} chrono) # mingw32 does not have std::thread
else()
find_package(ICU)
set(Boost_LIBRARIES ${Boost_LIBRARIES} ${ICU_LIBRARIES})
endif()
set(Boost_USE_MULTITHREADED ON)
set(Boost_USE_STATIC_LIBS ${USE_STATIC_LIBS})