From 67daccbb0e957159e2d411e95f652440cf612807 Mon Sep 17 00:00:00 2001 From: Steven Noonan Date: Fri, 16 Oct 2009 10:35:31 -0700 Subject: rltiles: fix MinGW build Signed-off-by: Steven Noonan --- crawl-ref/source/rltiles/makefile.unix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crawl-ref/source/rltiles/makefile.unix') diff --git a/crawl-ref/source/rltiles/makefile.unix b/crawl-ref/source/rltiles/makefile.unix index 7db3c36823..cc5f63bbe8 100644 --- a/crawl-ref/source/rltiles/makefile.unix +++ b/crawl-ref/source/rltiles/makefile.unix @@ -20,17 +20,17 @@ else SDLCONFIG := $(shell which sdl-config 2> /dev/null) ifeq ($(SDLCONFIG),) -SDLCONFIG := $(shell pwd)/contrib/install/bin/sdl-config +SDLCONFIG := $(shell pwd)/../contrib/install/bin/sdl-config endif SDL_CFLAGS := $(shell $(SDLCONFIG) --cflags 2> /dev/null) SDL_LDFLAGS := $(shell $(SDLCONFIG) --libs 2> /dev/null) PNG_INCLUDE := $(shell pkg-config libpng --cflags 2> /dev/null) -PNG_LIB := $(shell pkg-config libpng --libs 2> /dev/null) +PNG_LIB := $(shell pkg-config libpng --libs 2> /dev/null || echo "-lpng -lz") CFLAGS := -I../contrib/install/include $(SDL_CFLAGS) $(PNG_INCLUDE) -LDFLAGS := -L../contrib/install/lib $(SDL_LDFLAGS) -lSDL_image $(PNG_LIB) -lz +LDFLAGS := -L../contrib/install/lib $(SDL_LDFLAGS) -lSDL_image $(PNG_LIB) endif -- cgit v1.2.3-54-g00ecf