Adjust includes to allow custom DPF headers

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

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
 

source/backend/plugin/CarlaPluginLV2.cpp

@@ -17,7 +17,7 @@
 #include "CarlaScopeUtils.hpp"
 #include "Lv2AtomRingBuffer.hpp"
 
-#include "distrho/extra/Base64.hpp"
+#include "extra/Base64.hpp"
 
 #include "../modules/lilv/config/lilv_config.h"
 

source/backend/utils/Information.cpp

@@ -25,7 +25,7 @@
 # pragma GCC diagnostic pop
 #endif
 
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 #include "water/files/File.h"
 
 // -------------------------------------------------------------------------------------------------------------------

source/backend/utils/PluginDiscovery.cpp

@@ -10,7 +10,7 @@
 #include "CarlaScopeUtils.hpp"
 #include "CarlaSha1Utils.hpp"
 
-#include "distrho/extra/Time.hpp"
+#include "extra/Time.hpp"
 
 #include "water/files/File.h"
 #include "water/files/FileInputStream.h"

source/bridges-plugin/CarlaBridgePlugin.cpp

@@ -37,7 +37,7 @@
 # include <X11/Xlib.h>
 #endif
 
-#include "distrho/extra/Sleep.hpp"
+#include "extra/Sleep.hpp"
 
 #include "water/files/File.h"
 #include "water/misc/Time.h"

source/bridges-ui/CarlaBridgeFormat.cpp

@@ -8,8 +8,8 @@
 
 #include "CarlaMIDI.h"
 
-#include "distrho/extra/Base64.hpp"
-#include "distrho/extra/Sleep.hpp"
+#include "extra/Base64.hpp"
+#include "extra/Sleep.hpp"
 
 // needed for atom-util
 #ifndef nullptr

source/bridges-ui/CarlaBridgeFormat.hpp

@@ -9,7 +9,7 @@
 #include "CarlaLibUtils.hpp"
 #include "CarlaPipeUtils.hpp"
 
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 
 #include "lv2/atom.h"
 #include "lv2/urid.h"

source/bridges-ui/CarlaBridgeToolkitNative.cpp

@@ -12,7 +12,7 @@
 # include "CarlaMacUtils.hpp"
 #endif
 
-#include "distrho/extra/Sleep.hpp"
+#include "extra/Sleep.hpp"
 
 #if defined(HAVE_X11) && defined(BRIDGE_X11)
 # include <X11/Xlib.h>

source/discovery/carla-discovery.cpp

@@ -16,7 +16,7 @@
 #include "CarlaVst3Utils.hpp"
 #include "CarlaClapUtils.hpp"
 
-#include "distrho/extra/ScopedPointer.hpp"
+#include "extra/ScopedPointer.hpp"
 
 #ifndef BUILDING_CARLA_FOR_WINE
 # include "CarlaPipeUtils.cpp"

source/frontend/carla_frontend.cpp

@@ -25,7 +25,7 @@ void carla_frontend_createAndExecAboutDialog(QWidget* const parent,
 // jackappdialog
 
 #include "dialogs/jackappdialog.hpp"
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 
 const JackAppDialogResults*
 carla_frontend_createAndExecJackAppDialog(QWidget* const parent, const char* const projectFilename)

source/frontend/pluginlist/pluginlistdialog.cpp

@@ -32,7 +32,7 @@
 #include "CarlaJuceUtils.hpp"
 #include "CarlaUtils.h"
 
-#include "distrho/extra/ScopedPointer.hpp"
+#include "extra/ScopedPointer.hpp"
 
 #include <cstdlib>
 

source/includes/CarlaNativePrograms.hpp

@@ -9,7 +9,7 @@
 #include "CarlaMathUtils.hpp"
 #include "CarlaMutex.hpp"
 
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 
 #include "water/files/File.h"
 #include "water/memory/SharedResourcePointer.h"

source/libjack/libjack.cpp

@@ -6,7 +6,7 @@
 #include "CarlaThread.hpp"
 #include "CarlaJuceUtils.hpp"
 
-#include "distrho/extra/Time.hpp"
+#include "extra/Time.hpp"
 
 #include <signal.h>
 #include <sys/time.h>

source/modules/sfzero/sfzero/SFZSample.h

@@ -9,7 +9,7 @@
 
 #include "SFZCommon.h"
 
-#include "distrho/extra/ScopedPointer.hpp"
+#include "extra/ScopedPointer.hpp"
 #include "water/buffers/AudioSampleBuffer.h"
 #include "water/files/File.h"
 

source/modules/water/containers/HashMap.h

@@ -29,7 +29,7 @@
 #include "Array.h"
 #include "../text/String.h"
 
-#include "distrho/extra/ScopedPointer.hpp"
+#include "extra/ScopedPointer.hpp"
 
 namespace water {
 

source/modules/water/containers/OwnedArray.h

@@ -28,7 +28,7 @@
 
 #include "ArrayAllocationBase.h"
 
-#include "distrho/extra/ScopedPointer.hpp"
+#include "extra/ScopedPointer.hpp"
 
 namespace water {
 

source/modules/water/files/DirectoryIterator.h

@@ -29,7 +29,7 @@
 #include "File.h"
 #include "../text/StringArray.h"
 
-#include "distrho/extra/ScopedPointer.hpp"
+#include "extra/ScopedPointer.hpp"
 
 namespace water {
 

source/modules/water/files/TemporaryFile.cpp

@@ -26,7 +26,7 @@
 #include "TemporaryFile.h"
 #include "../maths/Random.h"
 
-#include "distrho/extra/Sleep.hpp"
+#include "extra/Sleep.hpp"
 
 namespace water {
 

source/modules/water/memory/SharedResourcePointer.h

@@ -29,7 +29,7 @@
 #include "ReferenceCountedObject.h"
 #include "../threads/SpinLock.h"
 
-#include "distrho/extra/ScopedPointer.hpp"
+#include "extra/ScopedPointer.hpp"
 
 namespace water {
 

source/modules/water/threads/ChildProcess.cpp

@@ -39,7 +39,7 @@
 
 #include "CarlaProcessUtils.hpp"
 
-#include "distrho/extra/Sleep.hpp"
+#include "extra/Sleep.hpp"
 
 namespace water {
 

source/modules/water/threads/ChildProcess.h

@@ -28,7 +28,7 @@
 
 #include "../text/StringArray.h"
 
-#include "distrho/extra/ScopedPointer.hpp"
+#include "extra/ScopedPointer.hpp"
 
 namespace water {
 

source/modules/water/xml/XmlDocument.h

@@ -28,7 +28,7 @@
 
 #include "../text/StringArray.h"
 
-#include "distrho/extra/ScopedPointer.hpp"
+#include "extra/ScopedPointer.hpp"
 
 namespace water {
 

source/native-plugins/external

@@ -1 +1 @@
-Subproject commit d5b1e35ba585f2f8b78d0b13505894a2c233136c
+Subproject commit d53b62e9b948c26494ff9f43ce611110ce0ef4c7

source/plugin/carla-lv2-export.cpp

@@ -22,7 +22,7 @@
 #include "lv2/lv2_external_ui.h"
 #include "lv2/lv2_programs.h"
 
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 #include "water/files/File.h"
 #include "water/text/StringArray.h"
 

source/plugin/carla-lv2-ui.cpp

@@ -8,7 +8,7 @@
 #include "CarlaLv2Utils.hpp"
 #include "CarlaPipeUtils.hpp"
 
-#include "distrho/extra/ScopedSafeLocale.hpp"
+#include "extra/ScopedSafeLocale.hpp"
 
 // --------------------------------------------------------------------------------------------------------------------
 

source/plugin/carla-lv2.cpp

@@ -8,7 +8,7 @@
 #include "CarlaMathUtils.hpp"
 #include "CarlaPipeUtils.hpp"
 
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 #include "water/files/File.h"
 
 static const char* const kPathForCarlaFiles = "carlafiles";

source/utils/CarlaBackendUtils.hpp

@@ -8,7 +8,7 @@
 #include "CarlaNative.h"
 #include "CarlaUtils.hpp"
 
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 
 CARLA_BACKEND_START_NAMESPACE
 

source/utils/CarlaBinaryUtils.hpp

@@ -6,7 +6,7 @@
 
 #include "CarlaBackend.h"
 
-#include "distrho/extra/ScopedPointer.hpp"
+#include "extra/ScopedPointer.hpp"
 
 #if defined(BUILDING_CARLA)
 # include "water/files/FileInputStream.h"

source/utils/CarlaBridgeUtils.cpp

@@ -4,7 +4,7 @@
 #include "CarlaBridgeUtils.hpp"
 #include "CarlaShmUtils.hpp"
 
-#include "distrho/extra/Sleep.hpp"
+#include "extra/Sleep.hpp"
 
 // must be last
 #include "jackbridge/JackBridge.hpp"

source/utils/CarlaBridgeUtils.hpp

@@ -8,7 +8,7 @@
 #include "CarlaMutex.hpp"
 #include "CarlaRingBuffer.hpp"
 
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 
 // -------------------------------------------------------------------------------------------------------------------
 

source/utils/CarlaExternalUI.hpp

@@ -6,7 +6,7 @@
 
 #include "CarlaPipeUtils.hpp"
 
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 
 // -----------------------------------------------------------------------
 

source/utils/CarlaJsfxUtils.hpp

@@ -7,7 +7,7 @@
 
 #include "CarlaBackend.h"
 
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 #include "water/files/File.h"
 
 #ifdef YSFX_API

source/utils/CarlaMacUtils.cpp

@@ -7,7 +7,7 @@
 
 #include "CarlaMacUtils.hpp"
 
-#include "distrho/extra/String.hpp"
+#include "extra/String.hpp"
 
 #include <sys/xattr.h>
 

source/utils/CarlaPipeUtils.cpp

@@ -6,9 +6,9 @@
 #include "CarlaScopeUtils.hpp"
 #include "CarlaMIDI.h"
 
-#include "distrho/extra/Sleep.hpp"
-#include "distrho/extra/String.hpp"
-#include "distrho/extra/Time.hpp"
+#include "extra/Sleep.hpp"
+#include "extra/String.hpp"
+#include "extra/Time.hpp"
 
 // needed for atom-util
 #ifndef nullptr

source/utils/CarlaRunner.hpp

@@ -9,7 +9,7 @@
 #ifndef CARLA_OS_WASM
 # include "CarlaThread.hpp"
 #else
-# include "distrho/extra/String.hpp"
+# include "extra/String.hpp"
 # include <emscripten/html5.h>
 #endif
 

source/utils/CarlaThread.hpp

@@ -6,8 +6,8 @@
 
 #include "CarlaMutex.hpp"
 #include "CarlaProcessUtils.hpp"
-#include "distrho/extra/Sleep.hpp"
-#include "distrho/extra/String.hpp"
+#include "extra/Sleep.hpp"
+#include "extra/String.hpp"
 
 #ifdef CARLA_OS_WASM
 # error Threads do not work under wasm!