gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix boost locale linkage

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -2,7 +2,9 @@ language: cpp
compiler: compiler:
- gcc - gcc
before_script: before_script:
- sudo apt-get install libboost-all-dev libphysfs-dev libssl-dev liblua5.1-dev libglew1.6-dev libvorbis-dev libopenal-dev libz-dev - sudo apt-add-repository ppa:28msec/boost
- sudo apt-get update
- sudo apt-get install libboost1.50 libphysfs-dev libssl-dev liblua5.1-dev libglew1.6-dev libvorbis-dev libopenal-dev libz-dev
script: | script: |
cmake . -DCMAKE_BUILD_TYPE=Release cmake . -DCMAKE_BUILD_TYPE=Release
make make

5
modules/gamelib/const.lua
View File

@ -148,10 +148,7 @@ CIPSOFT_RSA = "1321277432058722840622950990822933849527763264961655079678763618"
"88792221429527047321331896351555606801473202394175817" "88792221429527047321331896351555606801473202394175817"
-- set to the latest Tibia.pic signature to make otclient compatible with official tibia -- set to the latest Tibia.pic signature to make otclient compatible with official tibia
PIC_SIGNATURE = 1337606793 PIC_SIGNATURE = 0x50a6469d
if g_game.getClientVersion() < 970 then
PIC_SIGNATURE = 1353074333
end
OsTypes = { OsTypes = {
Linux = 1, Linux = 1,

4
src/client/const.h
View File

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

4
src/client/declarations.h
View File

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

1
src/client/game.cpp
View File

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

4
src/client/global.h
View File

@ -20,8 +20,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef OTCLIENT_GLOBAL_H #ifndef CLIENT_GLOBAL_H
#define OTCLIENT_GLOBAL_H #define CLIENT_GLOBAL_H
#include <framework/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}\\\"") add_definitions(-D"BUILD_REVISION=\\\"${BUILD_REVISION}\\\"")
# find boost # find boost
set(REQUIRED_BOOST_COMPONENTS system filesystem regex locale) set(REQUIRED_BOOST_COMPONENTS locale system filesystem regex thread)
if(WIN32) if(WIN32)
set(Boost_THREADAPI win32) set(Boost_THREADAPI win32)
set(framework_DEFINITIONS ${framework_DEFINITIONS} -DBOOST_THREAD_USE_LIB) # fix boost thread linkage 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() endif()
set(Boost_USE_MULTITHREADED ON) set(Boost_USE_MULTITHREADED ON)
set(Boost_USE_STATIC_LIBS ${USE_STATIC_LIBS}) set(Boost_USE_STATIC_LIBS ${USE_STATIC_LIBS})