• R/O
  • SSH
  • HTTPS

qrobosdk: コミット


コミットメタ情報

リビジョン1966 (tree)
日時2011-08-16 17:57:00
作者satofumi

ログメッセージ

fixed for mingw.

変更サマリ

差分

--- trunk/libs/lua/samples/Makefile (revision 1965)
+++ trunk/libs/lua/samples/Makefile (revision 1966)
@@ -7,8 +7,8 @@
77 CXXFLAGS = -g -O0 -Wall -W $(INCLUDES)
88 INCLUDES = -I/usr/include/lua5.1 -I.. -I../../system
99 LDFLAGS =
10-#LDLIBS = -llua -ldl -lluabind -lSDL
11-LDLIBS = -llua5.1 -ldl -lluabind -lSDL
10+#LDLIBS = -llua5.1 -ldl -lluabind -lSDL
11+LDLIBS = -llua -lluabind -lSDL
1212
1313
1414 # Target
--- trunk/libs/gui/Screen.cpp (revision 1965)
+++ trunk/libs/gui/Screen.cpp (revision 1966)
@@ -11,6 +11,8 @@
1111 #include "SdlVideoInit.h"
1212 #include "Color.h"
1313 #if ! defined(NO_OPENGL)
14+#define NO_SDL_GLEXT
15+#include <GL/glew.h>
1416 #include <SDL_opengl.h>
1517 #endif
1618 #include <string>
--- trunk/libs/gui/SDL_GL_Texture.cpp (revision 1965)
+++ trunk/libs/gui/SDL_GL_Texture.cpp (revision 1966)
@@ -13,6 +13,8 @@
1313 #include "SdlUtils.h"
1414 #include "Rotate.h"
1515 #include "log_printf.h"
16+#define NO_SDL_GLEXT
17+#include <GL/glew.h>
1618 #include <SDL_opengl.h>
1719 #include <boost/bind.hpp>
1820 #include <algorithm>
--- trunk/libs/gui/CanvasSurface.cpp (revision 1965)
+++ trunk/libs/gui/CanvasSurface.cpp (revision 1966)
@@ -9,11 +9,11 @@
99 \todo setAlpha() を実装する
1010 */
1111
12-#define GL_GLEXT_PROTOTYPES
1312 #include "CanvasSurface.h"
1413 #include "Font.h"
15-//#include "Screen.h"
1614 #include "TextSurface.h"
15+#define NO_SDL_GLEXT
16+#include <GL/glew.h>
1717 #include <SDL_opengl.h>
1818 #include <vector>
1919 #include <cassert>
--- trunk/libs/gui/ColorSurface.cpp (revision 1965)
+++ trunk/libs/gui/ColorSurface.cpp (revision 1966)
@@ -14,6 +14,8 @@
1414 #if defined(WINDOWS_OS)
1515 #include <windows.h>
1616 #endif
17+#define NO_SDL_GLEXT
18+#include <GL/glew.h>
1719 #include <SDL_opengl.h>
1820 #include <SDL.h>
1921
--- trunk/libs/gui/samples/slideSelect.cpp (revision 1965)
+++ trunk/libs/gui/samples/slideSelect.cpp (revision 1966)
@@ -6,7 +6,9 @@
66 $Id$
77 */
88
9+#include <SDL.h>
910
11+
1012 int main(int argc, char *argv[])
1113 {
1214 (void)argc;
--- trunk/libs/gui/samples/Makefile (revision 1965)
+++ trunk/libs/gui/samples/Makefile (revision 1966)
@@ -6,8 +6,8 @@
66 CXXFLAGS = -g -O0 -Wall -W -Werror $(INCLUDES) `sdl-config --cflags`
77 INCLUDES = -I.. -I../../geometry -I../../system -I../../common
88 LDFLAGS = -L/usr/X11/lib
9-LDLIBS = `sdl-config --libs` -lSDL_ttf -lGL -lboost_signals-mt -lSDL_image
10-#LDLIBS = `sdl-config --libs` -lSDL_ttf -lopengl32 -lboost_signals-mgw34-mt
9+#LDLIBS = `sdl-config --libs` -lSDL_ttf -lSDL_image -lGL -lboost_signals-mt
10+LDLIBS = `sdl-config --libs` -lSDL_ttf -lSDL_image -lglew32 -lopengl32 /mingw/lib/libboost_signals-mgw45-mt.lib
1111
1212
1313 # Target
@@ -29,9 +29,9 @@
2929 buttonSample \
3030 menuSample \
3131 drawColorSurface \
32- slideSelect \
33- changeSelect \
3432 horizontalMenu \
33+# changeSelect \
34+# slideSelect \
3535
3636 all : $(TARGET)
3737
--- trunk/libs/audio/sdl_mixer/samples/BackMusicSample.cpp (revision 1965)
+++ trunk/libs/audio/sdl_mixer/samples/BackMusicSample.cpp (revision 1966)
@@ -8,6 +8,7 @@
88 */
99
1010 #include "BackMusic.h"
11+#include <SDL.h>
1112
1213
1314 int main(int argc, char *argv[])
--- trunk/libs/audio/sdl_mixer/samples/SoundEffectSample.cpp (revision 1965)
+++ trunk/libs/audio/sdl_mixer/samples/SoundEffectSample.cpp (revision 1966)
@@ -12,6 +12,7 @@
1212 #include "delay.h"
1313 #include <iostream>
1414 #include <cstdlib>
15+#include <SDL.h>
1516
1617 using namespace qrk;
1718 using namespace std;
旧リポジトリブラウザで表示