From 0ffc67ee9b8f6ddff70e9e07e212fa06fd32dca2 Mon Sep 17 00:00:00 2001 From: Paul Date: Tue, 8 Aug 2023 08:34:38 -0400 Subject: [PATCH] Patch for the 2.4.0 SDK (#908) - plugin-arm to plugin - modify github workflows - no functional changes --- .github/workflows/build-plugin.yml | 2 +- Makefile | 2 +- RackSDK.cmake | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-plugin.yml b/.github/workflows/build-plugin.yml index 020e2d12..a309d932 100644 --- a/.github/workflows/build-plugin.yml +++ b/.github/workflows/build-plugin.yml @@ -2,7 +2,7 @@ name: Build VCV Rack Plugin on: [push, pull_request] env: - rack-sdk-version: 2.3.0 + rack-sdk-version: 2.4.0 rack-plugin-toolchain-dir: /home/build/rack-plugin-toolchain defaults: diff --git a/Makefile b/Makefile index 831cbbdc..ac9306ce 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ ifdef ARCH_MAC RACK_PLUGIN_EXT := dylib ifdef ARCH_ARM64 EXTRA_CMAKE := -DCMAKE_OSX_ARCHITECTURES="arm64" - RACK_PLUGIN_ARCH := -arm64 + # RACK_PLUGIN_ARCH := -arm64 endif endif diff --git a/RackSDK.cmake b/RackSDK.cmake index 0abbf435..d0be6ff9 100644 --- a/RackSDK.cmake +++ b/RackSDK.cmake @@ -1,6 +1,6 @@ # Mapping of plugin build definitions from the Rack-SDK arch.mk, compile.mk, dep.mk and plugin.mk to CMake. -set(RACK_SDK_VERSION 2.2.2) +set(RACK_SDK_VERSION 2.4.0) message(STATUS "Load RackSDK.cmake (mapping based on Rack-SDK-${RACK_SDK_VERSION})") if ("${RACK_SDK_DIR}" STREQUAL "") @@ -29,7 +29,7 @@ endif () # Do not change the RACK_PLUGIN_LIB! if (${CMAKE_OSX_ARCHITECTURES} MATCHES "arm64") - set(RACK_PLUGIN_ARCH -arm64) + #set(RACK_PLUGIN_ARCH -arm64) endif () set(RACK_PLUGIN_LIB plugin${RACK_PLUGIN_ARCH})