[Scummvm-cvs-logs] CVS: scummvm Makefile,1.46,1.47 Makefile.macosx,1.4,NONE

[Max Horn]

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

Modified Files:
	Makefile 
Removed Files:
	Makefile.macosx 
Log Message:
merged Makefile.macosx into master Makefile

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- Makefile	25 May 2002 18:56:28 -0000	1.46
+++ Makefile	7 Jun 2002 14:11:29 -0000	1.47
@@ -25,6 +25,10 @@
 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 @@
 # 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)
 

--- Makefile.macosx DELETED ---