diff options
| author | Enne Walker <ennewalker@users.sourceforge.net> | 2009-11-26 20:00:42 -0500 |
|---|---|---|
| committer | Enne Walker <ennewalker@users.sourceforge.net> | 2009-11-26 20:02:48 -0500 |
| commit | 74685cd97420cc5c40d83cc1ea688863c4dd1751 (patch) | |
| tree | d9fd0811169ffc09351451470832110a27fad5e3 /crawl-ref/source/makefile | |
| parent | ed9bd2a254234572bc1f4d18ab7ac7766ab3bc4c (diff) | |
| download | crawl-ref-74685cd97420cc5c40d83cc1ea688863c4dd1751.tar.gz crawl-ref-74685cd97420cc5c40d83cc1ea688863c4dd1751.zip | |
Removing zlib from linking against a tiles build.
libpng was the only consumer of zlib, so zlib is no longer needed either.
Diffstat (limited to 'crawl-ref/source/makefile')
| -rw-r--r-- | crawl-ref/source/makefile | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile index 830475ba70..07c6241ef9 100644 --- a/crawl-ref/source/makefile +++ b/crawl-ref/source/makefile @@ -405,12 +405,6 @@ ifdef PKGCONFIG # the contributing libraries are located. # -# 1KB: commented out instead of removing in case some weird system needs this. -# Once it's proven to be not needed, please remove this. -#PNG_INCLUDE := $(shell pkg-config libpng --cflags-only-I) -#PNG_CFLAGS := $(shell pkg-config libpng --cflags-only-other) -#PNG_LDFLAGS := $(shell pkg-config libpng --libs-only-L) $(shell pkg-config libpng --libs-only-l) - FREETYPE_INCLUDE := $(shell pkg-config freetype2 --cflags-only-I) FREETYPE_CFLAGS := $(shell pkg-config freetype2 --cflags-only-other) FREETYPE_LDFLAGS := $(shell pkg-config freetype2 --libs-only-L) $(shell pkg-config freetype2 --libs-only-l) @@ -419,7 +413,6 @@ SDL_INCLUDE := $(shell pkg-config sdl --cflags-only-I) SDL_CFLAGS := $(shell pkg-config sdl --cflags-only-other) SDL_LDFLAGS := $(shell pkg-config sdl --libs-only-L) $(shell pkg-config sdl --libs-only-l) -#LIBS += -lSDL_image $(SDL_LDFLAGS) $(PNG_LDFLAGS) $(FREETYPE_LDFLAGS) LIBS += -lSDL_image $(SDL_LDFLAGS) $(FREETYPE_LDFLAGS) endif # pkg-config @@ -705,11 +698,11 @@ CONTRIB_LIBS += $(LIBSDL) endif ifdef BUILD_LIBPNG CONTRIBS += libpng -CONTRIB_LIBS += $(LIBPNG) +# Links to rltiles, not to Crawl itself endif ifdef BUILD_ZLIB CONTRIBS += zlib -CONTRIB_LIBS += $(LIBZ) +# Links to rltiles, not to Crawl itself endif ifdef BUILD_LUA CONTRIBS += lua/src |