Try to fix travis build
This commit is contained in:
parent
4305b9e8f4
commit
d2712fa218
|
@ -2,9 +2,9 @@ language: cpp
|
|||
compiler:
|
||||
- gcc
|
||||
before_script:
|
||||
- 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
|
||||
- sudo apt-add-repository ppa:28msec/boost -y
|
||||
- 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 -y
|
||||
script: |
|
||||
cmake . -DCMAKE_BUILD_TYPE=Release
|
||||
make
|
||||
|
|
|
@ -228,6 +228,7 @@ void Client::registerLuaFunctions()
|
|||
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", "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", "getOs", &Game::getOs, &g_game);
|
||||
g_lua.bindSingletonFunction("g_game", "getCharacterName", &Game::getCharacterName, &g_game);
|
||||
|
|
|
@ -180,7 +180,7 @@ else()
|
|||
endif()
|
||||
set(Boost_USE_MULTITHREADED ON)
|
||||
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
|
||||
if(LUAJIT)
|
||||
|
|
|
@ -26,7 +26,6 @@
|
|||
#include "declarations.h"
|
||||
#include <framework/util/databuffer.h>
|
||||
#include <client/position.h>
|
||||
#include <boost/concept_check.hpp>
|
||||
|
||||
enum {
|
||||
BINARYTREE_ESCAPE_CHAR = 0xFD,
|
||||
|
|
|
@ -206,6 +206,7 @@ void GraphicalApplication::poll()
|
|||
// poll window input events
|
||||
g_window.poll();
|
||||
g_particles.update();
|
||||
g_textures.poll();
|
||||
|
||||
Application::poll();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue