[Scummvm-cvs-logs] CVS: scummvm Makefile.noconf,1.5,1.6

[Travis Howell]

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

Modified Files:
	Makefile.noconf 
Log Message:

Update


Index: Makefile.noconf
===================================================================
RCS file: /cvsroot/scummvm/scummvm/Makefile.noconf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.noconf	25 Feb 2004 04:32:42 -0000	1.5
+++ Makefile.noconf	25 Feb 2004 10:09:14 -0000	1.6
@@ -3,12 +3,10 @@
 CXX     := c++
 AR      := ar cru
 RANLIB  := ranlib
-RM      := rm -f
 MKDIR   := mkdir -p
 ECHO    := echo -n
 CAT     := cat
 RM      := rm -f
-# recursive version of RM
 RM_REC  := $(RM) -r
 ZIP     := zip -q
 CP      := cp
@@ -17,10 +15,12 @@
 # Default compilation parameters. Normally don't edit these           #
 #######################################################################
 
+srcdir      ?= .
+
 CXXFLAGS:= -g -O
 DEFINES :=
 LDFLAGS :=
-INCLUDES:= -I. -Icommon
+INCLUDES:= -I$(srcdir) -I$(srcdir)/common
 LIBS	:=
 OBJS	:=
 
@@ -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