diff options
| author | Travis Howell | 2004-02-25 10:09:14 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-02-25 10:09:14 +0000 |
| commit | ac42e1a4368f3cab18a6c73219004b3cbd765c63 (patch) | |
| tree | 95b15e1f1667b197b2b0f02ca6245d8ae7bd7499 | |
| parent | fd0de253dc7883c932eb995cf3359774522bbb60 (diff) | |
| download | scummvm-rg350-ac42e1a4368f3cab18a6c73219004b3cbd765c63.tar.gz scummvm-rg350-ac42e1a4368f3cab18a6c73219004b3cbd765c63.tar.bz2 scummvm-rg350-ac42e1a4368f3cab18a6c73219004b3cbd765c63.zip | |
Update
svn-id: r13048
| -rw-r--r-- | Makefile.noconf | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/Makefile.noconf b/Makefile.noconf index 26e9d3b3ad..805090355a 100644 --- a/Makefile.noconf +++ b/Makefile.noconf @@ -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 @@ CP := cp # 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 @@ CXXFLAGS+= -Wwrite-strings -fcheck-new -Wctor-dtor-privacy -Wnon-virtual-dtor # 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 @@ scummvm-static: $(OBJS) /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 |