Drop JuceHeader.h, include JUCE modules directly (surge-synthesizer#4816

) JuceHeader.h is a generated header that includes all enabled JUCE modules. This was bloating the preprocessed sources of many Surge TUs by hundreds of KBytes each (on Linux), slowing down the build somewhat. Also, JuceHeader.h is generated at build time, impairing IDE navigation and completion until halfway through an initial build. This change includes only the required JUCE modules directly, which is supported in CMake projects as per the documentation.
baconpaul · Aug 10, 2021 · b0bb41c · b0bb41c
1 parent 78be91c
commit b0bb41c
Show file tree

Hide file tree

Showing 51 changed files with 191 additions and 169 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -557,7 +557,7 @@ target_include_directories(surge-shared
         ${SURGE_COMMON_INCLUDES}
         ${OS_INCLUDE_DIRECTORIES}
         )
-target_compile_definitions(surge-shared PRIVATE ${OS_COMPILE_DEFINITIONS} )
+target_compile_definitions(surge-shared PUBLIC ${OS_COMPILE_DEFINITIONS} )
 
 if( BUILD_HEADLESS )
   add_executable(surge-headless
@@ -585,7 +585,6 @@ if( BUILD_HEADLESS )
   target_compile_definitions(surge-headless
     PRIVATE
     ${OS_COMPILE_DEFINITIONS}
-    TARGET_HEADLESS=1
     $<IF:$<CONFIG:DEBUG>,BUILD_IS_DEBUG,BUILD_IS_RELEASE>=1
   )
 
@@ -745,8 +744,6 @@ if( BUILD_SURGE_EFFECTS_BANK )
           FORMATS ${SURGE_JUCE_FORMATS}
           )
 
-  juce_generate_juce_header( surge-fx )
-
   file(GLOB SURGE_FX_BANK_RESOURCES_GLOB
           resources/surge_effects_bank/*.svg
           resources/surge_effects_bank/icons/*.svg
@@ -780,9 +777,6 @@ if( BUILD_SURGE_EFFECTS_BANK )
 
           JUCE_WASAPI=1
           JUCE_DIRECTSOUND=1
-
-          TARGET_HEADLESS=1
-
           )
 
   if (JUCE_ASIO_SUPPORT)
@@ -891,8 +885,6 @@ if( BUILD_SURGE_XT )
           FORMATS ${SURGE_JUCE_FORMATS}
           )
 
-  juce_generate_juce_header( surge-xt )
-
   file(GLOB SURGE_SYNTH_JUCE_RESOURCES_GLOB
           resources/classic-skin-svgs/*.svg
           resources/fonts/Lato*ttf
@@ -954,10 +946,6 @@ if( BUILD_SURGE_XT )
           SURGE_JUCE_HOST_CONTEXT=${SURGE_JUCE_HOST_CONTEXT_DEFINE}
           SURGE_JUCE_VST3_EXTENSIONS=${SURGE_JUCE_VST3_EXTENSIONS}
 
-          TARGET_JUCE_SYNTH=1
-          TARGET_HEADLESS=1
-          TARGET_JUCE_UI=1
-
           $<IF:$<CONFIG:DEBUG>,BUILD_IS_DEBUG,BUILD_IS_RELEASE>=1
           )
 
@@ -1038,15 +1026,6 @@ if( BUILD_SURGE_XT )
       )
   endif()
 
-  target_compile_definitions(surge-xt PUBLIC ${OS_COMPILE_DEFINITIONS} DONT_SET_USING_JUCE_NAMESPACE=1)
-
-  target_compile_definitions(surge-xt_Standalone PUBLIC
-          TARGET_JUCE_SYNTH=1
-          TARGET_HEADLESS=1
-          TARGET_JUCE_UI=1)
-
-  # add_dependencies(surge-juce-pipeline-targets surge-xt_Standalone)
-
   get_target_property( SURGE_XT_OUTPUT_DIR surge-xt RUNTIME_OUTPUT_DIRECTORY )
 
   # Really just a little convnience for BP on lin and win
@@ -1282,7 +1261,6 @@ if( ${BUILD_SURGE_PYTHON_BINDINGS} )
   target_compile_definitions(surgepy
           PRIVATE
           ${OS_COMPILE_DEFINITIONS}
-          TARGET_HEADLESS=1
           $<IF:$<CONFIG:DEBUG>,BUILD_IS_DEBUG,BUILD_IS_RELEASE>=1
           )
 

diff --git a/src/common/dsp/effects/chowdsp/bbd_utils/BBDCompander.h b/src/common/dsp/effects/chowdsp/bbd_utils/BBDCompander.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <JuceHeader.h>
+#include "juce_core/juce_core.h"
 
 /**
  * Signal averager used for BBD companding.

diff --git a/src/gui/AccessibleHelpers.h b/src/gui/AccessibleHelpers.h
@@ -16,11 +16,12 @@
 #ifndef SURGE_XT_ACCESSIBLEHELPERS_H
 #define SURGE_XT_ACCESSIBLEHELPERS_H
 
-#include <JuceHeader.h>
+#if SURGE_JUCE_ACCESSIBLE
 #include "Parameter.h"
 #include "SurgeGUIEditor.h"
 
-#if SURGE_JUCE_ACCESSIBLE
+#include "juce_gui_basics/juce_gui_basics.h"
+
 namespace Surge
 {
 namespace Widgets

diff --git a/src/gui/RuntimeFont.cpp b/src/gui/RuntimeFont.cpp
@@ -14,7 +14,8 @@
 */
 
 #include "RuntimeFont.h"
-#include <JuceHeader.h>
+#include "BinaryData.h"
+
 #include <iostream>
 
 namespace Surge

diff --git a/src/gui/RuntimeFont.h b/src/gui/RuntimeFont.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <JuceHeader.h>
+#include "juce_graphics/juce_graphics.h"
 
 namespace Surge
 {

diff --git a/src/gui/SkinSupport.h b/src/gui/SkinSupport.h
@@ -14,7 +14,7 @@
 #include "DebugHelpers.h"
 #include "globals.h"
 
-#include <JuceHeader.h>
+#include "juce_graphics/juce_graphics.h"
 
 #include "SkinModel.h"
 #include "SkinColors.h"

diff --git a/src/gui/SurgeGUICallbackInterfaces.h b/src/gui/SurgeGUICallbackInterfaces.h
@@ -16,6 +16,8 @@
 #ifndef SURGE_XT_SURGEGUICALLBACKINTERFACES_H
 #define SURGE_XT_SURGEGUICALLBACKINTERFACES_H
 
+#include "juce_gui_basics/juce_gui_basics.h"
+
 namespace Surge
 {
 namespace GUI

diff --git a/src/gui/SurgeGUIEditor.h b/src/gui/SurgeGUIEditor.h
@@ -17,8 +17,6 @@
 
 #include "globals.h"
 
-#include <JuceHeader.h>
-
 #include "SurgeGUICallbackInterfaces.h"
 
 #include "SurgeStorage.h"
@@ -33,6 +31,8 @@
 #include "overlays/OverlayWrapper.h" // This needs to be concrete for inline functions for now
 #include "widgets/ModulatableControlInterface.h"
 
+#include "juce_gui_basics/juce_gui_basics.h"
+
 #include <vector>
 #include <thread>
 #include <atomic>

diff --git a/src/gui/SurgeGUIUtils.cpp b/src/gui/SurgeGUIUtils.cpp
@@ -1,7 +1,8 @@
 #include "SurgeGUIUtils.h"
 
+#include "juce_core/juce_core.h"
+
 #include <cctype>
-#include <JuceHeader.h>
 
 namespace Surge
 {

diff --git a/src/gui/SurgeImage.cpp b/src/gui/SurgeImage.cpp
@@ -13,8 +13,8 @@
 ** open source in September 2018.
 */
 
-#include <JuceHeader.h>
 #include "SurgeImage.h"
+#include "BinaryData.h"
 
 SurgeImage::SurgeImage(int rid)
 {

diff --git a/src/gui/SurgeImage.h b/src/gui/SurgeImage.h
@@ -4,7 +4,7 @@
  * A utility wrapper around loading and drawables and stuff
  */
 
-#include <JuceHeader.h>
+#include "juce_gui_basics/juce_gui_basics.h"
 
 #include <vector>
 #include <map>

diff --git a/src/gui/SurgeImageStore.h b/src/gui/SurgeImageStore.h
@@ -1,11 +1,12 @@
 #pragma once
 
 #include "resource.h"
-#include <JuceHeader.h>
+#include <string>
 #include <map>
 #include <atomic>
 #include <algorithm>
 #include <cctype>
+#include <vector>
 
 class SurgeImage;
 

diff --git a/src/gui/SurgeJUCEHelpers.h b/src/gui/SurgeJUCEHelpers.h
@@ -16,7 +16,7 @@
 #ifndef SURGE_XT_JUCEHELPERS_H
 #define SURGE_XT_JUCEHELPERS_H
 
-#include <JuceHeader.h>
+#include "juce_gui_basics/juce_gui_basics.h"
 
 namespace Surge
 {

diff --git a/src/gui/SurgeJUCELookAndFeel.h b/src/gui/SurgeJUCELookAndFeel.h
@@ -16,7 +16,7 @@
 #ifndef SURGE_XT_SURGEJUCELOOKANDFEEL_H
 #define SURGE_XT_SURGEJUCELOOKANDFEEL_H
 
-#include <JuceHeader.h>
+#include "juce_gui_basics/juce_gui_basics.h"
 
 class SurgeJUCELookAndFeel : public juce::LookAndFeel_V4
 {

diff --git a/src/gui/overlays/AboutScreen.h b/src/gui/overlays/AboutScreen.h
@@ -16,9 +16,10 @@
 #ifndef SURGE_XT_ABOUTSCREEN_H
 #define SURGE_XT_ABOUTSCREEN_H
 
-#include <JuceHeader.h>
 #include "SkinSupport.h"
 
+#include "juce_gui_basics/juce_gui_basics.h"
+
 class SurgeGUIEditor;
 class SurgeStorage;
 

diff --git a/src/gui/overlays/LuaEditors.h b/src/gui/overlays/LuaEditors.h
@@ -20,10 +20,11 @@
 #ifndef SURGE_XT_LUAEDITORS_H
 #define SURGE_XT_LUAEDITORS_H
 
-#include <JuceHeader.h>
 #include "SurgeStorage.h"
 #include "SkinSupport.h"
 
+#include "juce_gui_extra/juce_gui_extra.h"
+
 class SurgeGUIEditor;
 
 namespace Surge

diff --git a/src/gui/overlays/MSEGEditor.h b/src/gui/overlays/MSEGEditor.h
@@ -14,11 +14,12 @@
 */
 
 #pragma once
-#include <JuceHeader.h>
 #include "SurgeStorage.h"
 #include "SkinSupport.h"
 #include "RefreshableOverlay.h"
 
+#include "juce_gui_basics/juce_gui_basics.h"
+
 namespace Surge
 {
 namespace Overlays

diff --git a/src/gui/overlays/MiniEdit.h b/src/gui/overlays/MiniEdit.h
@@ -16,9 +16,10 @@
 #ifndef SURGE_XT_MINIEDIT_H
 #define SURGE_XT_MINIEDIT_H
 
-#include <JuceHeader.h>
 #include "SkinSupport.h"
 
+#include "juce_gui_basics/juce_gui_basics.h"
+
 namespace Surge
 {
 namespace Overlays

diff --git a/src/gui/overlays/ModulationEditor.h b/src/gui/overlays/ModulationEditor.h
@@ -16,7 +16,7 @@
 #ifndef SURGE_XT_MODULATIONEDITOR_H
 #define SURGE_XT_MODULATIONEDITOR_H
 
-#include <JuceHeader.h>
+#include "juce_gui_basics/juce_gui_basics.h"
 
 class SurgeGUIEditor;
 class SurgeSynthesizer;

diff --git a/src/gui/overlays/OverlayWrapper.h b/src/gui/overlays/OverlayWrapper.h
@@ -16,9 +16,10 @@
 #ifndef SURGE_XT_OVERLAYWRAPPER_H
 #define SURGE_XT_OVERLAYWRAPPER_H
 
-#include <JuceHeader.h>
 #include "SkinSupport.h"
 
+#include "juce_gui_basics/juce_gui_basics.h"
+
 class SurgeGUIEditor;
 class SurgeImage;
 

diff --git a/src/gui/overlays/PatchDBViewer.h b/src/gui/overlays/PatchDBViewer.h
@@ -16,9 +16,10 @@
 #ifndef SURGE_PATCHDBVIEWER_H
 #define SURGE_PATCHDBVIEWER_H
 
-#include <JuceHeader.h>
 #include "SurgeStorage.h"
 
+#include "juce_gui_basics/juce_gui_basics.h"
+
 class SurgeGUIEditor;
 
 namespace Surge

diff --git a/src/gui/overlays/PatchStoreDialog.h b/src/gui/overlays/PatchStoreDialog.h
@@ -16,9 +16,10 @@
 #ifndef SURGE_XT_PATCHSTOREDIALOG_H
 #define SURGE_XT_PATCHSTOREDIALOG_H
 
-#include <JuceHeader.h>
 #include "SkinSupport.h"
 
+#include "juce_gui_basics/juce_gui_basics.h"
+
 class SurgeGUIEditor;
 
 namespace Surge

diff --git a/src/gui/overlays/TypeinParamEditor.h b/src/gui/overlays/TypeinParamEditor.h
@@ -16,12 +16,13 @@
 #ifndef SURGE_XT_TYPEINPARAMEDITOR_H
 #define SURGE_XT_TYPEINPARAMEDITOR_H
 
-#include <JuceHeader.h>
 #include "Parameter.h"
 #include "SurgeStorage.h"
 #include "ModulationSource.h"
 #include "SkinSupport.h"
 
+#include "juce_gui_basics/juce_gui_basics.h"
+
 class SurgeGUIEditor;
 
 namespace Surge

diff --git a/src/gui/widgets/EffectChooser.h b/src/gui/widgets/EffectChooser.h
@@ -16,13 +16,15 @@
 #ifndef SURGE_XT_EFFECTCHOOSER_H
 #define SURGE_XT_EFFECTCHOOSER_H
 
-#include <JuceHeader.h>
-#include <array>
 #include "SurgeStorage.h"
 #include "SkinSupport.h"
 #include "WidgetBaseMixin.h"
 #include "SurgeJUCEHelpers.h"
 
+#include "juce_gui_basics/juce_gui_basics.h"
+
+#include <array>
+
 namespace Surge
 {
 namespace Widgets

diff --git a/src/gui/widgets/EffectLabel.h b/src/gui/widgets/EffectLabel.h
@@ -16,9 +16,11 @@
 #ifndef SURGE_XT_EFFECTLABEL_H
 #define SURGE_XT_EFFECTLABEL_H
 
-#include <JuceHeader.h>
 #include "SkinSupport.h"
 #include "RuntimeFont.h"
+
+#include "juce_gui_basics/juce_gui_basics.h"
+
 #include <string>
 
 namespace Surge

diff --git a/src/gui/widgets/LFOAndStepDisplay.h b/src/gui/widgets/LFOAndStepDisplay.h
@@ -16,10 +16,11 @@
 #ifndef SURGE_XT_LFOANDSTEPDISPLAY_H
 #define SURGE_XT_LFOANDSTEPDISPLAY_H
 
-#include <JuceHeader.h>
 #include "WidgetBaseMixin.h"
 #include "SurgeStorage.h"
 
+#include "juce_gui_basics/juce_gui_basics.h"
+
 namespace Surge
 {
 namespace Widgets

diff --git a/src/gui/widgets/MainFrame.h b/src/gui/widgets/MainFrame.h
@@ -16,10 +16,11 @@
 #ifndef SURGE_XT_MAINFRAME_H
 #define SURGE_XT_MAINFRAME_H
 
-#include <JuceHeader.h>
 #include "SurgeImage.h"
 #include "Parameter.h"
 
+#include "juce_gui_basics/juce_gui_basics.h"
+
 class SurgeGUIEditor;
 
 namespace Surge