Compilation fixes

plugdata-team · Dec 3, 2023 · 4130094 · 4130094
1 parent 009c876
commit 4130094
Show file tree

Hide file tree

Showing 19 changed files with 24 additions and 22 deletions.
diff --git a/Libraries/CMakeLists.txt b/Libraries/CMakeLists.txt
@@ -428,9 +428,8 @@ if("${CMAKE_SYSTEM}" MATCHES "Linux")
     add_library(pd INTERFACE)
     add_library(pd-multi INTERFACE)
     find_library(MATH_LIB m)
-    target_link_libraries(pd INTERFACE ${MATH_LIB} ${CMAKE_DL_LIBS} externals pd-src ${externals_libs})
-    target_link_libraries(pd-multi INTERFACE ${MATH_LIB} ${CMAKE_DL_LIBS} externals-multi pd-src-multi ${externals_libs})
-
+    target_link_libraries(externals ${externals_libs})
+    target_link_libraries(externals-multi ${externals_libs})
 elseif(MSVC)
     add_library(pd SHARED $<TARGET_OBJECTS:externals> $<TARGET_OBJECTS:pd-src>)
     add_library(pd-multi STATIC $<TARGET_OBJECTS:externals-multi> $<TARGET_OBJECTS:pd-src-multi>)

diff --git a/Source/Components/ObjectDragAndDrop.h b/Source/Components/ObjectDragAndDrop.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <JuceHeader.h>
+#include <juce_gui_basics/juce_gui_basics.h>
 #include "ZoomableDragAndDropContainer.h"
 #include "Utility/OfflineObjectRenderer.h"
 #include "../PluginEditor.h"

diff --git a/Source/Components/ZoomableDragAndDropContainer.h b/Source/Components/ZoomableDragAndDropContainer.h
@@ -25,7 +25,8 @@
 
 #pragma once
 
-#include <JuceHeader.h>
+#include <juce_gui_basics/juce_gui_basics.h>
+#include "Utility/Config.h"
 
 //==============================================================================
 /**

diff --git a/Source/Dialogs/Dialogs.cpp b/Source/Dialogs/Dialogs.cpp
@@ -5,6 +5,7 @@
  */
 
 #include <juce_gui_basics/juce_gui_basics.h>
+#include <juce_gui_extra/juce_gui_extra.h>
 #include <juce_audio_devices/juce_audio_devices.h>
 
 #include <utility>

diff --git a/Source/Dialogs/ObjectBrowserDialog.h b/Source/Dialogs/ObjectBrowserDialog.h
@@ -4,7 +4,7 @@
  // WARRANTIES, see the file, "LICENSE.txt," in this distribution.
  */
 
-#include <JuceHeader.h>
+#include <juce_gui_basics/juce_gui_basics.h>
 #include <utility>
 
 #include "Components/BouncingViewport.h"

diff --git a/Source/Dialogs/ObjectReferenceDialog.h b/Source/Dialogs/ObjectReferenceDialog.h
@@ -5,7 +5,7 @@
  // WARRANTIES, see the file, "LICENSE.txt," in this distribution.
  */
 
-#include <JuceHeader.h>
+#include <juce_gui_basics/juce_gui_basics.h>
 #include "LookAndFeel.h"
 #include "PluginEditor.h"
 #include "PluginProcessor.h"

diff --git a/Source/Dialogs/TextEditorDialog.h b/Source/Dialogs/TextEditorDialog.h
@@ -13,6 +13,7 @@
 
 #include <utility>
 
+#include "Utility/Config.h"
 #include "Constants.h"
 
 #define GUTTER_WIDTH 48.f

diff --git a/Source/Object.h b/Source/Object.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "Utility/ModifierKeyListener.h"
-#include <JuceHeader.h>
+#include <juce_gui_basics/juce_gui_basics.h>
 #include "Utility/SettingsFile.h"
 #include "Utility/RateReducer.h"
 #include "Pd/WeakReference.h"

diff --git a/Source/Objects/KnobObject.h b/Source/Objects/KnobObject.h
@@ -4,7 +4,7 @@
  // WARRANTIES, see the file, "LICENSE.txt," in this distribution.
  */
 
-#include <JuceHeader.h>
+#include <juce_gui_basics/juce_gui_basics.h>
 #include "TclColours.h"
 
 extern "C" {

diff --git a/Source/Pd/Instance.h b/Source/Pd/Instance.h
@@ -283,8 +283,8 @@ class Instance {
     // JYG added this
     void* dataBufferReceiver = nullptr;
 
-    std::atomic<bool> canUndo = false;
-    std::atomic<bool> canRedo = false;
+    std::atomic<bool> undoAvailable = false;
+    std::atomic<bool> redoAvailable = false;
 
     inline static const String defaultPatch = "#N canvas 827 239 527 327 12;";
 

diff --git a/Source/Sidebar/PaletteItem.h b/Source/Sidebar/PaletteItem.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <JuceHeader.h>
-
+#include <juce_gui_basics/juce_gui_basics.h>
 #include "LookAndFeel.h"
 #include "Pd/Instance.h"
 #include "Components/ObjectDragAndDrop.h"

diff --git a/Source/Sidebar/Palettes.h b/Source/Sidebar/Palettes.h
@@ -4,7 +4,7 @@
  // WARRANTIES, see the file, "LICENSE.txt," in this distribution.
  */
 #pragma once
-#include <JuceHeader.h>
+#include <juce_gui_basics/juce_gui_basics.h>
 #include "Canvas.h"
 #include "Connection.h"
 #include "Dialogs/Dialogs.h"

diff --git a/Source/Tabbar/ResizableTabbedComponent.h b/Source/Tabbar/ResizableTabbedComponent.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <JuceHeader.h>
+#include <juce_gui_basics/juce_gui_basics.h>
 #include "Tabbar.h"
 #include "Utility/SplitModeEnum.h"
 

diff --git a/Source/Tabbar/SplitView.h b/Source/Tabbar/SplitView.h
@@ -6,8 +6,7 @@
 
 #pragma once
 
-#include <JuceHeader.h>
-
+#include <juce_gui_basics/juce_gui_basics.h>
 #include "SplitViewResizer.h"
 #include "ResizableTabbedComponent.h"
 

diff --git a/Source/Tabbar/SplitViewResizer.h b/Source/Tabbar/SplitViewResizer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <JuceHeader.h>
+#include <juce_gui_basics/juce_gui_basics.h>
 #include "Tabbar.h"
 #include "Utility/SplitModeEnum.h"
 #include "Utility/RateReducer.h"

diff --git a/Source/Tabbar/TabBarButtonComponent.h b/Source/Tabbar/TabBarButtonComponent.h
@@ -6,7 +6,8 @@
 
 #pragma once
 
-#include <JuceHeader.h>
+#include <juce_gui_basics/juce_gui_basics.h>
+#include "Utility/Config.h"
 
 class CloseTabButton;
 class TabComponent;

diff --git a/Source/Utility/ObjectThemeManager.h b/Source/Utility/ObjectThemeManager.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <JuceHeader.h>
+#include <juce_gui_basics/juce_gui_basics.h>
 
 /*
  * This is a static class that handles all theming & formatting for UI objects placed onto the canvas

diff --git a/Source/Utility/OfflineObjectRenderer.h b/Source/Utility/OfflineObjectRenderer.h
@@ -6,7 +6,8 @@
 
 #pragma once
 
-#include <JuceHeader.h>
+#include <juce_gui_basics/juce_gui_basics.h>
+#include "Utility/Config.h"
 #include "Pd/Instance.h"
 
 class ImageWithOffset {

diff --git a/Source/Utility/StackShadow.h b/Source/Utility/StackShadow.h
@@ -14,7 +14,7 @@
 // https://gist.github.com/benjamin9999/3809142
 // http://www.antigrain.com/__code/include/agg_blur.h.html
 
-#include <JuceHeader.h>
+#include <juce_gui_basics/juce_gui_basics.h>
 #include "Utility/HashUtils.h"
 #include "Utility/Config.h"