mirror of
https://github.com/DrBeef/ioq3quest.git
synced 2024-11-10 23:02:01 +00:00
Fix it more
This commit is contained in:
parent
6155816672
commit
02a625a1b3
2 changed files with 12 additions and 9 deletions
8
Makefile
8
Makefile
|
@ -480,12 +480,11 @@ ifeq ($(PLATFORM),mingw32)
|
|||
ifeq ($(CROSS_COMPILING),1)
|
||||
# If CC is already set to something generic, we probably want to use
|
||||
# something more specific
|
||||
ifneq ($(findstring $(CC),cc gcc),)
|
||||
ifneq ($(findstring $(strip $(CC)),cc gcc),)
|
||||
CC=
|
||||
endif
|
||||
|
||||
# We need to figure out the correct compiler
|
||||
ifeq ($(CC),)
|
||||
# We need to figure out the correct gcc and windres
|
||||
ifeq ($(ARCH),x86_64)
|
||||
MINGW_PREFIXES=amd64-mingw32msvc x86_64-w64-mingw32
|
||||
endif
|
||||
|
@ -493,9 +492,12 @@ ifeq ($(PLATFORM),mingw32)
|
|||
MINGW_PREFIXES=i586-mingw32msvc i686-w64-mingw32
|
||||
endif
|
||||
|
||||
ifndef CC
|
||||
CC=$(strip $(foreach MINGW_PREFIX, $(MINGW_PREFIXES), \
|
||||
$(call bin_path, $(MINGW_PREFIX)-gcc)))
|
||||
endif
|
||||
|
||||
ifndef WINDRES
|
||||
WINDRES=$(strip $(foreach MINGW_PREFIX, $(MINGW_PREFIXES), \
|
||||
$(call bin_path, $(MINGW_PREFIX)-windres)))
|
||||
endif
|
||||
|
|
|
@ -6,6 +6,7 @@ failed=0;
|
|||
if [ "$CC" = "i686-w64-mingw32-gcc" ]; then
|
||||
export PLATFORM=mingw32
|
||||
export ARCH=x86
|
||||
export CC=
|
||||
haveExternalLibs=0
|
||||
else
|
||||
haveExternalLibs=1
|
||||
|
|
Loading…
Reference in a new issue