From eee0727667690eff6a5625abe6acf321d81614d4 Mon Sep 17 00:00:00 2001 From: Don Cross Date: Wed, 8 May 2024 08:50:58 -0400 Subject: [PATCH] Sapphire v2.4.4 This brings Cardinal in sync with VCV Rack at Sapphire v2.4.4. Minor UI improvements. Corrected C++17 build problems for the Sapphire plugin: I learned not to put anything fancy in plugin.cpp or plugin.hpp! Cardinal's C++11 code must be able to include plugins/Sapphire/plugin.hpp, so I can't put any C++17 code there. This frees me up to use std::clamp, std::make_unique, etc. --- plugins/Makefile | 2 +- plugins/Sapphire | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Makefile b/plugins/Makefile index 90a781c..8719cc1 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -2684,7 +2684,7 @@ $(BUILD_DIR)/repelzen/%.cpp.o: repelzen/%.cpp $(BUILD_DIR)/Sapphire/%.cpp.o: Sapphire/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" - $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -std=gnu++17 -c -o $@ \ $(foreach m,$(SAPPHIRE_CUSTOM),$(call custom_module_names,$(m),Sapphire)) \ -DpluginInstance=pluginInstance__sapphire diff --git a/plugins/Sapphire b/plugins/Sapphire index d26e157..9fe1e5d 160000 --- a/plugins/Sapphire +++ b/plugins/Sapphire @@ -1 +1 @@ -Subproject commit d26e157140ef6283906a33675733ea35e4dd26ac +Subproject commit 9fe1e5d415d69ee31936be1ac05695a7e9ef3eab