From d2712fa218d1dddc21189b1db8eaf74c9ed4f744 Mon Sep 17 00:00:00 2001 From: Eduardo Bart Date: Wed, 16 Jan 2013 12:42:06 -0200 Subject: [PATCH] Try to fix travis build --- .travis.yml | 6 +++--- src/client/luafunctions.cpp | 1 + src/framework/CMakeLists.txt | 2 +- src/framework/core/binarytree.h | 1 - src/framework/core/graphicalapplication.cpp | 1 + 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index dfa54a95..12e3ba31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/src/client/luafunctions.cpp b/src/client/luafunctions.cpp index 419484e3..5b4f2662 100644 --- a/src/client/luafunctions.cpp +++ b/src/client/luafunctions.cpp @@ -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); diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt index a87f51eb..59f106d2 100644 --- a/src/framework/CMakeLists.txt +++ b/src/framework/CMakeLists.txt @@ -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) diff --git a/src/framework/core/binarytree.h b/src/framework/core/binarytree.h index 8d1c73ab..ab360fa5 100644 --- a/src/framework/core/binarytree.h +++ b/src/framework/core/binarytree.h @@ -26,7 +26,6 @@ #include "declarations.h" #include #include -#include enum { BINARYTREE_ESCAPE_CHAR = 0xFD, diff --git a/src/framework/core/graphicalapplication.cpp b/src/framework/core/graphicalapplication.cpp index d4f217f2..53557fad 100644 --- a/src/framework/core/graphicalapplication.cpp +++ b/src/framework/core/graphicalapplication.cpp @@ -206,6 +206,7 @@ void GraphicalApplication::poll() // poll window input events g_window.poll(); g_particles.update(); + g_textures.poll(); Application::poll(); }