diff options
author | Christopher Schwarz <lakitu7@gmail.com> | 2009-10-14 18:25:11 +0000 |
---|---|---|
committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:16:49 +0000 |
commit | 6e60e823ac94aeed888abbe15ea99f6ede3cc535 (patch) | |
tree | c8a21b0472a22b3d99fa74f4edeb534aa65cffc3 /Makefile | |
parent | 6efd4cef3cfcc44d6727cb0e54da26fbb74a7533 (diff) |
* Fix cross-compiling (early merge from ioq3 r1667)
* Prevent crash when using % in chats, caused by r1784 (Ensiform, Rezyn)
* Change default hud color of location text to white, so it doesn't mess up color schemes of maps that have such things on their location ents
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -429,7 +429,9 @@ ifeq ($(PLATFORM),mingw32) # Some MinGW installations define CC to cc, but don't actually provide cc, # so explicitly use gcc instead (which is the only option anyway) - CC=gcc + ifeq ($(shell which $(CC) > /dev/null; echo $$?),1) + CC=gcc + endif ifndef WINDRES WINDRES=windres |