From e4d98e5434f54ff528ee6f81c6b036449b836bd9 Mon Sep 17 00:00:00 2001 From: seba Date: Thu, 10 Apr 2008 01:04:14 +0200 Subject: [PATCH] makefile macht subdir mit --- Makefile | 4 ++-- glsdlscreen.cpp | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 22434ac..c794191 100755 --- a/Makefile +++ b/Makefile @@ -2,8 +2,8 @@ CC = g++ 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 OBJOPT = -Wall -c `sdl-config --cflags` -SUBDIRS = glgui glmenu -SUBDIROBJECTS = glgui/*.o glmenu/*.o +SUBDIRS = glgui glmenu models +SUBDIROBJECTS = glgui/*.o glmenu/*.o models/*.o VERSION = 0.0.1 LIBNAME = libsegl diff --git a/glsdlscreen.cpp b/glsdlscreen.cpp index 7568957..3a06d75 100644 --- a/glsdlscreen.cpp +++ b/glsdlscreen.cpp @@ -85,10 +85,11 @@ bool GLSDLScreen::isOK() { bool GLSDLScreen::apply() { if(!SDL_WasInit(SDL_INIT_VIDEO)) { if(SDL_Init(SDL_INIT_VIDEO)==-1) { + std::cerr << "Konnte SDL_VIDEO nicht initialisieren" << std::endl; return false; } } - + screen = SDL_SetVideoMode(width, height, bpp, getFlags()); if(!screen) { @@ -127,7 +128,7 @@ bool GLSDLScreen::apply() { GLTexture::reloadAll(); glMatrixMode(GL_TEXTURE); glLoadIdentity(); - + glMatrixMode(GL_MODELVIEW); }