From 274d87a56fd1b18ea3fc63d11e1a027d7800dd02 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Fri, 8 Aug 2014 10:14:30 +0100
Subject: [PATCH] Make sure juce_gui_extra is (only) built on osx

---
 Makefile                       |  2 ++
 source/backend/Makefile        |  4 ++++
 source/bridges-plugin/Makefile | 15 ++++++++++++---
 source/discovery/Makefile      |  9 ++++++---
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 9f07bdb52..980e04f24 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,9 @@ ALL_LIBS += source/modules/juce_data_structures.a
 ALL_LIBS += source/modules/juce_events.a
 ALL_LIBS += source/modules/juce_graphics.a
 ALL_LIBS += source/modules/juce_gui_basics.a
+ifeq ($(MACOS),true)
 ALL_LIBS += source/modules/juce_gui_extra.a
+endif
 else
 ALL_LIBS += source/modules/rtaudio.a
 ALL_LIBS += source/modules/rtmidi.a
diff --git a/source/backend/Makefile b/source/backend/Makefile
index 276c792b3..b34048b1f 100644
--- a/source/backend/Makefile
+++ b/source/backend/Makefile
@@ -27,7 +27,9 @@ STANDALONE_LIBS += ../modules/juce_data_structures.a
 STANDALONE_LIBS += ../modules/juce_events.a
 STANDALONE_LIBS += ../modules/juce_graphics.a
 STANDALONE_LIBS += ../modules/juce_gui_basics.a
+ifeq ($(MACOS),true)
 STANDALONE_LIBS += ../modules/juce_gui_extra.a
+endif
 else
 STANDALONE_LIBS += ../modules/rtaudio.a
 STANDALONE_LIBS += ../modules/rtmidi.a
@@ -51,7 +53,9 @@ STANDALONE_FLAGS += $(JUCE_DATA_STRUCTURES_LIBS)
 STANDALONE_FLAGS += $(JUCE_EVENTS_LIBS)
 STANDALONE_FLAGS += $(JUCE_GRAPHICS_LIBS)
 STANDALONE_FLAGS += $(JUCE_GUI_BASICS_LIBS)
+ifeq ($(MACOS),true)
 STANDALONE_FLAGS += $(JUCE_GUI_EXTRA_LIBS)
+endif
 else
 STANDALONE_FLAGS += $(RTAUDIO_LIBS)
 STANDALONE_FLAGS += $(RTMIDI_LIBS)
diff --git a/source/bridges-plugin/Makefile b/source/bridges-plugin/Makefile
index 1b85f28ec..38bd3b760 100644
--- a/source/bridges-plugin/Makefile
+++ b/source/bridges-plugin/Makefile
@@ -34,6 +34,9 @@ LINK_PLUGIN_FLAGS += $(JUCE_DATA_STRUCTURES_LIBS)
 LINK_PLUGIN_FLAGS += $(JUCE_EVENTS_LIBS)
 LINK_PLUGIN_FLAGS += $(JUCE_GRAPHICS_LIBS)
 LINK_PLUGIN_FLAGS += $(JUCE_GUI_BASICS_LIBS)
+ifeq ($(MACOS),true)
+LINK_PLUGIN_FLAGS += $(JUCE_GUI_EXTRA_LIBS)
+endif
 endif
 
 ifeq ($(HAVE_X11),true)
@@ -156,9 +159,13 @@ LIBS_NATIVE += \
 	../modules/juce_data_structures.a \
 	../modules/juce_events.a \
 	../modules/juce_graphics.a \
-	../modules/juce_gui_basics.a \
+	../modules/juce_gui_basics.a
+
+ifeq ($(MACOS),true)
+LIBS_NATIVE += \
 	../modules/juce_gui_extra.a
 endif
+endif
 
 ../../bin/carla-bridge-native: $(OBJS_NATIVE) $(LIBS_NATIVE)
 	$(CXX) $(OBJS_NATIVE) $(LIBS_START) $(LIBS_NATIVE) $(LIBS_END) $(NATIVE_LINK_FLAGS) -o $@
@@ -215,7 +222,8 @@ LIBS_POSIX32 += \
 	../modules/juce_data_structures.posix32.a \
 	../modules/juce_events.posix32.a \
 	../modules/juce_graphics.posix32.a \
-	../modules/juce_gui_basics.posix32.a
+	../modules/juce_gui_basics.posix32.a \
+	../modules/juce_gui_extra.posix32.a
 endif
 
 ../../bin/carla-bridge-posix32: $(OBJS_POSIX32) $(LIBS_POSIX32)
@@ -273,7 +281,8 @@ LIBS_POSIX64 += \
 	../modules/juce_data_structures.posix64.a \
 	../modules/juce_events.posix64.a \
 	../modules/juce_graphics.posix64.a \
-	../modules/juce_gui_basics.posix64.a
+	../modules/juce_gui_basics.posix64.a \
+	../modules/juce_gui_extra.posix64.a
 endif
 
 ../../bin/carla-bridge-posix64: $(OBJS_POSIX64) $(LIBS_POSIX64)
diff --git a/source/discovery/Makefile b/source/discovery/Makefile
index 04e3506ba..7d3235005 100644
--- a/source/discovery/Makefile
+++ b/source/discovery/Makefile
@@ -86,17 +86,20 @@ LIBS_posix32 += ../modules/juce_gui_basics.posix32.a
 LIBS_posix64 += ../modules/juce_gui_basics.posix64.a
 LIBS_win32   += ../modules/juce_gui_basics.win32.a
 LIBS_win64   += ../modules/juce_gui_basics.win64.a
+ifeq ($(MACOS),true)
+LIBS         += ../modules/juce_gui_extra.a
+LIBS_posix32 += ../modules/juce_gui_extra.posix32.a
+LIBS_posix64 += ../modules/juce_gui_extra.posix64.a
+endif
 LINK_FLAGS   += $(JUCE_AUDIO_PROCESSORS_LIBS)
 LINK_FLAGS   += $(JUCE_DATA_STRUCTURES_LIBS)
 LINK_FLAGS   += $(JUCE_EVENTS_LIBS)
 LINK_FLAGS   += $(JUCE_GRAPHICS_LIBS)
 LINK_FLAGS   += $(JUCE_GUI_BASICS_LIBS)
-endif
-
 ifeq ($(MACOS),true)
-LIBS         += ../modules/juce_gui_extra.a
 LINK_FLAGS   += $(JUCE_GUI_EXTRA_LIBS)
 endif
+endif
 
 POSIX_BUILD_FLAGS = $(BUILD_CXX_FLAGS)
 POSIX_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32 -L/usr/lib/i386-linux-gnu