thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

the OpenGL framework is already covered by 'sdl-config --libs', and GLUT isn't used at all (note: GLU != GLUT); renamed OSX macro to MACOSX (thus matching ScummVM; hack driver_gl.cpp to compile on OSX

Browse source
This commit is contained in:
Max Horn 2004-03-25 22:17:09 +00:00
parent 72a19ffff5
commit eb3f4e6e8d
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -6,11 +6,11 @@ CXXFLAGS = -g -W -Wall -Ilua/include `sdl-config --cflags` -DUNIX \
LDFLAGS = -g -W -Wall # -O2 LDFLAGS = -g -W -Wall # -O2
LIBS = -Llua/lib -llua -llualib `sdl-config --libs` -lz LIBS = -Llua/lib -llua -llualib `sdl-config --libs` -lz
# Comment this out for Mac OS X ...
LIBS += -lGL -lGLU LIBS += -lGL -lGLU
# For OSX use these instead of -lGL and -lGLU # ... and instead uncomment this if you are on Mac OS X
#LIBS += -framework OpenGL -framework GLUT #CXXFLAGS += -DMACOSX
#CXXFLAGS += -DOSX
OBJS = main.o lab.o bitmap.o model.o resource.o material.o debug.o \ OBJS = main.o lab.o bitmap.o model.o resource.o material.o debug.o \
textsplit.o lua.o registry.o localize.o scene.o engine.o actor.o \ textsplit.o lua.o registry.o localize.o scene.o engine.o actor.o \

8
driver_gl.cpp
View file

@ -21,7 +21,9 @@
Driver *g_driver; Driver *g_driver;
// Hacky includes for temporary font rendering // Hacky includes for temporary font rendering
#ifndef WIN32 #if defined(MACOSX)
// TODO
#elif defined(WIN32)
#include <GL/glx.h> #include <GL/glx.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#else #else
@ -47,7 +49,9 @@ Driver::Driver(int screenW, int screenH, int screenBPP) {
// FIXME: Hacky temporary font renderer code // FIXME: Hacky temporary font renderer code
hackFont = glGenLists(256); hackFont = glGenLists(256);
#ifdef WIN32 #if defined(MACOSX)
// TODO
#elif defined(WIN32)
{ {
HDC hDC; HDC hDC;
HFONT font; HFONT font;

4
main.cpp
View file

@ -117,7 +117,7 @@ int main(int argc, char *argv[]) {
SDL_Event event; SDL_Event event;
// For some reason we don't get the SDL_VIDEOEXPOSE event on OSX, so just don't wait for it. // For some reason we don't get the SDL_VIDEOEXPOSE event on OSX, so just don't wait for it.
#ifndef OSX #ifndef MACOSX
while (SDL_PollEvent(&event)) { while (SDL_PollEvent(&event)) {
if (event.type == SDL_VIDEOEXPOSE) { if (event.type == SDL_VIDEOEXPOSE) {
#else #else
@ -128,7 +128,7 @@ int main(int argc, char *argv[]) {
splash_bm->draw(); splash_bm->draw();
g_driver->flipBuffer(); g_driver->flipBuffer();
#ifndef OSX #ifndef MACOSX
} }
} }
#endif #endif