diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-11-11 15:21:59 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-11-11 15:21:59 -0500 |
| commit | 7af4107235e6c178d5740782fe510d2df1c825b1 (patch) | |
| tree | d548d9c443140e77e4e158171055d08ffb77e30b /Makefile | |
| parent | 94edcc1b5496a41478e10bd6aa4ff84f5c2ee5aa (diff) | |
Fix Makefile issues with OSX 11.6
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -3,11 +3,12 @@ include config.mk include graphics_rules.mk -HOSTCC = $(CC) -HOSTCXX = $(CXX) -HOSTCFLAGS = $(CFLAGS) -HOSTCXXFLAGS = $(CXXFLAGS) -HOST_VARS := CC=$(HOSTCC) CXX=$(HOSTCXX) CFLAGS='$(HOSTCFLAGS)' CXXFLAGS='$(HOSTCXXFLAGS)' +HOSTCC := $(CC) +HOSTCXX := $(CXX) +HOSTCFLAGS := $(CFLAGS) +HOSTCXXFLAGS := $(CXXFLAGS) +HOSTPKGCONFIG := $(shell which pkg-config) +HOST_VARS := CC=$(HOSTCC) CXX=$(HOSTCXX) CFLAGS='$(HOSTCFLAGS)' CXXFLAGS='$(HOSTCXXFLAGS)' PKGCONFIG='$(HOSTPKGCONFIG)' .PHONY: clean tidy all default patch_mwasmarm @@ -124,7 +125,7 @@ MAKEROM = $(WINE) $(TOOLS_DIR)/bin/makerom.exe FIXROM = $(TOOLS_DIR)/fixrom/fixrom$(EXE) NTRCOMP = $(WINE) $(TOOLS_DIR)/bin/ntrcomp.exe -TOOLDIRS = $(filter-out $(TOOLS_DIR)/asm_processor $(TOOLS_DIR)/mwccarm $(TOOLS_DIR)/bin,$(wildcard $(TOOLS_DIR)/*)) +TOOLDIRS = $(dir $(wildcard tools/*/Makefile)) TOOLBASE = $(TOOLDIRS:$(TOOLS_DIR)/%=%) TOOLS = $(foreach tool,$(TOOLBASE),$(TOOLS_DIR)/$(tool)/$(tool)$(EXE)) |