From a720e52c9a6cf4fe9ccfa16c8ead2565331a39c0 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 19 Jan 2019 20:06:58 +0100 Subject: [PATCH] juce_gui_extra is needed on macOS Signed-off-by: falkTX --- Makefile | 3 +++ source/modules/AppConfig.h | 7 ++++++- source/modules/Makefile | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8d86aec1d..0f8bb43c2 100644 --- a/Makefile +++ b/Makefile @@ -67,6 +67,9 @@ ifeq ($(MACOS_OR_WIN32),true) ALL_LIBS += $(MODULEDIR)/juce_graphics.a ALL_LIBS += $(MODULEDIR)/juce_gui_basics.a endif +ifeq ($(MACOS),true) +ALL_LIBS += $(MODULEDIR)/juce_gui_extra.a +endif else ALL_LIBS += $(MODULEDIR)/rtaudio.a ALL_LIBS += $(MODULEDIR)/rtmidi.a diff --git a/source/modules/AppConfig.h b/source/modules/AppConfig.h index 0eb19de91..f5ec9b078 100644 --- a/source/modules/AppConfig.h +++ b/source/modules/AppConfig.h @@ -38,7 +38,6 @@ #define JUCE_MODULE_AVAILABLE_juce_audio_utils 0 #define JUCE_MODULE_AVAILABLE_juce_cryptography 0 #define JUCE_MODULE_AVAILABLE_juce_opengl 0 -#define JUCE_MODULE_AVAILABLE_juce_gui_extra 0 #define JUCE_MODULE_AVAILABLE_juce_video 0 // conditional @@ -50,6 +49,12 @@ # define JUCE_MODULE_AVAILABLE_juce_gui_basics 0 #endif +#if defined(APPCONFIG_OS_MAC) +# define JUCE_MODULE_AVAILABLE_juce_gui_extra 1 +#else +# define JUCE_MODULE_AVAILABLE_juce_gui_extra 0 +#endif + #ifndef BUILD_BRIDGE # define JUCE_MODULE_AVAILABLE_juce_audio_devices 1 #else diff --git a/source/modules/Makefile b/source/modules/Makefile index defab7201..77fa95b63 100644 --- a/source/modules/Makefile +++ b/source/modules/Makefile @@ -26,5 +26,6 @@ clean: $(MAKE) clean -C juce_events $(MAKE) clean -C juce_graphics $(MAKE) clean -C juce_gui_basics + $(MAKE) clean -C juce_gui_extra # ----------------------------------------------------------------------------------------------------------------------------