Update DPF again, don't build DGL shared resources

data/copy-dpf-stuff

@@ -4,8 +4,14 @@ set -e
 
 cp    -v /home/falktx/FOSS/GIT-mine/DISTRHO/DPF/dgl/*.hpp /home/falktx/FOSS/GIT-mine/falkTX/Carla/source/modules/dgl/
 cp -r -v /home/falktx/FOSS/GIT-mine/DISTRHO/DPF/dgl/src   /home/falktx/FOSS/GIT-mine/falkTX/Carla/source/modules/dgl/
+cp -r -v /home/falktx/FOSS/GIT-mine/DISTRHO/DPF/distrho/* /home/falktx/FOSS/GIT-mine/falkTX/Carla/source/modules/distrho/ || true
 
-cp -r -v /home/falktx/FOSS/GIT-mine/DISTRHO/DPF/distrho/*   /home/falktx/FOSS/GIT-mine/falkTX/Carla/source/modules/distrho/
+rm -r /home/falktx/FOSS/GIT-mine/falkTX/Carla/source/modules/dgl/src/resources
+rm -r /home/falktx/FOSS/GIT-mine/falkTX/Carla/source/modules/dgl/src/sofd
+rm    /home/falktx/FOSS/GIT-mine/falkTX/Carla/source/modules/dgl/src/Resources.*
+
+rm    /home/falktx/FOSS/GIT-mine/falkTX/Carla/source/modules/distrho/src/DistrhoPlugin{Jack,LADSPA+DSSI,LV2,LV2export,VST}.cpp
+rm    /home/falktx/FOSS/GIT-mine/falkTX/Carla/source/modules/distrho/src/DistrhoUI{DSSI,LV2}.cpp
 
 # cp -v /home/falktx/FOSS/GIT-mine/DISTRHO/DISTRHO_mini-series/plugins/3BandEQ/{*.cpp,*.hpp,*.h}       /home/falktx/FOSS/GIT-mine/falkTX/Carla/source/modules/native-plugins/3bandeq/
 # cp -v /home/falktx/FOSS/GIT-mine/DISTRHO/DISTRHO_mini-series/plugins/3BandSplitter/{*.cpp,*.hpp,*.h} /home/falktx/FOSS/GIT-mine/falkTX/Carla/source/modules/native-plugins/3bandsplitter/

source/modules/dgl/Makefile

@@ -21,7 +21,6 @@ OBJS = \
 	$(OBJDIR)/Image.cpp.o \
 	$(OBJDIR)/ImageWidgets.cpp.o \
 	$(OBJDIR)/NanoVG.cpp.o \
-	$(OBJDIR)/Resources.cpp.o \
 	$(OBJDIR)/Widget.cpp.o
 
 ifeq ($(MACOS),true)

source/modules/dgl/NanoVG.hpp

@@ -20,7 +20,9 @@
 #include "Color.hpp"
 #include "Widget.hpp"
 
-#define NANOVG_DEJAVU_SANS_TTF "__dpf_dejavusans_ttf__"
+#ifndef DGL_NO_SHARED_RESOURCES
+# define NANOVG_DEJAVU_SANS_TTF "__dpf_dejavusans_ttf__"
+#endif
 
 struct NVGcontext;
 struct NVGpaint;
@@ -844,10 +846,12 @@ public:
     */
     int textBreakLines(const char* string, const char* end, float breakRowWidth, TextRow& rows, int maxRows);
 
+#ifndef DGL_NO_SHARED_RESOURCES
    /**
       Load DPF's internal shared resources for this NanoVG class.
     */
     virtual void loadSharedResources();
+#endif
 
 private:
     NVGcontext* const fContext;

source/modules/dgl/src/NanoVG.cpp

@@ -15,9 +15,12 @@
  */
 
 #include "../NanoVG.hpp"
-#include "Resources.hpp"
 #include "WidgetPrivateData.hpp"
 
+#ifndef DGL_NO_SHARED_RESOURCES
+# include "Resources.hpp"
+#endif
+
 // -----------------------------------------------------------------------
 
 #if defined(DISTRHO_OS_WINDOWS)
@@ -895,6 +898,7 @@ int NanoVG::textBreakLines(const char* string, const char* end, float breakRowWi
     return 0;
 }
 
+#ifndef DGL_NO_SHARED_RESOURCES
 void NanoVG::loadSharedResources()
 {
     if (nvgFindFont(fContext, NANOVG_DEJAVU_SANS_TTF) >= 0)
@@ -904,6 +908,7 @@ void NanoVG::loadSharedResources()
 
     nvgCreateFontMem(fContext, NANOVG_DEJAVU_SANS_TTF, (const uchar*)dejavusans_ttf, dejavusans_ttf_size, 0);
 }
+#endif
 
 // -----------------------------------------------------------------------
 

source/native-plugins/external/Makefile.mk

@@ -82,7 +82,7 @@ DGL_FLAGS  = $(shell pkg-config --cflags gl x11)
 DGL_LIBS   = $(shell pkg-config --libs gl x11)
 endif
 
-DGL_FLAGS += -DDGL_NAMESPACE=CarlaDGL -DDGL_FILE_BROWSER_DISABLED
+DGL_FLAGS += -DDGL_NAMESPACE=CarlaDGL -DDGL_FILE_BROWSER_DISABLED -DDGL_NO_SHARED_RESOURCES
 endif
 
 # ---------------------------------------------------------------------------------------------------------------------
@@ -98,7 +98,7 @@ endif
 DPF_FLAGS  = -I$(CWDE)/modules/distrho
 
 ifeq ($(HAVE_DGL),true)
-DPF_FLAGS += -I$(CWDE)/modules/dgl -DDGL_NAMESPACE=CarlaDGL -DDGL_FILE_BROWSER_DISABLED
+DPF_FLAGS += -I$(CWDE)/modules/dgl -DDGL_NAMESPACE=CarlaDGL -DDGL_FILE_BROWSER_DISABLED -DDGL_NO_SHARED_RESOURCES
 endif
 
 # ---------------------------------------------------------------------------------------------------------------------