Skip to content

Commit

Permalink
update to Rack SDK 2.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
qno committed Jan 3, 2023
1 parent 8672fbb commit 07fd476
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build VCV Rack Plugin
on: [push, pull_request]

env:
rack-sdk-version: 2.2.1
rack-sdk-version: 2.2.2
rack-plugin-toolchain-dir: /home/build/rack-plugin-toolchain

defaults:
Expand Down
11 changes: 8 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,25 @@ RACK_DIR ?= ../..
include $(RACK_DIR)/arch.mk

EXTRA_CMAKE :=
RACK_PLUGIN := plugin.so
RACK_PLUGIN_NAME := plugin
RACK_PLUGIN_ARCH :=
RACK_PLUGIN_EXT := so

ifdef ARCH_WIN
RACK_PLUGIN := plugin.dll
RACK_PLUGIN_EXT := dll
endif

ifdef ARCH_MAC
EXTRA_CMAKE := -DCMAKE_OSX_ARCHITECTURES="x86_64"
RACK_PLUGIN := plugin.dylib
RACK_PLUGIN_EXT := dylib
ifdef ARCH_ARM64
EXTRA_CMAKE := -DCMAKE_OSX_ARCHITECTURES="arm64"
RACK_PLUGIN_ARCH := -arm64
endif
endif

RACK_PLUGIN := $(RACK_PLUGIN_NAME)$(RACK_PLUGIN_ARCH).$(RACK_PLUGIN_EXT)

CMAKE_BUILD ?= dep/cmake-build
cmake_rack_plugin := $(CMAKE_BUILD)/$(RACK_PLUGIN)

Expand Down
7 changes: 5 additions & 2 deletions RackSDK.cmake
Original file line number Diff line number Diff line change
@@ -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.1)
set(RACK_SDK_VERSION 2.2.2)
message(STATUS "Load RackSDK.cmake (mapping based on Rack-SDK-${RACK_SDK_VERSION})")

if ("${RACK_SDK_DIR}" STREQUAL "")
Expand All @@ -22,7 +22,10 @@ if ("${ADDITIONAL_PLUGIN_DISTRIBUTABLES}" STREQUAL "")
endif ()

# Do not change the RACK_PLUGIN_LIB!
set(RACK_PLUGIN_LIB plugin)
if (${CMAKE_OSX_ARCHITECTURES} MATCHES "arm64")
set(RACK_PLUGIN_ARCH -arm64)
endif ()
set(RACK_PLUGIN_LIB plugin${RACK_PLUGIN_ARCH})

file(GLOB LICENSE LICENSE*)
set(PLUGIN_DISTRIBUTABLES plugin.json res ${LICENSE} ${ADDITIONAL_PLUGIN_DISTRIBUTABLES})
Expand Down

0 comments on commit 07fd476

Please sign in to comment.