diff options
| author | Max Horn | 2003-12-10 00:15:20 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-10 00:15:20 +0000 |
| commit | bb760a5b735944794ae2d14f5b839bd98b290ca4 (patch) | |
| tree | 7437f46fc0d54ff482b366b109465639a13840d2 /Makefile | |
| parent | 0f7f124de231b465e00a97b1f1a68a11ccafd7d5 (diff) | |
| download | scummvm-rg350-bb760a5b735944794ae2d14f5b839bd98b290ca4.tar.gz scummvm-rg350-bb760a5b735944794ae2d14f5b839bd98b290ca4.tar.bz2 scummvm-rg350-bb760a5b735944794ae2d14f5b839bd98b290ca4.zip | |
detect zlib in configure script; use it by default, if available
svn-id: r11544
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -30,9 +30,9 @@ EXECUTABLE := scummvm$(EXEEXT) include config.mak # Uncomment this for stricter compile time code verification -# CXXFLAGS+= -Wshadow -Werror +# CXXFLAGS+= -Werror -CXXFLAGS:= -O -Wall -Wuninitialized $(CXXFLAGS) +CXXFLAGS:= -O -Wall -Wuninitialized $(CXXFLAGS) CXXFLAGS+= -Wno-long-long -Wno-multichar -Wno-unknown-pragmas # Even more warnings... CXXFLAGS+= -pedantic -Wpointer-arith -Wcast-qual -Wconversion @@ -79,6 +79,7 @@ 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 \ + -lz \ -framework Cocoa -framework Carbon -framework IOKit \ -framework OpenGL -framework AGL -framework QuickTime \ -framework AudioUnit -framework AudioToolbox |
