diff options
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | gameDetector.cpp | 4 | ||||
| -rw-r--r-- | main.cpp | 13 | ||||
| -rw-r--r-- | scummsys.h | 4 | ||||
| -rw-r--r-- | simon/simon.h | 2 |
5 files changed, 21 insertions, 16 deletions
@@ -8,8 +8,8 @@ INCLUDES:= -I./ -I./sound 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 @@ LIBS += `sdl-config --libs` 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 @@ DEFINES += -DUNIX # 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 diff --git a/gameDetector.cpp b/gameDetector.cpp index 61b34e05a2..9210de725d 100644 --- a/gameDetector.cpp +++ b/gameDetector.cpp @@ -58,7 +58,7 @@ static const char USAGE_STRING[] = "\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 @@ int GameDetector::detectMain(int argc, char **argv) _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; @@ -39,13 +39,18 @@ SoundMixer *g_mixer; 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 @@ Config * scummcfg; #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 @@ game settings! 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); diff --git a/scummsys.h b/scummsys.h index 199ad9b99f..74fcfbcb84 100644 --- a/scummsys.h +++ b/scummsys.h @@ -83,13 +83,13 @@ typedef signed long int32; #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 diff --git a/simon/simon.h b/simon/simon.h index 50cae289c6..bd341b0e2d 100644 --- a/simon/simon.h +++ b/simon/simon.h @@ -222,7 +222,7 @@ struct VgaFile1Struct0x6 { }; /* dummy typedefs to make it compile in *nix */ -#if defined(UNIX) || defined(UNIX_X11) || defined(__MORPHOS__) || defined(__DC__) || defined(macintosh) +#if defined(UNIX) || defined(__MORPHOS__) || defined(__DC__) || defined(macintosh) typedef void *HMIDISTRM; typedef void *HMIDIOUT; typedef uint32 UINT; |