• R/O
  • SSH
  • HTTPS

qrobosdk: コミット


コミットメタ情報

リビジョン1765 (tree)
日時2010-04-11 15:29:04
作者satofumi

ログメッセージ

fixed fullscreen bug.

変更サマリ

差分

--- trunk/libs/lua/luabindGui.cpp (revision 1764)
+++ trunk/libs/lua/luabindGui.cpp (revision 1765)
@@ -39,6 +39,7 @@
3939 class_<Screen>("Screen")
4040 .def(constructor<>())
4141 .def("rect", &Screen::rect)
42+ .def("setFullscreen", &Screen::setFullscreen)
4243 .def("isFullscreen", &Screen::isFullscreen)
4344 .def("toggleScreen", &Screen::toggleScreen)
4445 .def("showCursor", &Screen::showCursor)
--- trunk/libs/lua/Makefile (revision 1764)
+++ trunk/libs/lua/Makefile (revision 1765)
@@ -5,7 +5,7 @@
55 CC = $(CXX)
66 CXXFLAGS = -g -O0 -Wall -W -Werror $(INCLUDES) `sdl-config --cflags`
77 #CXXFLAGS = -g -O0 -Wall -W $(INCLUDES) `sdl-config --cflags`
8-INCLUDES = -I/usr/include/lua5.1 -I.. -I../system -I../gui -I../geometry -I../audio -I../common -I../running -I../range_finder -I../coordinate -I../monitoring -I../running/beego_drive -I/usr/include/lua5.1 -I../timestamp -I../math
8+INCLUDES = -I/usr/include/lua5.1 -I.. -I../system -I../system/sdl -I../gui -I../geometry -I../audio -I../common -I../running -I../range_finder -I../coordinate -I../monitoring -I../running/beego_drive -I/usr/include/lua5.1 -I../timestamp -I../math
99
1010 # Target
1111 LUA_LIB = lua.a
--- trunk/libs/gui/Screen.cpp (revision 1764)
+++ trunk/libs/gui/Screen.cpp (revision 1765)
@@ -137,6 +137,7 @@
137137 const_cast<Uint8*>(icon_mask_));
138138 }
139139
140+ flags |= next_flags_;
140141 if (flags & SDL_OPENGL) {
141142 #if ! defined(NO_OPENGL)
142143 initializeOpenGl();
--- trunk/Makefile (revision 1764)
+++ trunk/Makefile (revision 1765)
@@ -2,7 +2,7 @@
22 # Satofumi KAMIMURA
33 # $Id$
44
5-all : test samples
5+all : test samples libs
66 cd libs/packages/urg/vc8/c && $(MAKE)
77 cd libs/packages/urg/vc8/cpp && $(MAKE)
88 cd libs/packages/urg_c/vc8 && $(MAKE)
@@ -20,6 +20,9 @@
2020 -cd tsukuba_2009/ && $(MAKE) clean
2121 -cd tsukuba_2010/ && $(MAKE) clean
2222
23+libs :
24+ cd libs/ && $(MAKE)
25+
2326 samples :
2427 cd libs/simulator/ && $(MAKE)
2528 cd libs/ && $(MAKE) samples
旧リポジトリブラウザで表示