diff options
| author | Max Horn | 2002-06-07 14:11:29 +0000 |
|---|---|---|
| committer | Max Horn | 2002-06-07 14:11:29 +0000 |
| commit | 62eeaddfd4b4f69059972ad11bb1ab1264b72556 (patch) | |
| tree | 1b185e24fb47dc2339e2127ec740357cde14e27d | |
| parent | f8190443caa4523eceb8d78fb2c38f5eda5f996c (diff) | |
| download | scummvm-rg350-62eeaddfd4b4f69059972ad11bb1ab1264b72556.tar.gz scummvm-rg350-62eeaddfd4b4f69059972ad11bb1ab1264b72556.tar.bz2 scummvm-rg350-62eeaddfd4b4f69059972ad11bb1ab1264b72556.zip | |
merged Makefile.macosx into master Makefile
svn-id: r4413
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | Makefile.macosx | 19 |
2 files changed, 7 insertions, 19 deletions
@@ -25,6 +25,10 @@ INCLUDES += `sdl-config --cflags` LIBS += `sdl-config --libs` DEFINES += -DUNIX +# Uncomment this in addition to the above if you compile on Mac OS X +# LIBS += -framework QuickTime -framework AudioUnit +# DEFINES += -DMACOSX + # Uncomment this if you rather want X11 output # OBJS = x11.o # DEFINES += -DUNIX_X11 @@ -32,6 +36,9 @@ DEFINES += -DUNIX # INCLUDES+= -I/usr/X11R6/include # LIBS += -lpthread -lXext -lX11 +# Enable this if you want ScummVM to dump all scripts it runs. +# This is mainly interesting for developers. +# DEFINES += -DDUMP_SCRIPTS CPPFLAGS= $(DEFINES) $(INCLUDES) diff --git a/Makefile.macosx b/Makefile.macosx deleted file mode 100644 index c6f3e903be..0000000000 --- a/Makefile.macosx +++ /dev/null @@ -1,19 +0,0 @@ -# $Header$ - -CC = c++ -CFLAGS = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -DCOMPRESSED_SOUND_FILE -DEFINES = -DUNIX -DMACOSX -LDFLAGS := -INCLUDES:= `sdl-config --cflags` -I./ -I./sound -CPPFLAGS= $(DEFINES) $(INCLUDES) - -# Add -lmad for -DCOMPRESSED_SOUND_FILE -LIBS = `sdl-config --libs` -lmad -framework QuickTime -framework AudioUnit - -OBJS = sdl.o - -include Makefile.common - -dist: - rm -f $(ZIPFILE) - zip -q $(ZIPFILE) $(DISTFILES) |