Build with either JUCE 7 or 8 (#126)

* Build with either JUCE 7 or 8 * darn-windows-dots
surge-synthesizer · Sep 3, 2024 · 62241c6 · 62241c6
1 parent 9a4091a
commit 62241c6
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 8 deletions.
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -24,6 +24,18 @@ jobs:
             name: ubuntu
             cmakeArgs: -DCMAKE_BUILD_TYPE=Debug
 
+          - os: windows-latest
+            name: windows msvc Juce 8
+            cmakeArgs: -DCMAKE_BUILD_TYPE=Debug -DSST_JUCEGUI_JUCE_VERSION="8.0.1"
+
+          - os: macos-latest
+            name: macos Juce 8
+            cmakeArgs: -DCMAKE_BUILD_TYPE=Debug -DSST_JUCEGUI_JUCE_VERSION="8.0.1" -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64"
+
+          - os: ubuntu-latest
+            name: ubuntu Juce 8
+            cmakeArgs: -DCMAKE_BUILD_TYPE=Debug -DSST_JUCEGUI_JUCE_VERSION="8.0.1"
+
           - os: windows-latest
             name: windows unity
             cmakeArgs: -DCMAKE_BUILD_TYPE=Debug -DCMAKE_UNITY_BUILD=TRUE

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,10 +10,13 @@ if (${SST_JUCEGUI_BUILD_EXAMPLES})
     message(STATUS "Including SST JUCEGUI Examples")
 
     if (NOT TARGET juce::juce_gui_basics)
-        message(STATUS "Downloading JUCE")
+        if (NOT DEFINED SST_JUCEGUI_JUCE_VERSION)
+            set(SST_JUCEGUI_JUCE_VERSION 7.0.12)
+        endif()
+        message(STATUS "Downloading JUCE ${SST_JUCEGUI_JUCE_VERSION}")
         set(FETCHCONTENT_QUIET FALSE)
         include(cmake/CPM.cmake)
-        CPMAddPackage("gh:juce-framework/JUCE#7.0.3")
+        CPMAddPackage("gh:juce-framework/JUCE#${SST_JUCEGUI_JUCE_VERSION}")
 
         add_library(JUCE INTERFACE)
     endif ()
@@ -114,7 +117,6 @@ else()
                 JUCE_JACK=0
                 JUCE_ALSA=0
                 JUCE_WASAPI=0
-                JUCE_STANDALONE_APPLICATION=0
                 JUCE_DIRECTSOUND=0)
     endif()
 endif()

diff --git a/include/sst/jucegui/style/StyleAndSettingsConsumer.h b/include/sst/jucegui/style/StyleAndSettingsConsumer.h
@@ -45,7 +45,7 @@ struct StyleConsumer
     {
         if (style())
             return style()->getFont(getStyleClass(), p);
-        return {1};
+        return SST_JUCE_FONT_CTOR(1);
     }
 
     // these don't belong on instances they belong on stylesheets

diff --git a/include/sst/jucegui/style/StyleSheet.h b/include/sst/jucegui/style/StyleSheet.h
@@ -24,6 +24,12 @@
 #include <juce_gui_basics/juce_gui_basics.h>
 #include <cassert>
 
+#if JUCE_VERSION >= 0x080000
+#define SST_JUCE_FONT_CTOR(...) juce::Font(juce::FontOptions(__VA_ARGS__))
+#else
+#define SST_JUCE_FONT_CTOR(...) juce::Font(__VA_ARGS__)
+#endif
+
 namespace sst::jucegui::style
 {
 struct StyleConsumer;

diff --git a/src/sst/jucegui/style/StyleSheet.cpp b/src/sst/jucegui/style/StyleSheet.cpp
@@ -104,7 +104,7 @@ struct StyleSheetBuiltInImpl : public StyleSheet
         {
             for (auto &[pn, f] : propFonts)
             {
-                auto nf = juce::Font(p);
+                auto nf = SST_JUCE_FONT_CTOR(p);
                 nf.setHeight(f.getHeight());
                 f = nf;
             }
@@ -185,7 +185,7 @@ struct StyleSheetBuiltInImpl : public StyleSheet
 
         std::cout << __FILE__ << ":" << __LINE__ << " FONT Missing : " << c.cname << "::" << p.pname
                   << std::endl;
-        return juce::Font(36, juce::Font::italic);
+        return SST_JUCE_FONT_CTOR(36, juce::Font::italic);
     }
     std::optional<juce::Font> getFontOptional(const Class &c, const Property &p) const override
     {
@@ -247,7 +247,7 @@ struct DarkSheet : public StyleSheetBuiltInImpl
             using n = components::base_styles::BaseLabel;
             setColour(n::styleClass, n::labelcolor, juce::Colour(220, 220, 220));
             setColour(n::styleClass, n::labelcolor_hover, juce::Colour(240, 240, 235));
-            setFont(n::styleClass, n::labelfont, juce::Font(13));
+            setFont(n::styleClass, n::labelfont, SST_JUCE_FONT_CTOR(13));
         }
 
         {
@@ -386,7 +386,7 @@ struct LightSheet : public StyleSheetBuiltInImpl
             using n = components::base_styles::BaseLabel;
             setColour(n::styleClass, n::labelcolor, juce::Colour(30, 30, 30));
             setColour(n::styleClass, n::labelcolor_hover, juce::Colour(30, 30, 40));
-            setFont(n::styleClass, n::labelfont, juce::Font(13));
+            setFont(n::styleClass, n::labelfont, SST_JUCE_FONT_CTOR(13));
         }
 
         {