summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorhairball <xhairball@gmail.com>2014-02-14 04:34:17 +0000
committerTim Angus <tim@ngus.net>2014-08-28 11:13:04 +0100
commitfd05b04a2713d72b14e1c3def1ab44c4af796440 (patch)
tree8d7fce8ce25a063fb5aff9228317a5d75a286024 /Makefile
parentd962e634e350c553fa4b8df380c40bc27c005ce8 (diff)
Don't use -mwindows with Clang on Windows
Thanks to stigmha for pointing out this doesn't work in Windows.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f87fbde1..2859e49e 100644
--- a/Makefile
+++ b/Makefile
@@ -568,7 +568,10 @@ ifeq ($(PLATFORM),mingw32)
endif
LIBS= -lws2_32 -lwinmm -lpsapi
- CLIENT_LDFLAGS += -mwindows
+ # clang 3.4 doesn't support this
+ ifneq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
+ CLIENT_LDFLAGS += -mwindows
+ endif
CLIENT_LIBS = -lgdi32 -lole32
RENDERER_LIBS = -lgdi32 -lole32 -lopengl32