From 637870a30301a37c0462b929717409b53a479321 Mon Sep 17 00:00:00 2001 From: "taylor.fish" Date: Fri, 9 Feb 2024 02:25:01 -0800 Subject: [PATCH] Use correct VST 3 directory name on PowerPC Should be ppc[64][le]-linux, depending on word size and endianness. --- Makefile.base.mk | 4 +++- cmake/DPF-plugin.cmake | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.base.mk b/Makefile.base.mk index f808218a3..7418f7d02 100644 --- a/Makefile.base.mk +++ b/Makefile.base.mk @@ -688,7 +688,9 @@ endif # Set VST3 binary directory, see https://vst3sdk-doc.diatonic.jp/doc/vstinterfaces/vst3loc.html ifeq ($(LINUX),true) -VST3_BINARY_DIR = Contents/$(TARGET_PROCESSOR)-linux +# This must match `uname -m`, which differs from `gcc -dumpmachine` on PowerPC. +VST3_ARCHITECTURE := $(patsubst powerpc%,ppc%,$(TARGET_PROCESSOR)) +VST3_BINARY_DIR = Contents/$(VST3_ARCHITECTURE)-linux else ifeq ($(MACOS),true) VST3_BINARY_DIR = Contents/MacOS else ifeq ($(WASM),true) diff --git a/cmake/DPF-plugin.cmake b/cmake/DPF-plugin.cmake index 35be66f15..1d052a6ff 100644 --- a/cmake/DPF-plugin.cmake +++ b/cmake/DPF-plugin.cmake @@ -456,7 +456,7 @@ function(dpf__determine_vst3_package_architecture OUTPUT_VARIABLE) else() set(vst3_package_arch "i386") endif() - elseif(vst3_system_arch MATCHES "^(armv[3-8][a-z]*)$") + elseif(vst3_system_arch MATCHES "^(armv[3-8][a-z]*|ppc(64)?(le)?)$") set(vst3_package_arch "${vst3_system_arch}") elseif(vst3_system_arch MATCHES "^(aarch64)$") set(vst3_package_arch "aarch64")