[Scummvm-cvs-logs] CVS: scummvm Makefile,1.51,1.52 gameDetector.cpp,1.77,1.78 main.cpp,1.24,1.25 scummsys.h,1.38,1.39

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv7302

Modified Files:
	Makefile gameDetector.cpp main.cpp scummsys.h 
Log Message:
got rid of UNIX_X11 - instead, use UNIX + X11_BACKEND

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- Makefile	9 Jul 2002 14:30:59 -0000	1.51
+++ Makefile	25 Jul 2002 21:34:05 -0000	1.52
@@ -8,8 +8,8 @@
 LIBS	 = -lncurses
 
 # Uncomment this to activate the MAD lib for compressed sound files
-#DEFINES += -DCOMPRESSED_SOUND_FILE
-#LIBS    += -lmad
+# DEFINES += -DCOMPRESSED_SOUND_FILE
+# LIBS    += -lmad
 
 # Uncomment this to activate the ALSA lib for midi
 # DEFINES += -DUSE_ALSA
@@ -25,10 +25,10 @@
 DEFINES += -DUNIX
 
 # Uncomment this (instead of the above) to activate the SDL with OpenGL output
-#OBJS	 = sdl_gl.o
-#INCLUDES += `sdl-config --cflags`
-#LIBS    += `sdl-config --libs` -lGL
-#DEFINES += -DUNIX
+# OBJS	 = sdl_gl.o
+# INCLUDES += `sdl-config --cflags`
+# LIBS    += `sdl-config --libs` -lGL
+# DEFINES += -DUNIX
 
 # Uncomment this in addition to the above if you compile on Mac OS X
 # LIBS	+= -framework QuickTime -framework AudioUnit
@@ -36,7 +36,7 @@
 
 # Uncomment this if you rather want X11 output
 # OBJS     = x11.o
-# DEFINES += -DUNIX_X11
+# DEFINES += -DUNIX -DX11_BACKEND
 # LDFLAGS := -L/usr/X11R6/lib -L/usr/local/lib
 # INCLUDES+= -I/usr/X11R6/include
 # LIBS    += -lpthread -lXext -lX11

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- gameDetector.cpp	19 Jul 2002 12:06:45 -0000	1.77
+++ gameDetector.cpp	25 Jul 2002 21:34:05 -0000	1.78
@@ -58,7 +58,7 @@
 	"\t-s<num>    - set sfx volume to <num> (0-255)\n"
 	"\t-t<num>    - set music tempo (default- adlib: 0x1F0000, midi: 0x460000)\n"
 	"\t-v         - show version info and exit\n"
-#if defined(UNIX) || defined(UNIX_X11)
+#if defined(UNIX)
 	"\t-w[<file>] - write to config file [~/.scummvmrc]\n"
 #else
 	"\t-w[<file>] - write to config file [scummvm.ini]\n"
@@ -496,7 +496,7 @@
 	_gfx_driver = GD_NULL;
 #elif defined(__DC__)
 	_gfx_driver = GD_DC;
-#elif defined(UNIX_X11)
+#elif defined(X11_BACKEND)
 	_gfx_driver = GD_X;
 #elif defined(__MORPHOS__)
 	_gfx_driver = GD_MORPHOS;

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/main.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- main.cpp	7 Jul 2002 21:27:06 -0000	1.24
+++ main.cpp	25 Jul 2002 21:34:05 -0000	1.25
@@ -39,13 +39,18 @@
 Config * scummcfg;
 
 
-#if defined(MACOSX) && defined(UNIX)
+#if defined(QTOPIA)
+// FIXME - why exactly is this needed?
+extern "C" int main(int argc, char *argv[]);
+#endif
+
+#if defined(MACOSX) || defined(QTOPIA)
 #include <SDL.h>
 #elif !defined(__MORPHOS__)
 #undef main
 #endif
 
-#if defined(UNIX) || defined(UNIX_X11)
+#if defined(UNIX)
 #include <sys/param.h>
 #ifndef MAXPATHLEN
 #define MAXPATHLEN 256
@@ -55,7 +60,7 @@
 #define DEFAULT_CONFIG_FILE "scummvm.ini"
 #endif
 
-#if defined(UNIX) || defined(UNIX_X11)
+#if defined(UNIX)
 #include <signal.h>
 
 #ifndef SCUMM_NEED_ALIGNMENT
@@ -144,7 +149,7 @@
 	dc_init_hardware();
 #endif
 
-#if defined(UNIX) || defined(UNIX_X11)
+#if defined(UNIX)
 	char scummhome[MAXPATHLEN];
 	if(getenv("HOME") != NULL)
 		sprintf(scummhome,"%s/%s", getenv("HOME"), DEFAULT_CONFIG_FILE);

Index: scummsys.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummsys.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- scummsys.h	17 Jul 2002 23:31:52 -0000	1.38
+++ scummsys.h	25 Jul 2002 21:34:05 -0000	1.39
@@ -83,13 +83,13 @@
 #define START_PACK_STRUCTS pack (push,1)
 #define END_PACK_STRUCTS   pack(pop)
 
-#elif (defined(UNIX) || defined(__APPLE__) || defined(UNIX_X11))
+#elif defined(UNIX) || defined(__APPLE__)
 
 #define scumm_stricmp strcasecmp
 
 #define CHECK_HEAP
 
-#ifdef UNIX_X11
+#ifdef X11_BACKEND
 
 /* You need to set those manually */
 #define SCUMM_LITTLE_ENDIAN