[Scummvm-cvs-logs] CVS: scummvm Makefile.noconf,1.4.2.1,1.4.2.2

Travis Howell kirben at users.sourceforge.net
Sat Feb 28 23:38:07 CET 2004


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

Modified Files:
      Tag: branch-0-6-0
	Makefile.noconf 
Log Message:

Update


Index: Makefile.noconf
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.noconf,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- Makefile.noconf	25 Feb 2004 04:30:30 -0000	1.4.2.1
+++ Makefile.noconf	29 Feb 2004 07:19:30 -0000	1.4.2.2
@@ -48,9 +48,17 @@
 # Compile options - you can modify these to tweak ScummVM compilation #
 #######################################################################
 
+# Uncomment this to activate the MPEG2 lib for Broken Sword II cut scenes
+# DEFINES += -DUSE_MPEG2
+# LIBS    += -lmpeg2
+
+# Uncomment this to activate the ZLIB lib for compressed save game files
+# DEFINES += -DUSE_ZLIB
+# LIBS    += -lz
+
 # Uncomment this to activate the MAD lib for compressed sound files
-DEFINES += -DUSE_MAD
-LIBS    += -lmad
+# DEFINES += -DUSE_MAD
+# LIBS    += -lmad
 
 # Uncomment this to activate the Ogg Vorbis lib for compressed sound files
 # DEFINES += -DUSE_VORBIS
@@ -116,7 +124,10 @@
 		/sw/lib/libSDLmain.a /sw/lib/libSDL.a \
 		/sw/lib/libmad.a \
 		/sw/lib/libvorbisfile.a /sw/lib/libvorbis.a /sw/lib/libogg.a \
+		/sw/lib/libmpeg2.a \
+		-lz \
 		-framework Cocoa -framework Carbon -framework IOKit \
-		-framework QuickTime -framework AudioUnit -framework AudioToolbox
+		-framework OpenGL -framework AGL -framework QuickTime \
+		-framework AudioUnit -framework AudioToolbox
 
 .PHONY: deb bundle





More information about the Scummvm-git-logs mailing list