diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2009-11-26 11:14:54 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2009-11-26 11:14:54 +0100 |
| commit | f97ca6b3264c621330c0251b9776bf3d06530790 (patch) | |
| tree | 3627b043e5fabe7aca9990481e7b8f811f1299f3 /crawl-ref/source/makefile | |
| parent | 852e9454c38ce132fbb2ee6422dac60808a7b583 (diff) | |
| download | crawl-ref-f97ca6b3264c621330c0251b9776bf3d06530790.tar.gz crawl-ref-f97ca6b3264c621330c0251b9776bf3d06530790.zip | |
Don't link tiles against ncurses nor libpng.
The former is a "duh" case, the latter because Crawl itself doesn't depend
on libpng, it's needed by libsdl-image only. Such unneeded dependencies
can then result in waste (if all libraries use proper symbol versioning)
or crashes (if not) once sdl is rebuilt against a different version of libpng.
(Suggestions I'm doing this not to avoid future crashes but merely because
Debian tools are screaming at me are evil lies, honest! :รพ).
Diffstat (limited to 'crawl-ref/source/makefile')
| -rw-r--r-- | crawl-ref/source/makefile | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile index 9860c915c4..830475ba70 100644 --- a/crawl-ref/source/makefile +++ b/crawl-ref/source/makefile @@ -405,9 +405,11 @@ ifdef PKGCONFIG # the contributing libraries are located. # -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) +# 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) @@ -417,7 +419,8 @@ 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) $(PNG_LDFLAGS) $(FREETYPE_LDFLAGS) +LIBS += -lSDL_image $(SDL_LDFLAGS) $(FREETYPE_LDFLAGS) endif # pkg-config @@ -608,7 +611,9 @@ endif endif +ifndef TILES LIBS += -L$(NC_PREFIX)/lib -l$(NC_LIB) +endif endif |