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

Try to fix travis build

This commit is contained in:
Eduardo Bart 2013-01-16 12:42:06 -02:00
parent 4305b9e8f4
commit d2712fa218
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

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

1
src/client/luafunctions.cpp
View File

@ -228,6 +228,7 @@ void Client::registerLuaFunctions()
g_lua.bindSingletonFunction("g_game", "getClientVersion", &Game::getClientVersion, &g_game); g_lua.bindSingletonFunction("g_game", "getClientVersion", &Game::getClientVersion, &g_game);
g_lua.bindSingletonFunction("g_game", "setClientVersion", &Game::setClientVersion, &g_game); g_lua.bindSingletonFunction("g_game", "setClientVersion", &Game::setClientVersion, &g_game);
g_lua.bindSingletonFunction("g_game", "setUpdaterSignature", &Game::setUpdaterSignature, &g_game); g_lua.bindSingletonFunction("g_game", "setUpdaterSignature", &Game::setUpdaterSignature, &g_game);
g_lua.bindSingletonFunction("g_game", "getUpdaterSignature", &Game::getUpdaterSignature, &g_game);
g_lua.bindSingletonFunction("g_game", "setCustomOs", &Game::setCustomOs, &g_game); g_lua.bindSingletonFunction("g_game", "setCustomOs", &Game::setCustomOs, &g_game);
g_lua.bindSingletonFunction("g_game", "getOs", &Game::getOs, &g_game); g_lua.bindSingletonFunction("g_game", "getOs", &Game::getOs, &g_game);
g_lua.bindSingletonFunction("g_game", "getCharacterName", &Game::getCharacterName, &g_game); g_lua.bindSingletonFunction("g_game", "getCharacterName", &Game::getCharacterName, &g_game);

2
src/framework/CMakeLists.txt
View File

@ -180,7 +180,7 @@ else()
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})
find_package(Boost 1.50.0 COMPONENTS ${REQUIRED_BOOST_COMPONENTS} REQUIRED) find_package(Boost 1.48.0 COMPONENTS ${REQUIRED_BOOST_COMPONENTS} REQUIRED)
#find lua #find lua
if(LUAJIT) if(LUAJIT)

1
src/framework/core/binarytree.h
View File

@ -26,7 +26,6 @@
#include "declarations.h" #include "declarations.h"
#include <framework/util/databuffer.h> #include <framework/util/databuffer.h>
#include <client/position.h> #include <client/position.h>
#include <boost/concept_check.hpp>
enum { enum {
BINARYTREE_ESCAPE_CHAR = 0xFD, BINARYTREE_ESCAPE_CHAR = 0xFD,

1
src/framework/core/graphicalapplication.cpp
View File

@ -206,6 +206,7 @@ void GraphicalApplication::poll()
// poll window input events // poll window input events
g_window.poll(); g_window.poll();
g_particles.update(); g_particles.update();
g_textures.poll();
Application::poll(); Application::poll();
} }