diff --git a/linux/Makefile b/linux/Makefile index c83bdc0e..140ea50e 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -24,6 +24,7 @@ CLONE := $(GIT) clone -q GITHUB := https://github.com CONFIGURE_ENV := \ + CMAKE_POLICY_VERSION_MINIMUM=3.10 \ PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR) \ CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" diff --git a/macos/Dependencies/common.make b/macos/Dependencies/common.make index c7a652b6..9033d5ec 100644 --- a/macos/Dependencies/common.make +++ b/macos/Dependencies/common.make @@ -5,7 +5,8 @@ LIBDIR := $(BUILD_PREFIX)/lib INCLUDEDIR := $(BUILD_PREFIX)/include DOWNLOADS := ${PWD}/downloads/$(HOST) NPROC := $(shell sysctl -n hw.ncpu) -CFLAGS := -I$(INCLUDEDIR) $(TARGETFLAGS) $(DEFINES) -O3 +# Explicitly including freetype2 dir for now. macOS is having weird issues with ft2build.h +CFLAGS := -I$(INCLUDEDIR) -I$(INCLUDEDIR)/freetype2 $(TARGETFLAGS) $(DEFINES) -O3 LDFLAGS := -L$(LIBDIR) CC := clang -arch $(ARCH) PKG_CONFIG_LIBDIR := $(BUILD_PREFIX)/lib/pkgconfig @@ -23,6 +24,7 @@ endif CONFIGURE_ENV := \ $(DEPLOYMENT_TARGET_ENV) \ + CMAKE_POLICY_VERSION_MINIMUM=3.10 \ PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR) \ CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" @@ -317,6 +319,7 @@ $(DOWNLOADS)/ruby/configure: $(DOWNLOADS)/ruby/configure.ac $(DOWNLOADS)/ruby/configure.ac: $(CLONE) $(GITHUB)/mkxp-z/ruby $(DOWNLOADS)/ruby --single-branch -b mkxp-z-3.1.3 --depth 1; + sed -i '' '/: $${PRELOADENV=DYLD_INSERT_LIBRARIES}/g' $(DOWNLOADS)/ruby/configure.ac # ==== init_dirs: diff --git a/windows/Makefile b/windows/Makefile index f08b62da..fefdffaa 100755 --- a/windows/Makefile +++ b/windows/Makefile @@ -23,6 +23,7 @@ CLONE := $(GIT) clone -q GITHUB := https://github.com CONFIGURE_ENV := \ + CMAKE_POLICY_VERSION_MINIMUM=3.10 \ PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR) \ CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"