diff options
| author | Steven Noonan <steven@uplinklabs.net> | 2009-10-24 21:31:34 -0700 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2009-10-24 21:31:34 -0700 |
| commit | 59f286f8365f41c3c0783f660cec2fde1ffd8a98 (patch) | |
| tree | 44d16ab80635157508f432b773f4982a218eb94d | |
| parent | 39ed0a2d9f04ff0e59d77a720e8ee89ab11352e6 (diff) | |
| download | crawl-ref-59f286f8365f41c3c0783f660cec2fde1ffd8a98.tar.gz crawl-ref-59f286f8365f41c3c0783f660cec2fde1ffd8a98.zip | |
rltiles/makefile: fix linkage on cross-compiles
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
| -rw-r--r-- | crawl-ref/source/rltiles/makefile.unix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/crawl-ref/source/rltiles/makefile.unix b/crawl-ref/source/rltiles/makefile.unix index 9cc25f9a1e..c693549fbf 100644 --- a/crawl-ref/source/rltiles/makefile.unix +++ b/crawl-ref/source/rltiles/makefile.unix @@ -1,8 +1,13 @@ +uname_S := $(shell uname -s) ifneq (,$(findstring MINGW,$(uname_S))) LDFLAGS += -lmingw32 endif +ifndef CROSSHOST +LDFLAGS += -L../contrib/install/lib +endif + SDL_CFLAGS := -I../contrib/install/include/SDL $(shell pkg-config sdl --cflags 2> /dev/null) SDL_LDFLAGS := $(shell pkg-config sdl --libs 2> /dev/null || echo "-lSDL -lSDLmain") @@ -10,7 +15,7 @@ PNG_INCLUDE := $(shell pkg-config libpng --cflags 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) +LDFLAGS += $(SDL_LDFLAGS) -lSDL_image $(PNG_LIB) ifneq (,$(findstring MINGW,$(uname_S))) LDFLAGS += -lgdi32 -lwinmm |