diff options
| -rw-r--r-- | Makefile | 23 |
1 files changed, 13 insertions, 10 deletions
@@ -465,16 +465,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 @@ -497,6 +487,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 \ @@ -1090,6 +1090,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); \ |