makefile macht subdir mit
This commit is contained in:
parent
744763dd4d
commit
e4d98e5434
4
Makefile
4
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
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue