diff options
| author | Steven Noonan <steven@uplinklabs.net> | 2009-10-19 14:20:02 -0700 |
|---|---|---|
| committer | Steven Noonan <steven@uplinklabs.net> | 2009-10-19 14:32:50 -0700 |
| commit | 0be8c4ef12466b18bda9a7101b5a12d36e0fc475 (patch) | |
| tree | bcd5a47d6e95a671fa2488f1dd925fa14bd8d215 /crawl-ref/source/makefile | |
| parent | 2bbc6dd25a227a747ef6bc7f83637b57c10d9af7 (diff) | |
| download | crawl-ref-0be8c4ef12466b18bda9a7101b5a12d36e0fc475.tar.gz crawl-ref-0be8c4ef12466b18bda9a7101b5a12d36e0fc475.zip | |
mingw-cross: eliminate need to override uname_S on make command line
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, 8 insertions, 0 deletions
diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile index 0bdf29920b..ce208ff970 100644 --- a/crawl-ref/source/makefile +++ b/crawl-ref/source/makefile @@ -52,6 +52,7 @@ export CXX export CFLAGS export MAKEFLAGS export CONFIGURE_FLAGS +export uname_S LIBPCRE := contrib/install/lib/libpcre.a LIBSDL := contrib/install/lib/libSDL.a @@ -78,6 +79,13 @@ ifdef CROSSHOST NEED_STATIC = YesPlease CONFIGURE_FLAGS += --host=$(CROSSHOST) SDLCONFIG := $(shell pwd)/contrib/install/bin/sdl-config + + # If needed, override uname_S so we get the appropriate + # things compiled. + ifneq (,$(findstring mingw,$(CROSSHOST))) + uname_S=MINGW32 + endif + endif ifneq (,$(findstring MINGW,$(uname_S))) GAME = crawl.exe |