diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 42f9fee..71bec68 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ name: build on: [push, pull_request] env: - CACHE_VERSION: 9 + CACHE_VERSION: 10 CARDINAL_UNDER_WINE: 1 CIBUILD: true DEBIAN_FRONTEND: noninteractive @@ -333,7 +333,7 @@ jobs: run: | ${{ matrix.target == 'nosimd' }} && export PAWPAW_NOSIMD=1 source deps/PawPaw/local.env wasm - make HAVE_LIBLO=false NOOPT=true NOSIMD=${{ matrix.target == 'nosimd' }} -j $(nproc) -C src/CardinalMiniSep modgui + make HAVE_LIBLO=false NOOPT=true NOSIMD=${{ matrix.target == 'nosimd' }} -j $(nproc) modgui - name: Make wasm versioned and compress if: steps.cache.outputs.cache-hit == 'true' shell: bash diff --git a/Makefile b/Makefile index 57d0d12..8623ca3 100644 --- a/Makefile +++ b/Makefile @@ -10,12 +10,11 @@ include $(ROOT)/Makefile.base.mk # Set version # also set in: -# jucewrapper/CMakeLists.txt `project` # src/CardinalCommon.cpp `CARDINAL_VERSION` # src/CardinalPlugin.cpp `getVersion` # utils/macOS/Info_{JACK,Native}.plist -# jucewrapper/CMakeLists.txt src/CardinalCommon.cpp src/CardinalPlugin.cpp utils/macOS/Info_{JACK,Native}.plist -VERSION = 24.01 +# src/CardinalCommon.cpp src/CardinalPlugin.cpp utils/macOS/Info_{JACK,Native}.plist +VERSION = 24.03 # -------------------------------------------------------------- # Build targets @@ -128,7 +127,6 @@ EXTRA_MOD_FLAGS += -ffat-lto-objects endif MOD_ENVIRONMENT += HEADLESS=true -MOD_ENVIRONMENT += MOD_BUILD=true MOD_ENVIRONMENT += STATIC_BUILD=true # -------------------------------------------------------------- @@ -227,6 +225,9 @@ vst2: carla deps dgl plugins resources vst3: carla deps dgl plugins resources $(MAKE) vst3 -C src $(CARLA_EXTRA_ARGS) +modgui: + $(MAKE) modgui -C src/CardinalMiniSep + # -------------------------------------------------------------- # Packaging standalone for CI diff --git a/deps/PawPaw b/deps/PawPaw index 7771775..b84d0ec 160000 --- a/deps/PawPaw +++ b/deps/PawPaw @@ -1 +1 @@ -Subproject commit 777177562ef39836b9e0963e7910d55e3d2d0636 +Subproject commit b84d0ec2d1bb5c7d7fd05d4a8d7f4af71306c425 diff --git a/dpf b/dpf index 0ceb411..045b943 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 0ceb411fde5192ad4aaa1c89b079a861e4dac5df +Subproject commit 045b943199393053c606b530fc882661502d53d7 diff --git a/src/CardinalCommon.cpp b/src/CardinalCommon.cpp index 266a0fc..ed36098 100644 --- a/src/CardinalCommon.cpp +++ b/src/CardinalCommon.cpp @@ -99,7 +99,7 @@ void destroyStaticPlugins(); } } -const std::string CARDINAL_VERSION = "24.01"; +const std::string CARDINAL_VERSION = "24.03"; START_NAMESPACE_DISTRHO diff --git a/src/CardinalPlugin.cpp b/src/CardinalPlugin.cpp index 92c44ac..f89338b 100644 --- a/src/CardinalPlugin.cpp +++ b/src/CardinalPlugin.cpp @@ -406,7 +406,7 @@ protected: uint32_t getVersion() const override { - return d_version(0, 24, 1); + return d_version(0, 24, 3); } int64_t getUniqueId() const override diff --git a/utils/macOS/Info_JACK.plist b/utils/macOS/Info_JACK.plist index b8e72f9..9df338c 100644 --- a/utils/macOS/Info_JACK.plist +++ b/utils/macOS/Info_JACK.plist @@ -11,11 +11,11 @@ CFBundleIdentifier studio.kx.distrho.cardinal.jack CFBundleShortVersionString - 23.01 + 23.03 LSMinimumSystemVersion 10.15 NSHumanReadableCopyright - (C) 2011-2023 Filipe Coelho. + (C) 2011-2024 Filipe Coelho. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or any later version. NSHighResolutionCapable diff --git a/utils/macOS/Info_Native.plist b/utils/macOS/Info_Native.plist index 2fd3e06..ed61faf 100644 --- a/utils/macOS/Info_Native.plist +++ b/utils/macOS/Info_Native.plist @@ -11,11 +11,11 @@ CFBundleIdentifier studio.kx.distrho.cardinal.native CFBundleShortVersionString - 24.01 + 24.03 LSMinimumSystemVersion 10.15 NSHumanReadableCopyright - (C) 2011-2023 Filipe Coelho. + (C) 2011-2024 Filipe Coelho. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or any later version. NSHighResolutionCapable