Simplify makefile a bit

.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

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

dpf

@@ -1 +1 @@
-Subproject commit f1925ebcc22a412ac2ae5c5b5d2c50851052654d
+Subproject commit 639c5100f2ac0a8ce2077f29020e91f673d7c2f8

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