Fix build

FigBug · May 16, 2024 · 5e1261d · 5e1261d
1 parent 6c4446d
commit 5e1261d
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,7 @@ set (CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 project(Gin VERSION 1.0.0)
 
-set (CMAKE_OSX_DEPLOYMENT_TARGET 10.9)
+set (CMAKE_OSX_DEPLOYMENT_TARGET 10.13)
 
 add_subdirectory(juce)
 

diff --git a/examples/Demo/CMakeLists.txt b/examples/Demo/CMakeLists.txt
@@ -78,7 +78,6 @@ set (config_is_debug "$<IN_LIST:$<CONFIG>,${debug_configs}>")
 set (config_is_release "$<NOT:${config_is_debug}>")
 
 target_compile_definitions (Demo PRIVATE 
- JUCE_DISPLAY_SPLASH_SCREEN=0
  JUCE_MODAL_LOOPS_PERMITTED=0
  JUCE_WEB_BROWSER=0
  JUCE_SILENCE_XCODE_15_LINKER_WARNING=1

diff --git a/examples/Demo/Source/MainComponent.cpp b/examples/Demo/Source/MainComponent.cpp
@@ -45,7 +45,7 @@ struct TextRenderDemo final : public juce::Component
  setName ("Wave to Text Render");
 
  addAndMakeVisible (text);
- text.setFont (juce::Font (juce::Font::getDefaultMonospacedFontName(), 10.0f, juce::Font::plain));
+ text.setFont (juce::Font (juce::FontOptions (juce::Font::getDefaultMonospacedFontName(), 10.0f, juce::Font::plain)));
  text.setReadOnly (true);
  text.setMultiLine (true, false);
 

diff --git a/examples/Effect/CMakeLists.txt b/examples/Effect/CMakeLists.txt
@@ -81,7 +81,6 @@ set (config_is_debug "$<IN_LIST:$<CONFIG>,${debug_configs}>")
 set (config_is_release "$<NOT:${config_is_debug}>")
 
 target_compile_definitions (Effect PRIVATE 
- JUCE_DISPLAY_SPLASH_SCREEN=0
  JUCE_MODAL_LOOPS_PERMITTED=0
  JUCE_COREGRAPHICS_DRAW_ASYNC=1
  JUCE_VST3_CAN_REPLACE_VST2=0

diff --git a/examples/Synth/CMakeLists.txt b/examples/Synth/CMakeLists.txt
@@ -88,7 +88,6 @@ set (config_is_debug "$<IN_LIST:$<CONFIG>,${debug_configs}>")
 set (config_is_release "$<NOT:${config_is_debug}>")
 
 target_compile_definitions (Synth PRIVATE 
- JUCE_DISPLAY_SPLASH_SCREEN=0
  JUCE_MODAL_LOOPS_PERMITTED=1
  JUCE_COREGRAPHICS_DRAW_ASYNC=1
  JUCE_VST3_CAN_REPLACE_VST2=0

diff --git a/modules/gin_plugin/components/gin_msegcomponent.cpp b/modules/gin_plugin/components/gin_msegcomponent.cpp
@@ -457,7 +457,7 @@ void MSEGComponent::showBubbleMessage (const juce::Rectangle<int>& rc, const juc
  }
 
  juce::AttributedString attString;
- attString.append (message, juce::Font (13.0f));
+ attString.append (message, juce::Font (juce::FontOptions (13.0f)));
  attString.setColour (juce::Colours::white);
 
  bubbleMessage->setAlwaysOnTop (true);

diff --git a/modules/gin_plugin/components/gin_multiparamcomponent.h b/modules/gin_plugin/components/gin_multiparamcomponent.h
@@ -38,7 +38,7 @@ class MultiParamComponent : public juce::Component,
  }
 
  juce::AttributedString attString;
- attString.append (text, juce::Font (13.0f));
+ attString.append (text, juce::FontOptions (13.0f));
  attString.setColour (juce::Colours::white);
 
  auto rcg = p->getLocalArea (this, rc);

diff --git a/modules/gin_plugin/components/gin_parambox.h b/modules/gin_plugin/components/gin_parambox.h
@@ -36,7 +36,7 @@ class ParamHeader : public juce::Component
  g.setColour (findColour (PluginLookAndFeel::whiteColourId).withAlpha (0.15f));
  g.fillRect (rc.removeFromTop (1));
 
- auto f = juce::Font ().withPointHeight (10.0).withExtraKerningFactor (0.25);
+ auto f = juce::Font (juce::FontOptions()).withPointHeight (10.0).withExtraKerningFactor (0.25);
 
  g.setColour (findColour (PluginLookAndFeel::whiteColourId).withAlpha (0.6f));
  g.drawText (name.toUpperCase(), getLocalBounds(), juce::Justification::centred);
@@ -86,7 +86,7 @@ class HeaderButton : public juce::Button,
 private:
  void paintButton (juce::Graphics& g, bool, bool) override
  {
- auto f = juce::Font ().withPointHeight (10.0).withExtraKerningFactor (0.25);
+ auto f = juce::Font (juce::FontOptions()).withPointHeight (10.0).withExtraKerningFactor (0.25);
 
  g.setColour (getToggleState() ? findColour (PluginLookAndFeel::accentColourId).withAlpha (0.6f) : findColour (PluginLookAndFeel::whiteColourId).withAlpha (0.6f));
  g.drawText (getButtonText().toUpperCase(), getLocalBounds(), juce::Justification::centred);

diff --git a/modules/gin_plugin/components/gin_patchbrowser.cpp b/modules/gin_plugin/components/gin_patchbrowser.cpp
@@ -276,7 +276,7 @@ void PatchBrowser::AuthorsModel::paintListBoxItem (int row, juce::Graphics& g, i
  g.fillRect (rc);
 
  g.setColour (owner.findColour (PluginLookAndFeel::whiteColourId, true).withAlpha (0.9f));
- g.setFont (juce::Font (14));
+ g.setFont (juce::Font (juce::FontOptions (14)));
  g.drawText (owner.currentAuthors[row], rc.reduced (4, 0), juce::Justification::centredLeft);
 }
 
@@ -310,7 +310,7 @@ void PatchBrowser::TagsModel::paintListBoxItem (int row, juce::Graphics& g, int
  g.fillRect (rc);
 
  g.setColour (owner.findColour (PluginLookAndFeel::whiteColourId, true).withAlpha (0.9f));
- g.setFont (juce::Font (14));
+ g.setFont (juce::Font (juce::FontOptions (14)));
  g.drawText (owner.currentTags[row], rc.reduced (4, 0), juce::Justification::centredLeft);
 }
 
@@ -343,7 +343,7 @@ void PatchBrowser::PresetsModel::paintListBoxItem (int row, juce::Graphics& g, i
  g.fillRect (rc);
 
  g.setColour (owner.findColour (PluginLookAndFeel::whiteColourId, true).withAlpha (0.9f));
- g.setFont (juce::Font (14));
+ g.setFont (juce::Font (juce::FontOptions (14)));
  g.drawText (owner.currentPresets[row], rc.reduced (4, 0), juce::Justification::centredLeft);
 }
 

diff --git a/modules/gin_plugin/lookandfeel/gin_copperlookandfeel.h b/modules/gin_plugin/lookandfeel/gin_copperlookandfeel.h
@@ -38,7 +38,7 @@ class CopperLookAndFeel : public PluginLookAndFeel
  juce::PopupMenu::Options getOptionsForComboBoxPopupMenu (juce::ComboBox& box, juce::Label&) override;
 
  int getAlertWindowButtonHeight() override { return 20; }
- juce::Font getLabelFont (juce::Label&) override { return juce::Font (10); }
+ juce::Font getLabelFont (juce::Label&) override { return juce::Font (juce::FontOptions (10)); }
 
  juce::SharedResourcePointer<Images> images;