From dceb81aa77d011b3bae6a57b83cf002b8ff70412 Mon Sep 17 00:00:00 2001 From: Eblo <7004497+Eblo@users.noreply.github.com> Date: Sat, 1 Feb 2025 20:50:30 -0500 Subject: [PATCH 01/10] Attempt to fix macOS autobuild (cherry picked from commit 2cb0a75e57d6149c12c653914473d5ff556260fe) --- macos/Dependencies/common.make | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/macos/Dependencies/common.make b/macos/Dependencies/common.make index f11623f5..793a8ddc 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 From c99d8b0bbacef00b647e0860566e151365112ed4 Mon Sep 17 00:00:00 2001 From: Eblo <7004497+Eblo@users.noreply.github.com> Date: Sat, 8 Feb 2025 22:05:49 -0500 Subject: [PATCH 02/10] Fix Ruby and Vorbis at the Makefile level (cherry picked from commit edd115a32020f8ff84fbcfb170b3806cb52feda2) --- linux/Makefile | 2 +- macos/Dependencies/common.make | 6 ++++-- windows/Makefile | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/linux/Makefile b/linux/Makefile index 3ee14767..9a4a40fd 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -89,7 +89,7 @@ $(DOWNLOADS)/vorbis/configure: $(DOWNLOADS)/vorbis/autogen.sh ./autogen.sh $(DOWNLOADS)/vorbis/autogen.sh: - $(CLONE) $(GITHUB)/mkxp-z/vorbis $(DOWNLOADS)/vorbis + $(CLONE) $(GITHUB)/xiph/vorbis $(DOWNLOADS)/vorbis # Ogg, dependency of Vorbis diff --git a/macos/Dependencies/common.make b/macos/Dependencies/common.make index 793a8ddc..d86d10ed 100644 --- a/macos/Dependencies/common.make +++ b/macos/Dependencies/common.make @@ -93,7 +93,8 @@ $(DOWNLOADS)/vorbis/configure: $(DOWNLOADS)/vorbis/autogen.sh ./autogen.sh $(DOWNLOADS)/vorbis/autogen.sh: - $(CLONE) $(GITHUB)/mkxp-z/vorbis $(DOWNLOADS)/vorbis + $(CLONE) $(GITHUB)/xiph/vorbis $(DOWNLOADS)/vorbis + sed -i '' 's/ -force_cpusubtype_ALL / /g' $(DOWNLOADS)/vorbis/configure.ac # Ogg, dependency of Vorbis @@ -320,7 +321,8 @@ $(DOWNLOADS)/ruby/configure: $(DOWNLOADS)/ruby/configure.ac cd $(DOWNLOADS)/ruby; autoreconf -i $(DOWNLOADS)/ruby/configure.ac: - $(CLONE) $(GITHUB)/mkxp-z/ruby $(DOWNLOADS)/ruby --single-branch -b mkxp-z-3.1.3 --depth 1; + $(CLONE) $(GITHUB)/Eblo/ruby $(DOWNLOADS)/ruby --single-branch -b mkxp-z-3.1.3 --depth 1; + sed -i '' 's/ DYLD_INSERT_LIBRARIES / /g' $(DOWNLOADS)/ruby/configure.ac # ==== init_dirs: diff --git a/windows/Makefile b/windows/Makefile index 11b2327c..0d2e3c8a 100755 --- a/windows/Makefile +++ b/windows/Makefile @@ -84,7 +84,7 @@ $(DOWNLOADS)/vorbis/configure: $(DOWNLOADS)/vorbis/autogen.sh ./autogen.sh $(DOWNLOADS)/vorbis/autogen.sh: - $(CLONE) $(GITHUB)/mkxp-z/vorbis $(DOWNLOADS)/vorbis + $(CLONE) $(GITHUB)/xiph/vorbis $(DOWNLOADS)/vorbis # Ogg, dependency of Vorbis From 06f7572eb722b020135bcde1f4c22aa1c8cf17ac Mon Sep 17 00:00:00 2001 From: Eblo <7004497+Eblo@users.noreply.github.com> Date: Sun, 9 Feb 2025 08:11:28 -0500 Subject: [PATCH 03/10] Actually use mkxp-z Ruby fork for macOS (cherry picked from commit 1d0921c8819a9b6ccfab84bf001eeb954f38f359) --- macos/Dependencies/common.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macos/Dependencies/common.make b/macos/Dependencies/common.make index d86d10ed..e9352180 100644 --- a/macos/Dependencies/common.make +++ b/macos/Dependencies/common.make @@ -321,7 +321,7 @@ $(DOWNLOADS)/ruby/configure: $(DOWNLOADS)/ruby/configure.ac cd $(DOWNLOADS)/ruby; autoreconf -i $(DOWNLOADS)/ruby/configure.ac: - $(CLONE) $(GITHUB)/Eblo/ruby $(DOWNLOADS)/ruby --single-branch -b mkxp-z-3.1.3 --depth 1; + $(CLONE) $(GITHUB)/mkxp-z/ruby $(DOWNLOADS)/ruby --single-branch -b mkxp-z-3.1.3 --depth 1; sed -i '' 's/ DYLD_INSERT_LIBRARIES / /g' $(DOWNLOADS)/ruby/configure.ac # ==== From 8f7b6c19624e49109bd35b333a4a6818db3fea65 Mon Sep 17 00:00:00 2001 From: Eblo <7004497+Eblo@users.noreply.github.com> Date: Sun, 9 Feb 2025 09:24:03 -0500 Subject: [PATCH 04/10] Remove entire line for DYLD_INSERT_LIBRARIES (cherry picked from commit 27c66a802ec11e90972bfc8135db47866caf0b01) --- macos/Dependencies/common.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macos/Dependencies/common.make b/macos/Dependencies/common.make index e9352180..4e3de480 100644 --- a/macos/Dependencies/common.make +++ b/macos/Dependencies/common.make @@ -322,7 +322,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 '' 's/ DYLD_INSERT_LIBRARIES / /g' $(DOWNLOADS)/ruby/configure.ac + sed -i '' '/: $${PRELOADENV=DYLD_INSERT_LIBRARIES}/g' $(DOWNLOADS)/ruby/configure.ac # ==== init_dirs: From e10c7bee0d01e47c0c90dcf46a40e8021ab499da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=9A=93?= Date: Mon, 24 Mar 2025 21:10:10 -0400 Subject: [PATCH 05/10] Use CMake instead of Autotools for building Vorbis --- linux/Makefile | 13 +++++-------- macos/Dependencies/common.make | 14 +++++--------- windows/Makefile | 13 +++++-------- 3 files changed, 15 insertions(+), 25 deletions(-) diff --git a/linux/Makefile b/linux/Makefile index 9a4a40fd..d03529cc 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -77,18 +77,15 @@ $(DOWNLOADS)/theora/autogen.sh: libvorbis: init_dirs libogg $(LIBDIR)/libvorbis.a $(LIBDIR)/libvorbis.a: $(LIBDIR)/libogg.a $(DOWNLOADS)/vorbis/Makefile - cd $(DOWNLOADS)/vorbis; \ + cd $(DOWNLOADS)/vorbis/cmakebuild; \ make -j$(NPROC); make install -$(DOWNLOADS)/vorbis/Makefile: $(DOWNLOADS)/vorbis/configure +$(DOWNLOADS)/vorbis/Makefile: $(DOWNLOADS)/vorbis/CMakeLists.txt cd $(DOWNLOADS)/vorbis; \ - $(CONFIGURE) --with-ogg=$(BUILD_PREFIX) --enable-shared=false --enable-static=true + mkdir cmakebuild; cd cmakebuild; \ + $(CMAKE) -DBUILD_SHARED_LIBS=no -$(DOWNLOADS)/vorbis/configure: $(DOWNLOADS)/vorbis/autogen.sh - cd $(DOWNLOADS)/vorbis; \ - ./autogen.sh - -$(DOWNLOADS)/vorbis/autogen.sh: +$(DOWNLOADS)/vorbis/CMakeLists.txt: $(CLONE) $(GITHUB)/xiph/vorbis $(DOWNLOADS)/vorbis diff --git a/macos/Dependencies/common.make b/macos/Dependencies/common.make index 4e3de480..7831d5bf 100644 --- a/macos/Dependencies/common.make +++ b/macos/Dependencies/common.make @@ -81,20 +81,16 @@ $(DOWNLOADS)/theora/autogen.sh: libvorbis: init_dirs libogg $(LIBDIR)/libvorbis.a $(LIBDIR)/libvorbis.a: $(LIBDIR)/libogg.a $(DOWNLOADS)/vorbis/Makefile - cd $(DOWNLOADS)/vorbis; \ + cd $(DOWNLOADS)/vorbis/cmakebuild; \ make -j$(NPROC); make install -$(DOWNLOADS)/vorbis/Makefile: $(DOWNLOADS)/vorbis/configure +$(DOWNLOADS)/vorbis/Makefile: $(DOWNLOADS)/vorbis/CMakeLists.txt cd $(DOWNLOADS)/vorbis; \ - $(CONFIGURE) --with-ogg=$(BUILD_PREFIX) --enable-shared=false --enable-static=true + mkdir cmakebuild; cd cmakebuild; \ + $(CMAKE) -DBUILD_SHARED_LIBS=no -$(DOWNLOADS)/vorbis/configure: $(DOWNLOADS)/vorbis/autogen.sh - cd $(DOWNLOADS)/vorbis; \ - ./autogen.sh - -$(DOWNLOADS)/vorbis/autogen.sh: +$(DOWNLOADS)/vorbis/CMakeLists.txt: $(CLONE) $(GITHUB)/xiph/vorbis $(DOWNLOADS)/vorbis - sed -i '' 's/ -force_cpusubtype_ALL / /g' $(DOWNLOADS)/vorbis/configure.ac # Ogg, dependency of Vorbis diff --git a/windows/Makefile b/windows/Makefile index 0d2e3c8a..7ed26ebe 100755 --- a/windows/Makefile +++ b/windows/Makefile @@ -72,18 +72,15 @@ $(DOWNLOADS)/theora/autogen.sh: libvorbis: init_dirs libogg $(LIBDIR)/libvorbis.a $(LIBDIR)/libvorbis.a: $(LIBDIR)/libogg.a $(DOWNLOADS)/vorbis/Makefile - cd $(DOWNLOADS)/vorbis; \ + cd $(DOWNLOADS)/vorbis/cmakebuild; \ make -j$(NPROC); make install -$(DOWNLOADS)/vorbis/Makefile: $(DOWNLOADS)/vorbis/configure +$(DOWNLOADS)/vorbis/Makefile: $(DOWNLOADS)/vorbis/CMakeLists.txt cd $(DOWNLOADS)/vorbis; \ - $(CONFIGURE) --with-ogg=$(BUILD_PREFIX) --enable-shared=false --enable-static=true + mkdir cmakebuild; cd cmakebuild; \ + $(CMAKE) -DBUILD_SHARED_LIBS=no -$(DOWNLOADS)/vorbis/configure: $(DOWNLOADS)/vorbis/autogen.sh - cd $(DOWNLOADS)/vorbis; \ - ./autogen.sh - -$(DOWNLOADS)/vorbis/autogen.sh: +$(DOWNLOADS)/vorbis/CMakeLists.txt: $(CLONE) $(GITHUB)/xiph/vorbis $(DOWNLOADS)/vorbis From 74673ae7ca5ae4561de14da563b36d5ff460f7c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=9A=93?= Date: Tue, 25 Mar 2025 11:21:47 -0400 Subject: [PATCH 06/10] Fix typo: $(DOWNLOADS)/vorbis/Makefile should be $(DOWNLOADS)/vorbis/cmakebuild/Makefile --- linux/Makefile | 4 ++-- macos/Dependencies/common.make | 4 ++-- windows/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/linux/Makefile b/linux/Makefile index d03529cc..91f26f0a 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -76,11 +76,11 @@ $(DOWNLOADS)/theora/autogen.sh: # Vorbis libvorbis: init_dirs libogg $(LIBDIR)/libvorbis.a -$(LIBDIR)/libvorbis.a: $(LIBDIR)/libogg.a $(DOWNLOADS)/vorbis/Makefile +$(LIBDIR)/libvorbis.a: $(LIBDIR)/libogg.a $(DOWNLOADS)/vorbis/cmakebuild/Makefile cd $(DOWNLOADS)/vorbis/cmakebuild; \ make -j$(NPROC); make install -$(DOWNLOADS)/vorbis/Makefile: $(DOWNLOADS)/vorbis/CMakeLists.txt +$(DOWNLOADS)/vorbis/cmakebuild/Makefile: $(DOWNLOADS)/vorbis/CMakeLists.txt cd $(DOWNLOADS)/vorbis; \ mkdir cmakebuild; cd cmakebuild; \ $(CMAKE) -DBUILD_SHARED_LIBS=no diff --git a/macos/Dependencies/common.make b/macos/Dependencies/common.make index 7831d5bf..408319ee 100644 --- a/macos/Dependencies/common.make +++ b/macos/Dependencies/common.make @@ -80,11 +80,11 @@ $(DOWNLOADS)/theora/autogen.sh: # Vorbis libvorbis: init_dirs libogg $(LIBDIR)/libvorbis.a -$(LIBDIR)/libvorbis.a: $(LIBDIR)/libogg.a $(DOWNLOADS)/vorbis/Makefile +$(LIBDIR)/libvorbis.a: $(LIBDIR)/libogg.a $(DOWNLOADS)/vorbis/cmakebuild/Makefile cd $(DOWNLOADS)/vorbis/cmakebuild; \ make -j$(NPROC); make install -$(DOWNLOADS)/vorbis/Makefile: $(DOWNLOADS)/vorbis/CMakeLists.txt +$(DOWNLOADS)/vorbis/cmakebuild/Makefile: $(DOWNLOADS)/vorbis/CMakeLists.txt cd $(DOWNLOADS)/vorbis; \ mkdir cmakebuild; cd cmakebuild; \ $(CMAKE) -DBUILD_SHARED_LIBS=no diff --git a/windows/Makefile b/windows/Makefile index 7ed26ebe..87b11db0 100755 --- a/windows/Makefile +++ b/windows/Makefile @@ -71,11 +71,11 @@ $(DOWNLOADS)/theora/autogen.sh: # Vorbis libvorbis: init_dirs libogg $(LIBDIR)/libvorbis.a -$(LIBDIR)/libvorbis.a: $(LIBDIR)/libogg.a $(DOWNLOADS)/vorbis/Makefile +$(LIBDIR)/libvorbis.a: $(LIBDIR)/libogg.a $(DOWNLOADS)/vorbis/cmakebuild/Makefile cd $(DOWNLOADS)/vorbis/cmakebuild; \ make -j$(NPROC); make install -$(DOWNLOADS)/vorbis/Makefile: $(DOWNLOADS)/vorbis/CMakeLists.txt +$(DOWNLOADS)/vorbis/cmakebuild/Makefile: $(DOWNLOADS)/vorbis/CMakeLists.txt cd $(DOWNLOADS)/vorbis; \ mkdir cmakebuild; cd cmakebuild; \ $(CMAKE) -DBUILD_SHARED_LIBS=no From 0f24e806bbf8069980747e546f8ffdf5234e06a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=9A=93?= Date: Fri, 28 Mar 2025 12:39:46 -0400 Subject: [PATCH 07/10] Update Ruby from 3.1.3 to 3.1.7 --- linux/Makefile | 2 +- macos/Dependencies/common.make | 3 +-- windows/Makefile | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/linux/Makefile b/linux/Makefile index 91f26f0a..f886aa44 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -334,7 +334,7 @@ $(DOWNLOADS)/ruby/configure: $(DOWNLOADS)/ruby/configure.ac cd $(DOWNLOADS)/ruby; autoreconf -i $(DOWNLOADS)/ruby/configure.ac: - $(CLONE) $(GITHUB)/mkxp-z/ruby $(DOWNLOADS)/ruby --single-branch --branch mkxp-z-3.1.3 --depth 1; + $(CLONE) $(GITHUB)/mkxp-z/ruby $(DOWNLOADS)/ruby --single-branch --branch mkxp-z-3.1.7 --depth 1 # ==== init_dirs: diff --git a/macos/Dependencies/common.make b/macos/Dependencies/common.make index 408319ee..078dc305 100644 --- a/macos/Dependencies/common.make +++ b/macos/Dependencies/common.make @@ -317,8 +317,7 @@ $(DOWNLOADS)/ruby/configure: $(DOWNLOADS)/ruby/configure.ac cd $(DOWNLOADS)/ruby; autoreconf -i $(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 + $(CLONE) $(GITHUB)/mkxp-z/ruby $(DOWNLOADS)/ruby --single-branch -b mkxp-z-3.1.7 --depth 1 # ==== init_dirs: diff --git a/windows/Makefile b/windows/Makefile index 87b11db0..453b8563 100755 --- a/windows/Makefile +++ b/windows/Makefile @@ -314,7 +314,7 @@ $(DOWNLOADS)/ruby/configure: $(DOWNLOADS)/ruby/configure.ac cd $(DOWNLOADS)/ruby; autoreconf -i $(DOWNLOADS)/ruby/configure.ac: - $(CLONE) $(GITHUB)/mkxp-z/ruby $(DOWNLOADS)/ruby --single-branch --branch mkxp-z-3.1.3 --depth 1; + $(CLONE) $(GITHUB)/mkxp-z/ruby $(DOWNLOADS)/ruby --single-branch --branch mkxp-z-3.1.7 --depth 1 # ==== init_dirs: From ec780afe5bb6851750d3c78c8f8204a00849a3d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=9A=93?= Date: Fri, 28 Mar 2025 17:12:53 -0400 Subject: [PATCH 08/10] Revert "Update Ruby from 3.1.3 to 3.1.7" This reverts commit 0f24e806bbf8069980747e546f8ffdf5234e06a7. --- linux/Makefile | 2 +- macos/Dependencies/common.make | 3 ++- windows/Makefile | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/linux/Makefile b/linux/Makefile index f886aa44..91f26f0a 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -334,7 +334,7 @@ $(DOWNLOADS)/ruby/configure: $(DOWNLOADS)/ruby/configure.ac cd $(DOWNLOADS)/ruby; autoreconf -i $(DOWNLOADS)/ruby/configure.ac: - $(CLONE) $(GITHUB)/mkxp-z/ruby $(DOWNLOADS)/ruby --single-branch --branch mkxp-z-3.1.7 --depth 1 + $(CLONE) $(GITHUB)/mkxp-z/ruby $(DOWNLOADS)/ruby --single-branch --branch mkxp-z-3.1.3 --depth 1; # ==== init_dirs: diff --git a/macos/Dependencies/common.make b/macos/Dependencies/common.make index 078dc305..408319ee 100644 --- a/macos/Dependencies/common.make +++ b/macos/Dependencies/common.make @@ -317,7 +317,8 @@ $(DOWNLOADS)/ruby/configure: $(DOWNLOADS)/ruby/configure.ac cd $(DOWNLOADS)/ruby; autoreconf -i $(DOWNLOADS)/ruby/configure.ac: - $(CLONE) $(GITHUB)/mkxp-z/ruby $(DOWNLOADS)/ruby --single-branch -b mkxp-z-3.1.7 --depth 1 + $(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 453b8563..87b11db0 100755 --- a/windows/Makefile +++ b/windows/Makefile @@ -314,7 +314,7 @@ $(DOWNLOADS)/ruby/configure: $(DOWNLOADS)/ruby/configure.ac cd $(DOWNLOADS)/ruby; autoreconf -i $(DOWNLOADS)/ruby/configure.ac: - $(CLONE) $(GITHUB)/mkxp-z/ruby $(DOWNLOADS)/ruby --single-branch --branch mkxp-z-3.1.7 --depth 1 + $(CLONE) $(GITHUB)/mkxp-z/ruby $(DOWNLOADS)/ruby --single-branch --branch mkxp-z-3.1.3 --depth 1; # ==== init_dirs: From 93c3e972d5cd6206942d178be8454f8c41d2b972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=9A=93?= Date: Wed, 2 Apr 2025 13:09:41 -0400 Subject: [PATCH 09/10] Fix builds with CMake 4 --- linux/Makefile | 2 ++ macos/Dependencies/common.make | 1 + windows/Makefile | 2 ++ 3 files changed, 5 insertions(+) diff --git a/linux/Makefile b/linux/Makefile index 3ee14767..8eee5350 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -33,6 +33,7 @@ ifdef ARCH_CMAKE_TOOLCHAIN ARCH_CMAKE_ARGS := -DCMAKE_TOOLCHAIN_FILE="${PWD}/$(ARCH_CMAKE_TOOLCHAIN)" endif CMAKE_ARGS := \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.10 \ -DCMAKE_INSTALL_PREFIX="$(BUILD_PREFIX)" \ -DCMAKE_PREFIX_PATH="$(BUILD_PREFIX)" \ -DCMAKE_C_FLAGS="$(CFLAGS)" \ @@ -302,6 +303,7 @@ $(DOWNLOADS)/fluidsynth/cmakebuild/Makefile: $(DOWNLOADS)/fluidsynth/CMakeLists. $(DOWNLOADS)/fluidsynth/CMakeLists.txt: $(CLONE) $(GITHUB)/mkxp-z/fluidsynth-sans-glib $(DOWNLOADS)/fluidsynth + sed -i 's/"$${CMAKE_COMMAND}" -D/"$${CMAKE_COMMAND}" -DCMAKE_POLICY_VERSION_MINIMUM=3.10 -D/g' $(DOWNLOADS)/fluidsynth/src/CMakeLists.txt # OpenSSL openssl: init_dirs $(LIBDIR)/libssl.a diff --git a/macos/Dependencies/common.make b/macos/Dependencies/common.make index f11623f5..6203c8f0 100644 --- a/macos/Dependencies/common.make +++ b/macos/Dependencies/common.make @@ -31,6 +31,7 @@ CONFIGURE_ARGS := \ --host=$(HOST) CMAKE_ARGS := \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.10 \ -DCMAKE_INSTALL_PREFIX="$(BUILD_PREFIX)" \ -DCMAKE_PREFIX_PATH="$(BUILD_PREFIX)" \ -DCMAKE_OSX_ARCHITECTURES=$(ARCH) \ diff --git a/windows/Makefile b/windows/Makefile index 11b2327c..a46e75c9 100755 --- a/windows/Makefile +++ b/windows/Makefile @@ -29,6 +29,7 @@ CONFIGURE_ENV := \ CONFIGURE_ARGS := --prefix="$(BUILD_PREFIX)" CMAKE_ARGS := \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.10 \ -DCMAKE_INSTALL_PREFIX="$(BUILD_PREFIX)" \ -DCMAKE_PREFIX_PATH="$(BUILD_PREFIX)" \ -DCMAKE_C_FLAGS="$(CFLAGS)" \ @@ -282,6 +283,7 @@ $(DOWNLOADS)/fluidsynth/cmakebuild/Makefile: $(DOWNLOADS)/fluidsynth/CMakeLists. $(DOWNLOADS)/fluidsynth/CMakeLists.txt: $(CLONE) $(GITHUB)/mkxp-z/fluidsynth-sans-glib $(DOWNLOADS)/fluidsynth + sed -i 's/"$${CMAKE_COMMAND}" -D/"$${CMAKE_COMMAND}" -DCMAKE_POLICY_VERSION_MINIMUM=3.10 -D/g' $(DOWNLOADS)/fluidsynth/src/CMakeLists.txt # OpenSSL openssl: init_dirs $(LIBDIR)/libssl.a From 97235e068a5669fe38aea7c2f20ba321dfb4877c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=9A=93?= Date: Thu, 1 May 2025 17:55:38 -0400 Subject: [PATCH 10/10] Use environment variable to set CMake policy instead of -D flag This applies recursively unlike the other method. --- linux/Makefile | 3 +-- macos/Dependencies/common.make | 2 +- windows/Makefile | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/linux/Makefile b/linux/Makefile index 8eee5350..5a717360 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)" @@ -33,7 +34,6 @@ ifdef ARCH_CMAKE_TOOLCHAIN ARCH_CMAKE_ARGS := -DCMAKE_TOOLCHAIN_FILE="${PWD}/$(ARCH_CMAKE_TOOLCHAIN)" endif CMAKE_ARGS := \ - -DCMAKE_POLICY_VERSION_MINIMUM=3.10 \ -DCMAKE_INSTALL_PREFIX="$(BUILD_PREFIX)" \ -DCMAKE_PREFIX_PATH="$(BUILD_PREFIX)" \ -DCMAKE_C_FLAGS="$(CFLAGS)" \ @@ -303,7 +303,6 @@ $(DOWNLOADS)/fluidsynth/cmakebuild/Makefile: $(DOWNLOADS)/fluidsynth/CMakeLists. $(DOWNLOADS)/fluidsynth/CMakeLists.txt: $(CLONE) $(GITHUB)/mkxp-z/fluidsynth-sans-glib $(DOWNLOADS)/fluidsynth - sed -i 's/"$${CMAKE_COMMAND}" -D/"$${CMAKE_COMMAND}" -DCMAKE_POLICY_VERSION_MINIMUM=3.10 -D/g' $(DOWNLOADS)/fluidsynth/src/CMakeLists.txt # OpenSSL openssl: init_dirs $(LIBDIR)/libssl.a diff --git a/macos/Dependencies/common.make b/macos/Dependencies/common.make index 6203c8f0..2bd90e29 100644 --- a/macos/Dependencies/common.make +++ b/macos/Dependencies/common.make @@ -23,6 +23,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)" @@ -31,7 +32,6 @@ CONFIGURE_ARGS := \ --host=$(HOST) CMAKE_ARGS := \ - -DCMAKE_POLICY_VERSION_MINIMUM=3.10 \ -DCMAKE_INSTALL_PREFIX="$(BUILD_PREFIX)" \ -DCMAKE_PREFIX_PATH="$(BUILD_PREFIX)" \ -DCMAKE_OSX_ARCHITECTURES=$(ARCH) \ diff --git a/windows/Makefile b/windows/Makefile index a46e75c9..72a72c59 100755 --- a/windows/Makefile +++ b/windows/Makefile @@ -23,13 +23,13 @@ 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)" CONFIGURE_ARGS := --prefix="$(BUILD_PREFIX)" CMAKE_ARGS := \ - -DCMAKE_POLICY_VERSION_MINIMUM=3.10 \ -DCMAKE_INSTALL_PREFIX="$(BUILD_PREFIX)" \ -DCMAKE_PREFIX_PATH="$(BUILD_PREFIX)" \ -DCMAKE_C_FLAGS="$(CFLAGS)" \ @@ -283,7 +283,6 @@ $(DOWNLOADS)/fluidsynth/cmakebuild/Makefile: $(DOWNLOADS)/fluidsynth/CMakeLists. $(DOWNLOADS)/fluidsynth/CMakeLists.txt: $(CLONE) $(GITHUB)/mkxp-z/fluidsynth-sans-glib $(DOWNLOADS)/fluidsynth - sed -i 's/"$${CMAKE_COMMAND}" -D/"$${CMAKE_COMMAND}" -DCMAKE_POLICY_VERSION_MINIMUM=3.10 -D/g' $(DOWNLOADS)/fluidsynth/src/CMakeLists.txt # OpenSSL openssl: init_dirs $(LIBDIR)/libssl.a