Adjust includes to allow custom DPF headers

Signed-off-by: falkTX <falktx@falktx.com>

Author: falkTX

source/Makefile.mk

@@ -182,8 +182,11 @@ BASE_FLAGS += -DDGL_NAMESPACE=CarlaDGL
 endif
 endif
 
-ifneq ($(USING_CUSTOM_DPF),true)
+ifeq ($(USING_CUSTOM_DPF),true)
+BASE_FLAGS += -I$(CUSTOM_DPF_PATH)/distrho
+else
 BASE_FLAGS += -DDGL_NO_SHARED_RESOURCES
+BASE_FLAGS += -I$(CWD)/modules/distrho
 endif
 
 ifeq ($(HAVE_FLUIDSYNTH),true)

source/backend/CarlaHostImpl.hpp

@@ -28,7 +28,7 @@
 # define CARLA_CAN_USE_LOG_THREAD
 # include "CarlaLogThread.hpp"
 #else
-# include "distrho/extra/String.hpp"
+# include "extra/String.hpp"
 #endif
 
 namespace CB = CARLA_BACKEND_NAMESPACE;

source/backend/CarlaStandalone.cpp

@@ -13,8 +13,8 @@
 #include "CarlaBackendUtils.hpp"
 #include "ThreadSafeFFTW.hpp"
 
-#include "distrho/extra/Base64.hpp"
-#include "distrho/extra/ScopedPointer.hpp"
+#include "extra/Base64.hpp"
+#include "extra/ScopedPointer.hpp"
 
 #include "water/files/File.h"
 

source/backend/engine/CarlaEngineBridge.cpp

@@ -23,8 +23,8 @@
 # include <xmmintrin.h>
 #endif
 
-#include "distrho/extra/Base64.hpp"
-#include "distrho/extra/Time.hpp"
+#include "extra/Base64.hpp"
+#include "extra/Time.hpp"
 
 #include "water/files/File.h"
 #include "water/misc/Time.h"

source/backend/engine/CarlaEngineDummy.cpp

@@ -5,7 +5,7 @@
 #include "CarlaEngineInit.hpp"
 #include "CarlaEngineInternal.hpp"
 
-#include "distrho/extra/Time.hpp"
+#include "extra/Time.hpp"
 
 CARLA_BACKEND_START_NAMESPACE
 

source/backend/engine/CarlaEngineNative.cpp

@@ -25,7 +25,7 @@
 #include "CarlaNative.hpp"
 #include "CarlaNativePlugin.h"
 
-#include "distrho/extra/Base64.hpp"
+#include "extra/Base64.hpp"
 
 #include "water/files/File.h"
 #include "water/streams/MemoryOutputStream.h"

source/backend/engine/CarlaEngineOsc.hpp

@@ -13,7 +13,7 @@
 #include "CarlaJuceUtils.hpp"
 #include "CarlaOscUtils.hpp"
 
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 
 #define CARLA_ENGINE_OSC_HANDLE_ARGS const CarlaPluginPtr& plugin, \
   const int argc, const lo_arg* const* const argv, const char* const types

source/backend/plugin/CarlaPlugin.cpp

@@ -13,8 +13,8 @@
 
 #include <ctime>
 
-#include "distrho/extra/Base64.hpp"
-#include "distrho/extra/ScopedPointer.hpp"
+#include "extra/Base64.hpp"
+#include "extra/ScopedPointer.hpp"
 
 #include "water/files/File.h"
 #include "water/streams/MemoryOutputStream.h"

source/backend/plugin/CarlaPluginBridge.cpp

@@ -16,8 +16,8 @@
 
 #include <ctime>
 
-#include "distrho/extra/Base64.hpp"
-#include "distrho/extra/Time.hpp"
+#include "extra/Base64.hpp"
+#include "extra/Time.hpp"
 
 #include "water/files/File.h"
 #include "water/misc/Time.h"

source/backend/plugin/CarlaPluginInternal.hpp

@@ -14,7 +14,7 @@
 #include "CarlaMutex.hpp"
 #include "RtLinkedList.hpp"
 
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 
 CARLA_BACKEND_START_NAMESPACE