Log of git pull
Fri Dec 9 19:40:18 2011
From git://glestae.git.sourceforge.net/gitroot/glestae/glestae
e39d329..d4577ad 0.4.x -> origin/0.4.x
5af19c6..c4eff18 dedicated_server -> origin/dedicated_server
739fd23..7e8c2c0 master -> origin/master
Updating 739fd23..7e8c2c0
Fast-forward
source/game/ai/ai_rule.cpp | 2 +-
source/game/ai/ai_rule.h | 7 +-
source/game/facilities/debug_stats.h | 3 +
source/game/game/game.cpp | 13 +-
source/game/game/game_camera.cpp | 78 ++++---
source/game/game/game_camera.h | 22 +--
source/game/graphics/renderer.cpp | 243 +++++++++++++-------
source/game/graphics/renderer.h | 9 +-
source/game/gui/display.cpp | 8 +-
source/game/gui/keymap_widget.cpp | 2 +-
source/game/gui/selection.cpp | 7 +
source/game/menu/menu_state_join_game.cpp | 12 +-
source/game/menu/menu_state_load_game.cpp | 4 +-
source/game/menu/menu_state_new_game.cpp | 2 +-
source/game/menu/menu_state_scenario.cpp | 2 +-
source/game/widgets/framed_widgets.h | 1 +
source/game/widgets/widget_config.cpp | 28 ++-
source/game/widgets/widget_config.h | 3 +-
source/game/world/sim_interface.cpp | 1 +
source/game/world/type_factories.h | 3 +-
.../sources/graphics/gl/model_renderer_gl.cpp | 1 +
21 files changed, 284 insertions(+), 167 deletions(-)
Fri Dec 9 19:41:06 2011
----------------
Log of git log -1 --pretty=tformat:You're now at this commit: %H
Fri Dec 9 19:41:06 2011
You're now at this commit: 7e8c2c0f28723c2badbb37e7955e6b10af286510
Fri Dec 9 19:41:06 2011
----------------
Log of cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGAE_DATA_DIR=/home/john/glestae_git/data/game -DGAE_USE_PHYSFS=ON ..
Fri Dec 9 19:41:06 2011
-- Could NOT find Doxygen (missing: DOXYGEN_EXECUTABLE)
-- disabled doc
-- WARNING: Can't detect whether CPPCHECK wants new or old-style arguments!
-- Could NOT find cppcheck (missing: CPPCHECK_POSSIBLEERROR_ARG CPPCHECK_UNUSEDFUNC_ARG CPPCHECK_STYLE_ARG CPPCHECK_INCLUDEPATH_ARG CPPCHECK_QUIET_ARG)
-- disabled tests with cppcheck
-- Configuring done
-- Generating done
-- Build files have been written to: /home/john/glestae_git/build
Fri Dec 9 19:41:12 2011
----------------
Log of make
Fri Dec 9 19:41:12 2011
Scanning dependencies of target shared_lib
[ 1%] Building CXX object source/shared_lib/CMakeFiles/shared_lib.dir/sources/graphics/gl/model_renderer_gl.cpp.o
In file included from /home/john/glestae_git/source/shared_lib/include/platform/sdl/gl_wrap.h:23:0,
from /home/john/glestae_git/source/shared_lib/include/graphics/model.h:19,
from /home/john/glestae_git/source/shared_lib/include/graphics/model_renderer.h:16,
from /home/john/glestae_git/source/shared_lib/include/graphics/gl/model_renderer_gl.h:16,
from /home/john/glestae_git/source/shared_lib/sources/graphics/gl/model_renderer_gl.cpp:14:
/home/john/glestae_git/source/shared_lib/include/graphics/font.h:102:1: warning: null character(s) ignored
In file included from /home/john/glestae_git/source/shared_lib/include/platform/sdl/gl_wrap.h:23:0,
from /home/john/glestae_git/source/shared_lib/include/graphics/model.h:19,
from /home/john/glestae_git/source/shared_lib/include/graphics/model_renderer.h:16,
from /home/john/glestae_git/source/shared_lib/include/graphics/gl/model_renderer_gl.h:16,
from /home/john/glestae_git/source/shared_lib/sources/graphics/gl/model_renderer_gl.cpp:14:
/home/john/glestae_git/source/shared_lib/include/graphics/font.h:102:1736: error: stray ‘\320’ in program
/home/john/glestae_git/source/shared_lib/include/graphics/font.h:102:1736: error: stray ‘\23’ in program
/home/john/glestae_git/source/shared_lib/include/graphics/font.h:102:1736: error: stray ‘\352’ in program
/home/john/glestae_git/source/shared_lib/include/graphics/font.h:102:1736: error: stray ‘\177’ in program
/home/john/glestae_git/source/shared_lib/include/graphics/font.h:102:1736: error: stray ‘\373’ in program
/home/john/glestae_git/source/shared_lib/include/graphics/font.h:102:1736: error: stray ‘\310’ in program
/home/john/glestae_git/source/shared_lib/include/graphics/font.h:102:1736: error: stray ‘\33’ in program
/home/john/glestae_git/source/shared_lib/include/graphics/font.h:102:1736: error: stray ‘\220’ in program
/home/john/glestae_git/source/shared_lib/include/graphics/font.h:203:1: warning: null character(s) ignored
In file included from /home/john/glestae_git/source/shared_lib/include/platform/sdl/gl_wrap.h:23:0,
from /home/john/glestae_git/source/shared_lib/include/graphics/model.h:19,
from /home/john/glestae_git/source/shared_lib/include/graphics/model_renderer.h:16,
from /home/john/glestae_git/source/shared_lib/include/graphics/gl/model_renderer_gl.h:16,
from /home/john/glestae_git/source/shared_lib/sources/graphics/gl/model_renderer_gl.cpp:14:
/home/john/glestae_git/source/shared_lib/include/graphics/font.h:203:1736: error: stray ‘\301’ in program
/home/john/glestae_git/source/shared_lib/include/graphics/font.h:203:1738: warning: missing terminating " character
/home/john/glestae_git/source/shared_lib/include/graphics/font.h:203:1736: error: missing terminating " character
/home/john/glestae_git/source/shared_lib/include/graphics/font.h:304:1: warning: null character(s) ignored
In file included from /home/john/glestae_git/source/shared_lib/include/platform/sdl/gl_wrap.h:23:0,
from /home/john/glestae_git/source/shared_lib/include/graphics/model.h:19,
from /home/john/glestae_git/source/shared_lib/include/graphics/model_renderer.h:16,
from /home/john/glestae_git/source/shared_lib/include/graphics/gl/model_renderer_gl.h:16,
from /home/john/glestae_git/source/shared_lib/sources/graphics/gl/model_renderer_gl.cpp:14:
/home/john/glestae_git/source/shared_lib/include/graphics/font.h:102:1736: error: expected unqualified-id before ‘|’ token
make[2]: *** [source/shared_lib/CMakeFiles/shared_lib.dir/sources/graphics/gl/model_renderer_gl.cpp.o] Error 1
make[1]: *** [source/shared_lib/CMakeFiles/shared_lib.dir/all] Error 2
make: *** [all] Error 2
make died with exit status 2
Fri Dec 9 19:41:17 2011
----------------
Linux Mint 11 Katya, 32 bit
