Browse Source

Fix some blank panels not having matching background color

tags/22.02
falkTX 3 years ago
parent
commit
809558eb71
3 changed files with 28 additions and 0 deletions
  1. +13
    -0
      plugins/Makefile
  2. +5
    -0
      src/Makefile
  3. +10
    -0
      src/override/dep.cpp

+ 13
- 0
plugins/Makefile View File

@@ -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 $<"


+ 5
- 0
src/Makefile View File

@@ -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 $<"


+ 10
- 0
src/override/dep.cpp View File

@@ -20,6 +20,8 @@
#include <cstdio>
#include <cstring>

#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


Loading…
Cancel
Save