mirror of
https://github.com/DrBeef/ioq3quest.git
synced 2024-11-26 14:01:26 +00:00
(Hopefully) fix the Jenkins build
This commit is contained in:
parent
95da547711
commit
6155816672
1 changed files with 13 additions and 10 deletions
23
Makefile
23
Makefile
|
@ -477,16 +477,6 @@ else # ifeq darwin
|
|||
|
||||
ifeq ($(PLATFORM),mingw32)
|
||||
|
||||
# Some MinGW installations define CC to cc, but don't actually provide cc,
|
||||
# so check that CC points to a real binary and use gcc if it doesn't
|
||||
ifeq ($(call bin_path, $(CC)),)
|
||||
CC=gcc
|
||||
endif
|
||||
|
||||
ifndef WINDRES
|
||||
WINDRES=windres
|
||||
endif
|
||||
|
||||
ifeq ($(CROSS_COMPILING),1)
|
||||
# If CC is already set to something generic, we probably want to use
|
||||
# something more specific
|
||||
|
@ -509,6 +499,16 @@ ifeq ($(PLATFORM),mingw32)
|
|||
WINDRES=$(strip $(foreach MINGW_PREFIX, $(MINGW_PREFIXES), \
|
||||
$(call bin_path, $(MINGW_PREFIX)-windres)))
|
||||
endif
|
||||
else
|
||||
# Some MinGW installations define CC to cc, but don't actually provide cc,
|
||||
# so check that CC points to a real binary and use gcc if it doesn't
|
||||
ifeq ($(call bin_path, $(CC)),)
|
||||
CC=gcc
|
||||
endif
|
||||
|
||||
ifndef WINDRES
|
||||
WINDRES=windres
|
||||
endif
|
||||
endif
|
||||
|
||||
BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
|
||||
|
@ -1141,6 +1141,9 @@ targets: makedirs
|
|||
@echo " COMPILE_PLATFORM: $(COMPILE_PLATFORM)"
|
||||
@echo " COMPILE_ARCH: $(COMPILE_ARCH)"
|
||||
@echo " CC: $(CC)"
|
||||
ifeq ($(PLATFORM),mingw32)
|
||||
@echo " WINDRES: $(WINDRES)"
|
||||
endif
|
||||
@echo ""
|
||||
@echo " CFLAGS:"
|
||||
-@for i in $(CFLAGS); \
|
||||
|
|
Loading…
Reference in a new issue