mirror of
https://github.com/yquake2/yquake2remaster.git
synced 2024-11-10 07:12:07 +00:00
Make YQ2_OSTYPE and the hardcoded CC define for Windows overrideable.
This commit is contained in:
parent
a26666d805
commit
aa36dcad6c
1 changed files with 4 additions and 4 deletions
8
Makefile
8
Makefile
|
@ -59,7 +59,7 @@ OSX_APP:=yes
|
|||
|
||||
# This is an optional configuration file, it'll be used in
|
||||
# case of presence.
|
||||
CONFIG_FILE := config.mk
|
||||
CONFIG_FILE:=config.mk
|
||||
|
||||
# ----------
|
||||
|
||||
|
@ -70,14 +70,14 @@ endif
|
|||
|
||||
# Detect the OS
|
||||
ifdef SystemRoot
|
||||
YQ2_OSTYPE := Windows
|
||||
YQ2_OSTYPE ?= Windows
|
||||
else
|
||||
YQ2_OSTYPE ?= $(shell uname -s)
|
||||
endif
|
||||
|
||||
# Special case for MinGW
|
||||
ifneq (,$(findstring MINGW,$(YQ2_OSTYPE)))
|
||||
YQ2_OSTYPE := Windows
|
||||
YQ2_OSTYPE ?= Windows
|
||||
endif
|
||||
|
||||
# Detect the architecture
|
||||
|
@ -96,7 +96,7 @@ endif
|
|||
|
||||
# On Windows / MinGW $(CC) is undefined by default.
|
||||
ifeq ($(YQ2_OSTYPE),Windows)
|
||||
CC := gcc
|
||||
CC ?= gcc
|
||||
endif
|
||||
|
||||
# Detect the compiler
|
||||
|
|
Loading…
Reference in a new issue