diff --git a/Makefile b/Makefile
index bd0d052bb..a6d5764bf 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ ifeq ($(USING_JUCE),true)
 3RD_LIBS += $(MODULEDIR)/juce_events.a
 3RD_LIBS += $(MODULEDIR)/juce_graphics.a
 3RD_LIBS += $(MODULEDIR)/juce_gui_basics.a
-ifeq ($(MACOS),true)
+ifeq ($(LINUX_OR_MACOS),true)
 3RD_LIBS += $(MODULEDIR)/juce_gui_extra.a
 endif
 else
@@ -265,7 +265,7 @@ ifeq ($(MACOS_OR_WIN32),true)
 LIBS_POSIX32 += $(MODULEDIR)/juce_graphics.posix32.a
 LIBS_POSIX32 += $(MODULEDIR)/juce_gui_basics.posix32.a
 endif
-ifeq ($(MACOS),true)
+ifeq ($(LINUX_OR_MACOS),true)
 LIBS_POSIX32 += $(MODULEDIR)/juce_gui_extra.posix32.a
 endif
 endif
@@ -292,7 +292,7 @@ ifeq ($(MACOS_OR_WIN32),true)
 LIBS_POSIX64 += $(MODULEDIR)/juce_graphics.posix64.a
 LIBS_POSIX64 += $(MODULEDIR)/juce_gui_basics.posix64.a
 endif
-ifeq ($(MACOS),true)
+ifeq ($(LINUX_OR_MACOS),true)
 LIBS_POSIX64 += $(MODULEDIR)/juce_gui_extra.posix64.a
 endif
 endif
diff --git a/source/backend/Makefile b/source/backend/Makefile
index e966d3b9f..9fc142eec 100644
--- a/source/backend/Makefile
+++ b/source/backend/Makefile
@@ -46,7 +46,7 @@ STANDALONE_LIBS += $(MODULEDIR)/juce_data_structures.a
 STANDALONE_LIBS += $(MODULEDIR)/juce_events.a
 STANDALONE_LIBS += $(MODULEDIR)/juce_graphics.a
 STANDALONE_LIBS += $(MODULEDIR)/juce_gui_basics.a
-ifeq ($(MACOS),true)
+ifeq ($(LINUX_OR_MACOS),true)
 STANDALONE_LIBS += $(MODULEDIR)/juce_gui_extra.a
 endif
 else
@@ -77,7 +77,7 @@ STANDALONE_LINK_FLAGS += $(JUCE_DATA_STRUCTURES_LIBS)
 STANDALONE_LINK_FLAGS += $(JUCE_EVENTS_LIBS)
 STANDALONE_LINK_FLAGS += $(JUCE_GRAPHICS_LIBS)
 STANDALONE_LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS)
-ifeq ($(MACOS),true)
+ifeq ($(LINUX_OR_MACOS),true)
 STANDALONE_LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS)
 endif
 else
diff --git a/source/bridges-plugin/Makefile b/source/bridges-plugin/Makefile
index f74e9d9de..6e9e9966f 100644
--- a/source/bridges-plugin/Makefile
+++ b/source/bridges-plugin/Makefile
@@ -125,7 +125,7 @@ LIBS_win32   += $(MODULEDIR)/juce_gui_basics.win32.a
 LIBS_win64   += $(MODULEDIR)/juce_gui_basics.win64.a
 LINK_FLAGS   += $(JUCE_GUI_BASICS_LIBS)
 
-ifeq ($(MACOS),true)
+ifeq ($(LINUX_OR_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
diff --git a/source/discovery/Makefile b/source/discovery/Makefile
index 0e960c6e8..dd205495b 100644
--- a/source/discovery/Makefile
+++ b/source/discovery/Makefile
@@ -117,7 +117,7 @@ LIBS_win32   += $(MODULEDIR)/juce_gui_basics.win32.a
 LIBS_win64   += $(MODULEDIR)/juce_gui_basics.win64.a
 LINK_FLAGS   += $(JUCE_GUI_BASICS_LIBS)
 
-ifeq ($(MACOS),true)
+ifeq ($(LINUX_OR_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
diff --git a/source/plugin/Makefile b/source/plugin/Makefile
index 6cc849537..d82ff9349 100644
--- a/source/plugin/Makefile
+++ b/source/plugin/Makefile
@@ -81,7 +81,7 @@ LIBS += $(MODULEDIR)/juce_data_structures.a
 LIBS += $(MODULEDIR)/juce_events.a
 LIBS += $(MODULEDIR)/juce_graphics.a
 LIBS += $(MODULEDIR)/juce_gui_basics.a
-ifeq ($(MACOS),true)
+ifeq ($(LINUX_OR_MACOS),true)
 LIBS += $(MODULEDIR)/juce_gui_extra.a
 endif
 endif
@@ -110,7 +110,7 @@ LINK_FLAGS += $(JUCE_DATA_STRUCTURES_LIBS)
 LINK_FLAGS += $(JUCE_EVENTS_LIBS)
 LINK_FLAGS += $(JUCE_GRAPHICS_LIBS)
 LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS)
-ifeq ($(MACOS),true)
+ifeq ($(LINUX_OR_MACOS),true)
 LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS)
 endif
 endif