From 69072da3c90d85a7e47dc3c1558cfdf1311d878f Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Tue, 9 Aug 2022 23:39:16 +0100
Subject: [PATCH] Simplify makefile a bit

---
 .github/workflows/build.yml | 2 +-
 deps/Makefile               | 9 +++------
 dpf                         | 2 +-
 plugins/Makefile            | 5 +----
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 86ba46c..2f4b991 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ on:
   push:
 
 env:
-  CACHE_VERSION: 29
+  CACHE_VERSION: 30
   CARDINAL_UNDER_WINE: 1
   DEBIAN_FRONTEND: noninteractive
   HOMEBREW_NO_AUTO_UPDATE: 1
diff --git a/deps/Makefile b/deps/Makefile
index 96b61c9..e4d1db9 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -66,15 +66,12 @@ BUILD_CXX_FLAGS += -U_GLIBCXX_ASSERTIONS -Wp,-U_GLIBCXX_ASSERTIONS
 # --------------------------------------------------------------
 # override VCV arch.mk stuff so we can build more architectures
 
-ifeq ($(CPU_AARCH64),true)
-ARCH_NAME = aarch64
-MACHINE = x86_64-the-rack
+ifeq ($(CPU_ARM32),true)
+ARCH_NAME = arm
+MACHINE = i686-the-rack
 else ifeq ($(CPU_ARM64),true)
 ARCH_NAME = arm64
 MACHINE = x86_64-the-rack
-else ifeq ($(CPU_ARM),true)
-ARCH_NAME = arm
-MACHINE = i686-the-rack
 else ifeq ($(WASM),true)
 MACHINE = i686-wasm
 else
diff --git a/dpf b/dpf
index f1925eb..639c510 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit f1925ebcc22a412ac2ae5c5b5d2c50851052654d
+Subproject commit 639c5100f2ac0a8ce2077f29020e91f673d7c2f8
diff --git a/plugins/Makefile b/plugins/Makefile
index ed6c6b3..767a3fa 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -1042,10 +1042,7 @@ BASE_FLAGS += -ffat-lto-objects
 endif
 endif
 
-ifeq ($(BSD),true)
-BASE_FLAGS += -D'aligned_alloc_16(ptr)'='aligned_alloc(16,ptr)'
-BASE_FLAGS += -D'aligned_free_16(ptr)'='free(ptr)'
-else ifeq ($(WASM),true)
+ifeq ($(BSD)$(WASM),true)
 BASE_FLAGS += -D'aligned_alloc_16(ptr)'='aligned_alloc(16,ptr)'
 BASE_FLAGS += -D'aligned_free_16(ptr)'='free(ptr)'
 endif