makefile macht subdir mit

master
seba 16 years ago
parent 744763dd4d
commit e4d98e5434

@ -2,8 +2,8 @@ CC = g++
AR = ar AR = ar
OBJECTS = punkt3d.o punkt2d.o emath.o emath_opengl.o glcolor.o gldrawhelper.o glfontengine.o glrect.o gltexture.o matrix.o quaternion.o rotationsmatrix.o glsdlscreen.o sdlfuncs.o fpsmanager.o OBJECTS = punkt3d.o punkt2d.o emath.o emath_opengl.o glcolor.o gldrawhelper.o glfontengine.o glrect.o gltexture.o matrix.o quaternion.o rotationsmatrix.o glsdlscreen.o sdlfuncs.o fpsmanager.o
OBJOPT = -Wall -c `sdl-config --cflags` OBJOPT = -Wall -c `sdl-config --cflags`
SUBDIRS = glgui glmenu SUBDIRS = glgui glmenu models
SUBDIROBJECTS = glgui/*.o glmenu/*.o SUBDIROBJECTS = glgui/*.o glmenu/*.o models/*.o
VERSION = 0.0.1 VERSION = 0.0.1
LIBNAME = libsegl LIBNAME = libsegl

@ -85,10 +85,11 @@ bool GLSDLScreen::isOK() {
bool GLSDLScreen::apply() { bool GLSDLScreen::apply() {
if(!SDL_WasInit(SDL_INIT_VIDEO)) { if(!SDL_WasInit(SDL_INIT_VIDEO)) {
if(SDL_Init(SDL_INIT_VIDEO)==-1) { if(SDL_Init(SDL_INIT_VIDEO)==-1) {
std::cerr << "Konnte SDL_VIDEO nicht initialisieren" << std::endl;
return false; return false;
} }
} }
screen = SDL_SetVideoMode(width, height, bpp, getFlags()); screen = SDL_SetVideoMode(width, height, bpp, getFlags());
if(!screen) { if(!screen) {
@ -127,7 +128,7 @@ bool GLSDLScreen::apply() {
GLTexture::reloadAll(); GLTexture::reloadAll();
glMatrixMode(GL_TEXTURE); glMatrixMode(GL_TEXTURE);
glLoadIdentity(); glLoadIdentity();
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
} }

Loading…
Cancel
Save