From 809558eb715091e66c527c56922055f0f694cb86 Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 8 Dec 2021 17:02:26 +0000 Subject: [PATCH] Fix some blank panels not having matching background color --- plugins/Makefile | 13 +++++++++++++ src/Makefile | 5 +++++ src/override/dep.cpp | 10 ++++++++++ 3 files changed, 28 insertions(+) diff --git a/plugins/Makefile b/plugins/Makefile index b0b145d..2dad725 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -1049,6 +1049,19 @@ $(BUILD_DIR)/ImpromptuModular%.cpp.o: ImpromptuModular%.cpp -Dinit=init__ImpromptuModular \ -Wno-format-truncation +$(BUILD_DIR)/JW-Modules/src/WavHead.cpp.o: JW-Modules/src/WavHead.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(JW_CUSTOM),$(call custom_module_names,$(m),JW)) \ + -DpluginInstance=pluginInstance__JW \ + -D'nvgRGB(r,g,b)=nvgRGBblank(r,g,b)' \ + -IJW-Modules/src \ + -IJW-Modules/lib/oscpack \ + -Wno-misleading-indentation \ + -Wno-unused-but-set-variable \ + -Wno-unused-result + $(BUILD_DIR)/JW-Modules/%.cpp.o: JW-Modules/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/src/Makefile b/src/Makefile index 8685636..94aa678 100644 --- a/src/Makefile +++ b/src/Makefile @@ -169,6 +169,11 @@ $(BUILD_DIR)/%.c.o: %.c @echo "Compiling $<" $(SILENT)$(CC) $< $(BUILD_C_FLAGS) -c -o $@ +$(BUILD_DIR)/Rack/src/core/Blank.cpp.o: Rack/src/core/Blank.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -UPRIVATE -D'nvgRGB(r,g,b)=nvgRGBblank(r,g,b)' -c -o $@ + $(BUILD_DIR)/Rack/src/core/%.cpp.o: Rack/src/core/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/src/override/dep.cpp b/src/override/dep.cpp index 98e3c07..f582aa8 100644 --- a/src/override/dep.cpp +++ b/src/override/dep.cpp @@ -20,6 +20,8 @@ #include #include +#include "nanovg.h" + // fix blendish build, missing symbol in debug mode #ifndef NDEBUG extern "C" { @@ -39,6 +41,14 @@ float FollowerBase::efGainMaxDecibelsDebug = 12.0f; } #endif +// Special nvgRGB for blank panels +extern "C" { +NVGcolor nvgRGBblank(unsigned char, unsigned char, unsigned char) +{ + return nvgRGB(0x20, 0x20, 0x20); +} +} + // Compile those nice implementation-in-header little libraries #define NANOSVG_IMPLEMENTATION #define NANOSVG_ALL_COLOR_KEYWORDS