Signed-off-by: falkTX <falktx@gmail.com>tags/v2.1-alpha1-winvst
| @@ -67,6 +67,9 @@ ifeq ($(MACOS_OR_WIN32),true) | |||||
| ALL_LIBS += $(MODULEDIR)/juce_graphics.a | ALL_LIBS += $(MODULEDIR)/juce_graphics.a | ||||
| ALL_LIBS += $(MODULEDIR)/juce_gui_basics.a | ALL_LIBS += $(MODULEDIR)/juce_gui_basics.a | ||||
| endif | endif | ||||
| ifeq ($(MACOS),true) | |||||
| ALL_LIBS += $(MODULEDIR)/juce_gui_extra.a | |||||
| endif | |||||
| else | else | ||||
| ALL_LIBS += $(MODULEDIR)/rtaudio.a | ALL_LIBS += $(MODULEDIR)/rtaudio.a | ||||
| ALL_LIBS += $(MODULEDIR)/rtmidi.a | ALL_LIBS += $(MODULEDIR)/rtmidi.a | ||||
| @@ -38,7 +38,6 @@ | |||||
| #define JUCE_MODULE_AVAILABLE_juce_audio_utils 0 | #define JUCE_MODULE_AVAILABLE_juce_audio_utils 0 | ||||
| #define JUCE_MODULE_AVAILABLE_juce_cryptography 0 | #define JUCE_MODULE_AVAILABLE_juce_cryptography 0 | ||||
| #define JUCE_MODULE_AVAILABLE_juce_opengl 0 | #define JUCE_MODULE_AVAILABLE_juce_opengl 0 | ||||
| #define JUCE_MODULE_AVAILABLE_juce_gui_extra 0 | |||||
| #define JUCE_MODULE_AVAILABLE_juce_video 0 | #define JUCE_MODULE_AVAILABLE_juce_video 0 | ||||
| // conditional | // conditional | ||||
| @@ -50,6 +49,12 @@ | |||||
| # define JUCE_MODULE_AVAILABLE_juce_gui_basics 0 | # define JUCE_MODULE_AVAILABLE_juce_gui_basics 0 | ||||
| #endif | #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 | #ifndef BUILD_BRIDGE | ||||
| # define JUCE_MODULE_AVAILABLE_juce_audio_devices 1 | # define JUCE_MODULE_AVAILABLE_juce_audio_devices 1 | ||||
| #else | #else | ||||
| @@ -26,5 +26,6 @@ clean: | |||||
| $(MAKE) clean -C juce_events | $(MAKE) clean -C juce_events | ||||
| $(MAKE) clean -C juce_graphics | $(MAKE) clean -C juce_graphics | ||||
| $(MAKE) clean -C juce_gui_basics | $(MAKE) clean -C juce_gui_basics | ||||
| $(MAKE) clean -C juce_gui_extra | |||||
| # ---------------------------------------------------------------------------------------------------------------------------- | # ---------------------------------------------------------------------------------------------------------------------------- | ||||