[Scummvm-cvs-logs] CVS: residual Makefile,1.16,1.17 driver_gl.cpp,1.11,1.12 main.cpp,1.24,1.25

[Max Horn]

Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20864

Modified Files:
	Makefile driver_gl.cpp main.cpp 
Log Message:
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

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/residual/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile	22 Mar 2004 11:23:35 -0000	1.16
+++ Makefile	25 Mar 2004 22:17:09 -0000	1.17
@@ -6,11 +6,11 @@
 LDFLAGS = -g -W -Wall # -O2
 LIBS =  -Llua/lib -llua -llualib `sdl-config --libs` -lz 
 
+# Comment this out for Mac OS X ...
 LIBS += -lGL -lGLU
 
-# For OSX use these instead of -lGL and -lGLU
-#LIBS += -framework OpenGL -framework GLUT 
-#CXXFLAGS += -DOSX
+# ... and instead uncomment this if you are on Mac OS X
+#CXXFLAGS += -DMACOSX
 
 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 \

Index: driver_gl.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/driver_gl.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- driver_gl.cpp	25 Mar 2004 12:27:02 -0000	1.11
+++ driver_gl.cpp	25 Mar 2004 22:17:09 -0000	1.12
@@ -21,7 +21,9 @@
 Driver *g_driver;
 
 // Hacky includes for temporary font rendering
-#ifndef WIN32
+#if defined(MACOSX)
+	// TODO
+#elif defined(WIN32)
 	#include <GL/glx.h>
 	#include <X11/Xlib.h>
 #else
@@ -47,7 +49,9 @@
 
 	// FIXME: Hacky temporary font renderer code
 	hackFont = glGenLists(256);
-#ifdef WIN32
+#if defined(MACOSX)
+	// TODO
+#elif defined(WIN32)
 	{
 		HDC   hDC;
 		HFONT font;

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/main.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- main.cpp	24 Mar 2004 12:20:46 -0000	1.24
+++ main.cpp	25 Mar 2004 22:17:09 -0000	1.25
@@ -117,7 +117,7 @@
 	SDL_Event event;
 	
 // 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)) {
 		if (event.type == SDL_VIDEOEXPOSE) {
 #else
@@ -128,7 +128,7 @@
 			splash_bm->draw();
 
 			g_driver->flipBuffer();
-#ifndef OSX
+#ifndef MACOSX
 		}
 	}
 #endif