Skip to content

Commit

Permalink
Fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
FigBug committed May 16, 2024
1 parent 6c4446d commit 5e1261d
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 13 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
1 change: 0 additions & 1 deletion examples/Demo/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/Demo/Source/MainComponent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
1 change: 0 additions & 1 deletion examples/Effect/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion examples/Synth/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/gin_plugin/components/gin_msegcomponent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion modules/gin_plugin/components/gin_multiparamcomponent.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions modules/gin_plugin/components/gin_parambox.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions modules/gin_plugin/components/gin_patchbrowser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion modules/gin_plugin/lookandfeel/gin_copperlookandfeel.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 5e1261d

Please sign in to comment.