Browse Source

Fix osx build

tags/v2.1-alpha1-winvst
parent
commit
fabac8d276
4 changed files with 22 additions and 3 deletions
  1. +6
    -0
      source/backend/Makefile
  2. +7
    -0
      source/bridges-plugin/Makefile
  3. +3
    -3
      source/modules/juce_audio_processors/juce_audio_processors.cpp
  4. +6
    -0
      source/plugin/Makefile

+ 6
- 0
source/backend/Makefile View File

@@ -48,6 +48,9 @@ ifeq ($(MACOS_OR_WIN32),true)
STANDALONE_LIBS += $(MODULEDIR)/juce_graphics.a
STANDALONE_LIBS += $(MODULEDIR)/juce_gui_basics.a
endif
ifeq ($(MACOS),true)
STANDALONE_LIBS += $(MODULEDIR)/juce_gui_extra.a
endif
else
STANDALONE_LIBS += $(MODULEDIR)/rtaudio.a
STANDALONE_LIBS += $(MODULEDIR)/rtmidi.a
@@ -77,6 +80,9 @@ ifeq ($(MACOS_OR_WIN32),true)
STANDALONE_LINK_FLAGS += $(JUCE_GRAPHICS_LIBS)
STANDALONE_LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS)
endif
ifeq ($(MACOS),true)
STANDALONE_LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS)
endif
else
STANDALONE_LINK_FLAGS += $(RTAUDIO_LIBS)
STANDALONE_LINK_FLAGS += $(RTMIDI_LIBS)


+ 7
- 0
source/bridges-plugin/Makefile View File

@@ -114,6 +114,13 @@ LIBS_win32 += $(MODULEDIR)/juce_gui_basics.win32.a
LIBS_win64 += $(MODULEDIR)/juce_gui_basics.win64.a
LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS)
endif

ifeq ($(MACOS),true)
LIBS_native += $(MODULEDIR)/juce_gui_extra.a
LIBS_posix32 += $(MODULEDIR)/juce_gui_extra.posix32.a
LIBS_posix64 += $(MODULEDIR)/juce_gui_extra.posix64.a
LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS)
endif
endif

LINK_FLAGS += $(X11_LIBS)


+ 3
- 3
source/modules/juce_audio_processors/juce_audio_processors.cpp View File

@@ -114,7 +114,7 @@ struct AutoResizingNSViewComponentWithParent : public AutoResizingNSViewCompone
AutoResizingNSViewComponent::AutoResizingNSViewComponent()
: recursive (false) {}
void AutoResizingNSViewComponent::childBoundsChanged (Component*) override
void AutoResizingNSViewComponent::childBoundsChanged (Component*)
{
if (recursive)
{
@@ -128,7 +128,7 @@ void AutoResizingNSViewComponent::childBoundsChanged (Component*) override
}
}
void AutoResizingNSViewComponent::handleAsyncUpdate() override
void AutoResizingNSViewComponent::handleAsyncUpdate()
{
resizeToFitView();
}
@@ -152,7 +152,7 @@ JUCE_IOS_MAC_VIEW* AutoResizingNSViewComponentWithParent::getChildView() const
return nil;
}
void AutoResizingNSViewComponentWithParent::timerCallback() override
void AutoResizingNSViewComponentWithParent::timerCallback()
{
if (JUCE_IOS_MAC_VIEW* child = getChildView())
{


+ 6
- 0
source/plugin/Makefile View File

@@ -69,6 +69,9 @@ ifeq ($(MACOS_OR_WIN32),true)
LIBS += $(MODULEDIR)/juce_graphics.a
LIBS += $(MODULEDIR)/juce_gui_basics.a
endif
ifeq ($(MACOS),true)
LIBS += $(MODULEDIR)/juce_gui_extra.a
endif
endif

# ---------------------------------------------------------------------------------------------------------------------
@@ -96,6 +99,9 @@ ifeq ($(MACOS_OR_WIN32),true)
LINK_FLAGS += $(JUCE_GRAPHICS_LIBS)
LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS)
endif
ifeq ($(MACOS),true)
LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS)
endif
endif

ifeq ($(MACOS),true)


Loading…
Cancel
Save