diff options
| author | Steven Noonan <steven@uplinklabs.net> | 2009-10-12 01:58:29 -0700 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2009-10-12 03:57:37 -0700 |
| commit | c1182b90c599bfeff5a732dcf1a849e389c34af9 (patch) | |
| tree | cf824db0748e5babfbc6e1e390050c29ee7b8738 /crawl-ref/source/makefile | |
| parent | 4b1ee0b9169dca86bd02c97f5771603aa5820ad8 (diff) | |
| download | crawl-ref-c1182b90c599bfeff5a732dcf1a849e389c34af9.tar.gz crawl-ref-c1182b90c599bfeff5a732dcf1a849e389c34af9.zip | |
makefile: fix build on Mac OS X when APPLE_GCC=n
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref/source/makefile')
| -rw-r--r-- | crawl-ref/source/makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile index 3543386564..8f3431c519 100644 --- a/crawl-ref/source/makefile +++ b/crawl-ref/source/makefile @@ -254,15 +254,15 @@ ifneq ($(shell which pkg-config 2> /dev/null),) 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) +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) +FREETYPE_LDFLAGS := $(shell pkg-config freetype2 --libs-only-L) $(shell pkg-config freetype2 --libs-only-l) 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) +SDL_LDFLAGS := $(shell pkg-config sdl --libs-only-L) $(shell pkg-config sdl --libs-only-l) else # pkg-config @@ -299,7 +299,9 @@ endif # sdl-config endif # pkg-config LIB += $(PNG_LDFLAGS) $(FREETYPE_LDFLAGS) $(SDL_LDFLAGS) -lSDL_image +ifneq ($(OSNAME),MacOS) LIB += -lGL -lGLU +endif DEFINES += $(PNG_CFLAGS) $(FREETYPE_CFLAGS) $(SDL_CFLAGS) INCLUDES += $(PNG_INCLUDE) $(FREETYPE_INCLUDE) $(SDL_INCLUDE) |