summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2021-11-24 09:38:34 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2021-11-24 09:38:34 -0500
commitc619240caca34b085918f948da2aac55d1e76691 (patch)
tree2de219f1e01d4d2484d17c77442a3c9da3c2aa69 /Makefile
parent94e97e9e77ed2e54faf76716d76406b81d24c14e (diff)
Fix build system for macOS
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index f57a5b0d..bc1d3e0a 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,8 @@ HOSTCXX := $(CXX)
HOSTCFLAGS := $(CFLAGS)
HOSTCXXFLAGS := $(CXXFLAGS)
HOSTPKGCONFIG := $(shell which pkg-config)
-HOST_VARS := CC=$(HOSTCC) CXX=$(HOSTCXX) CFLAGS='$(HOSTCFLAGS)' CXXFLAGS='$(HOSTCXXFLAGS)' PKGCONFIG='$(HOSTPKGCONFIG)'
+HOSTPKGCONFIGPATH := $(PKG_CONFIG_PATH)
+HOST_VARS := CC=$(HOSTCC) CXX=$(HOSTCXX) CFLAGS='$(HOSTCFLAGS)' CXXFLAGS='$(HOSTCXXFLAGS)' PKGCONFIG='$(HOSTPKGCONFIG)' PKG_CONFIG_PATH='$(HOSTPKGCONFIGPATH)'
.PHONY: clean tidy all default patch_mwasmarm
@@ -184,7 +185,7 @@ $(TOOLDIRS):
@$(HOST_VARS) $(MAKE) -C $@
clean-tools:
- $(foreach tool,$(TOOLDIRS),$(MAKE) clean -C $(tool);)
+ $(foreach tool,$(TOOLDIRS),$(HOST_VARS) $(MAKE) clean -C $(tool);)
$(MWASMARM): patch_mwasmarm
@:
@@ -225,7 +226,7 @@ else
endif
# Make sure build directory exists before compiling anything
-DUMMY != mkdir -p $(ALL_DIRS)
+DUMMY := $(shell mkdir -p $(ALL_DIRS))
%.4bpp: %.png
$(GFX) $< $@