Browse Source

makefile macht subdir mit

seba 13 years ago
parent
commit
e4d98e5434
2 changed files with 5 additions and 4 deletions
  1. 2
    2
      Makefile
  2. 3
    2
      glsdlscreen.cpp

+ 2
- 2
Makefile View File

@@ -2,8 +2,8 @@ CC = g++
2 2
 AR = ar
3 3
 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
4 4
 OBJOPT = -Wall -c `sdl-config --cflags`
5
-SUBDIRS = glgui glmenu
6
-SUBDIROBJECTS = glgui/*.o glmenu/*.o
5
+SUBDIRS = glgui glmenu models
6
+SUBDIROBJECTS = glgui/*.o glmenu/*.o models/*.o
7 7
 VERSION = 0.0.1
8 8
 LIBNAME = libsegl
9 9
 

+ 3
- 2
glsdlscreen.cpp View File

@@ -85,10 +85,11 @@ bool GLSDLScreen::isOK() {
85 85
 bool GLSDLScreen::apply() {
86 86
 	if(!SDL_WasInit(SDL_INIT_VIDEO)) {
87 87
 		if(SDL_Init(SDL_INIT_VIDEO)==-1) {
88
+			std::cerr << "Konnte SDL_VIDEO nicht initialisieren" << std::endl;
88 89
 			return false;
89 90
 		}
90 91
 	}
91
-
92
+	
92 93
 	screen = SDL_SetVideoMode(width, height, bpp, getFlags());
93 94
 	
94 95
 	if(!screen) {
@@ -127,7 +128,7 @@ bool GLSDLScreen::apply() {
127 128
 		GLTexture::reloadAll();
128 129
 		glMatrixMode(GL_TEXTURE);
129 130
 		glLoadIdentity();
130
-				
131
+		
131 132
 		glMatrixMode(GL_MODELVIEW);
132 133
 	}
133 134
 	

Loading…
Cancel
Save