Dont use juce for plugin bridges altogether

Signed-off-by: falkTX <falktx@falktx.com>

Makefile

@@ -319,18 +319,6 @@ LIBS_WIN32 += $(MODULEDIR)/lilv.win32.a
 LIBS_WIN32 += $(MODULEDIR)/rtmempool.win32.a
 LIBS_WIN32 += $(MODULEDIR)/water.win32.a
 
-ifeq ($(USING_JUCE),true)
-LIBS_WIN32 += $(MODULEDIR)/carla_juce.win32.a
-LIBS_WIN32 += $(MODULEDIR)/juce_audio_basics.win32.a
-LIBS_WIN32 += $(MODULEDIR)/juce_audio_processors.win32.a
-LIBS_WIN32 += $(MODULEDIR)/juce_data_structures.win32.a
-LIBS_WIN32 += $(MODULEDIR)/juce_core.win32.a
-LIBS_WIN32 += $(MODULEDIR)/juce_events.win32.a
-LIBS_WIN32 += $(MODULEDIR)/juce_graphics.win32.a
-LIBS_WIN32 += $(MODULEDIR)/juce_gui_basics.win32.a
-LIBS_WIN32 += $(MODULEDIR)/juce_gui_extra.win32.a
-endif
-
 LIBS_WINE32 = $(LIBS_WIN32) $(MODULEDIR)/jackbridge.win32e.a
 LIBS_RWIN32 = $(LIBS_WIN32) $(MODULEDIR)/jackbridge.win32.a
 
@@ -360,18 +348,6 @@ LIBS_WIN64 += $(MODULEDIR)/lilv.win64.a
 LIBS_WIN64 += $(MODULEDIR)/rtmempool.win64.a
 LIBS_WIN64 += $(MODULEDIR)/water.win64.a
 
-ifeq ($(USING_JUCE),true)
-LIBS_WIN64 += $(MODULEDIR)/carla_juce.win64.a
-LIBS_WIN64 += $(MODULEDIR)/juce_audio_basics.win64.a
-LIBS_WIN64 += $(MODULEDIR)/juce_audio_processors.win64.a
-LIBS_WIN64 += $(MODULEDIR)/juce_data_structures.win64.a
-LIBS_WIN64 += $(MODULEDIR)/juce_core.win64.a
-LIBS_WIN64 += $(MODULEDIR)/juce_events.win64.a
-LIBS_WIN64 += $(MODULEDIR)/juce_graphics.win64.a
-LIBS_WIN64 += $(MODULEDIR)/juce_gui_basics.win64.a
-LIBS_WIN64 += $(MODULEDIR)/juce_gui_extra.win64.a
-endif
-
 LIBS_WINE64 = $(LIBS_WIN64) $(MODULEDIR)/jackbridge.win64e.a
 LIBS_RWIN64 = $(LIBS_WIN64) $(MODULEDIR)/jackbridge.win64.a
 

source/Makefile.deps.mk

@@ -330,11 +330,9 @@ PYUIC ?= $(PYUIC5)
 # Set USING_JUCE
 
 ifeq ($(MACOS_OR_WINDOWS),true)
-ifneq ($(BUILDING_FOR_WINE),true)
 USING_JUCE = true
 USING_JUCE_AUDIO_DEVICES = true
 endif
-endif
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Set USING_RTAUDIO

source/bridges-plugin/Makefile

@@ -94,65 +94,22 @@ endif
 
 ifeq ($(USING_JUCE),true)
 LIBS_native  += $(MODULEDIR)/carla_juce.a
-LIBS_posix32 += $(MODULEDIR)/carla_juce.posix32.a
-LIBS_posix64 += $(MODULEDIR)/carla_juce.posix64.a
-LIBS_win32   += $(MODULEDIR)/carla_juce.win32.a
-LIBS_win64   += $(MODULEDIR)/carla_juce.win64.a
-
 LIBS_native  += $(MODULEDIR)/juce_audio_basics.a
-LIBS_posix32 += $(MODULEDIR)/juce_audio_basics.posix32.a
-LIBS_posix64 += $(MODULEDIR)/juce_audio_basics.posix64.a
-LIBS_win32   += $(MODULEDIR)/juce_audio_basics.win32.a
-LIBS_win64   += $(MODULEDIR)/juce_audio_basics.win64.a
-LINK_FLAGS   += $(JUCE_AUDIO_BASICS_LIBS)
-
 LIBS_native  += $(MODULEDIR)/juce_audio_processors.a
-LIBS_posix32 += $(MODULEDIR)/juce_audio_processors.posix32.a
-LIBS_posix64 += $(MODULEDIR)/juce_audio_processors.posix64.a
-LIBS_win32   += $(MODULEDIR)/juce_audio_processors.win32.a
-LIBS_win64   += $(MODULEDIR)/juce_audio_processors.win64.a
-LINK_FLAGS   += $(JUCE_AUDIO_PROCESSORS_LIBS)
-
 LIBS_native  += $(MODULEDIR)/juce_core.a
-LIBS_posix32 += $(MODULEDIR)/juce_core.posix32.a
-LIBS_posix64 += $(MODULEDIR)/juce_core.posix64.a
-LIBS_win32   += $(MODULEDIR)/juce_core.win32.a
-LIBS_win64   += $(MODULEDIR)/juce_core.win64.a
-LINK_FLAGS   += $(JUCE_CORE_LIBS)
-
 LIBS_native  += $(MODULEDIR)/juce_data_structures.a
-LIBS_posix32 += $(MODULEDIR)/juce_data_structures.posix32.a
-LIBS_posix64 += $(MODULEDIR)/juce_data_structures.posix64.a
-LIBS_win32   += $(MODULEDIR)/juce_data_structures.win32.a
-LIBS_win64   += $(MODULEDIR)/juce_data_structures.win64.a
-LINK_FLAGS   += $(JUCE_DATA_STRUCTURES_LIBS)
-
 LIBS_native  += $(MODULEDIR)/juce_events.a
-LIBS_posix32 += $(MODULEDIR)/juce_events.posix32.a
-LIBS_posix64 += $(MODULEDIR)/juce_events.posix64.a
-LIBS_win32   += $(MODULEDIR)/juce_events.win32.a
-LIBS_win64   += $(MODULEDIR)/juce_events.win64.a
-LINK_FLAGS   += $(JUCE_EVENTS_LIBS)
-
 LIBS_native  += $(MODULEDIR)/juce_graphics.a
-LIBS_posix32 += $(MODULEDIR)/juce_graphics.posix32.a
-LIBS_posix64 += $(MODULEDIR)/juce_graphics.posix64.a
-LIBS_win32   += $(MODULEDIR)/juce_graphics.win32.a
-LIBS_win64   += $(MODULEDIR)/juce_graphics.win64.a
-LINK_FLAGS   += $(JUCE_GRAPHICS_LIBS)
-
 LIBS_native  += $(MODULEDIR)/juce_gui_basics.a
-LIBS_posix32 += $(MODULEDIR)/juce_gui_basics.posix32.a
-LIBS_posix64 += $(MODULEDIR)/juce_gui_basics.posix64.a
-LIBS_win32   += $(MODULEDIR)/juce_gui_basics.win32.a
-LIBS_win64   += $(MODULEDIR)/juce_gui_basics.win64.a
-LINK_FLAGS   += $(JUCE_GUI_BASICS_LIBS)
-
 LIBS_native  += $(MODULEDIR)/juce_gui_extra.a
-LIBS_posix32 += $(MODULEDIR)/juce_gui_extra.posix32.a
-LIBS_posix64 += $(MODULEDIR)/juce_gui_extra.posix64.a
-LIBS_win32   += $(MODULEDIR)/juce_gui_extra.win32.a
-LIBS_win64   += $(MODULEDIR)/juce_gui_extra.win64.a
+
+LINK_FLAGS   += $(JUCE_AUDIO_BASICS_LIBS)
+LINK_FLAGS   += $(JUCE_AUDIO_PROCESSORS_LIBS)
+LINK_FLAGS   += $(JUCE_CORE_LIBS)
+LINK_FLAGS   += $(JUCE_DATA_STRUCTURES_LIBS)
+LINK_FLAGS   += $(JUCE_EVENTS_LIBS)
+LINK_FLAGS   += $(JUCE_GRAPHICS_LIBS)
+LINK_FLAGS   += $(JUCE_GUI_BASICS_LIBS)
 LINK_FLAGS   += $(JUCE_GUI_EXTRA_LIBS)
 endif
 

source/discovery/Makefile

@@ -94,65 +94,22 @@ endif
 
 ifeq ($(USING_JUCE),true)
 LIBS_native  += $(MODULEDIR)/carla_juce.a
-LIBS_posix32 += $(MODULEDIR)/carla_juce.posix32.a
-LIBS_posix64 += $(MODULEDIR)/carla_juce.posix64.a
-LIBS_win32   += $(MODULEDIR)/carla_juce.win32.a
-LIBS_win64   += $(MODULEDIR)/carla_juce.win64.a
-
 LIBS_native  += $(MODULEDIR)/juce_audio_basics.a
-LIBS_posix32 += $(MODULEDIR)/juce_audio_basics.posix32.a
-LIBS_posix64 += $(MODULEDIR)/juce_audio_basics.posix64.a
-LIBS_win32   += $(MODULEDIR)/juce_audio_basics.win32.a
-LIBS_win64   += $(MODULEDIR)/juce_audio_basics.win64.a
-LINK_FLAGS   += $(JUCE_AUDIO_BASICS_LIBS)
-
 LIBS_native  += $(MODULEDIR)/juce_audio_processors.a
-LIBS_posix32 += $(MODULEDIR)/juce_audio_processors.posix32.a
-LIBS_posix64 += $(MODULEDIR)/juce_audio_processors.posix64.a
-LIBS_win32   += $(MODULEDIR)/juce_audio_processors.win32.a
-LIBS_win64   += $(MODULEDIR)/juce_audio_processors.win64.a
-LINK_FLAGS   += $(JUCE_AUDIO_PROCESSORS_LIBS)
-
 LIBS_native  += $(MODULEDIR)/juce_core.a
-LIBS_posix32 += $(MODULEDIR)/juce_core.posix32.a
-LIBS_posix64 += $(MODULEDIR)/juce_core.posix64.a
-LIBS_win32   += $(MODULEDIR)/juce_core.win32.a
-LIBS_win64   += $(MODULEDIR)/juce_core.win64.a
-LINK_FLAGS   += $(JUCE_CORE_LIBS)
-
 LIBS_native  += $(MODULEDIR)/juce_data_structures.a
-LIBS_posix32 += $(MODULEDIR)/juce_data_structures.posix32.a
-LIBS_posix64 += $(MODULEDIR)/juce_data_structures.posix64.a
-LIBS_win32   += $(MODULEDIR)/juce_data_structures.win32.a
-LIBS_win64   += $(MODULEDIR)/juce_data_structures.win64.a
-LINK_FLAGS   += $(JUCE_DATA_STRUCTURES_LIBS)
-
 LIBS_native  += $(MODULEDIR)/juce_events.a
-LIBS_posix32 += $(MODULEDIR)/juce_events.posix32.a
-LIBS_posix64 += $(MODULEDIR)/juce_events.posix64.a
-LIBS_win32   += $(MODULEDIR)/juce_events.win32.a
-LIBS_win64   += $(MODULEDIR)/juce_events.win64.a
-LINK_FLAGS   += $(JUCE_EVENTS_LIBS)
-
 LIBS_native  += $(MODULEDIR)/juce_graphics.a
-LIBS_posix32 += $(MODULEDIR)/juce_graphics.posix32.a
-LIBS_posix64 += $(MODULEDIR)/juce_graphics.posix64.a
-LIBS_win32   += $(MODULEDIR)/juce_graphics.win32.a
-LIBS_win64   += $(MODULEDIR)/juce_graphics.win64.a
-LINK_FLAGS   += $(JUCE_GRAPHICS_LIBS)
-
 LIBS_native  += $(MODULEDIR)/juce_gui_basics.a
-LIBS_posix32 += $(MODULEDIR)/juce_gui_basics.posix32.a
-LIBS_posix64 += $(MODULEDIR)/juce_gui_basics.posix64.a
-LIBS_win32   += $(MODULEDIR)/juce_gui_basics.win32.a
-LIBS_win64   += $(MODULEDIR)/juce_gui_basics.win64.a
-LINK_FLAGS   += $(JUCE_GUI_BASICS_LIBS)
-
 LIBS_native  += $(MODULEDIR)/juce_gui_extra.a
-LIBS_posix32 += $(MODULEDIR)/juce_gui_extra.posix32.a
-LIBS_posix64 += $(MODULEDIR)/juce_gui_extra.posix64.a
-LIBS_win32   += $(MODULEDIR)/juce_gui_extra.win32.a
-LIBS_win64   += $(MODULEDIR)/juce_gui_extra.win64.a
+
+LINK_FLAGS   += $(JUCE_AUDIO_BASICS_LIBS)
+LINK_FLAGS   += $(JUCE_AUDIO_PROCESSORS_LIBS)
+LINK_FLAGS   += $(JUCE_CORE_LIBS)
+LINK_FLAGS   += $(JUCE_DATA_STRUCTURES_LIBS)
+LINK_FLAGS   += $(JUCE_EVENTS_LIBS)
+LINK_FLAGS   += $(JUCE_GRAPHICS_LIBS)
+LINK_FLAGS   += $(JUCE_GUI_BASICS_LIBS)
 LINK_FLAGS   += $(JUCE_GUI_EXTRA_LIBS)
 endif # USING_JUCE
 

source/modules/juce_audio_basics/Makefile

@@ -24,24 +24,14 @@ endif
 # ---------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)
-OBJS         = $(OBJDIR)/$(MODULENAME).mm.o
-OBJS_posix32 = $(OBJDIR)/$(MODULENAME).mm.posix32.o
-OBJS_posix64 = $(OBJDIR)/$(MODULENAME).mm.posix64.o
+OBJS = $(OBJDIR)/$(MODULENAME).mm.o
 else
-OBJS         = $(OBJDIR)/$(MODULENAME).cpp.o
-OBJS_posix32 = $(OBJDIR)/$(MODULENAME).cpp.posix32.o
-OBJS_posix64 = $(OBJDIR)/$(MODULENAME).cpp.posix64.o
+OBJS = $(OBJDIR)/$(MODULENAME).cpp.o
 endif
-OBJS_win32   = $(OBJDIR)/$(MODULENAME).cpp.win32.o
-OBJS_win64   = $(OBJDIR)/$(MODULENAME).cpp.win64.o
 
 # ---------------------------------------------------------------------------------------------------------------------
 
-all:     $(MODULEDIR)/$(MODULENAME).a
-posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
-posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
-win32:   $(MODULEDIR)/$(MODULENAME).win32.a
-win64:   $(MODULEDIR)/$(MODULENAME).win64.a
+all: $(MODULEDIR)/$(MODULENAME).a
 
 # ---------------------------------------------------------------------------------------------------------------------
 
@@ -59,30 +49,6 @@ $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
 	$(SILENT)rm -f $@
 	$(SILENT)$(AR) crs $@ $^
 
-$(MODULEDIR)/$(MODULENAME).posix32.a: $(OBJS_posix32)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).posix32.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).posix64.a: $(OBJS_posix64)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).posix64.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).win32.a: $(OBJS_win32)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).win32.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).win64.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
@@ -90,16 +56,6 @@ $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-$(OBJDIR)/$(MODULENAME).cpp.%32.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (32bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
-
-$(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (64bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
@@ -107,22 +63,8 @@ $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
 
-$(OBJDIR)/$(MODULENAME).mm.%32.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (32bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -ObjC++ -c -o $@
-
-$(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (64bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 -include $(OBJS:%.o=%.d)
--include $(OBJS_posix32:%.o=%.d)
--include $(OBJS_posix64:%.o=%.d)
--include $(OBJS_win32:%.o=%.d)
--include $(OBJS_win64:%.o=%.d)
 
 # ---------------------------------------------------------------------------------------------------------------------

source/modules/juce_audio_devices/Makefile

@@ -21,24 +21,14 @@ endif
 # ---------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)
-OBJS         = $(OBJDIR)/$(MODULENAME).mm.o
-OBJS_posix32 = $(OBJDIR)/$(MODULENAME).mm.posix32.o
-OBJS_posix64 = $(OBJDIR)/$(MODULENAME).mm.posix64.o
+OBJS = $(OBJDIR)/$(MODULENAME).mm.o
 else
-OBJS         = $(OBJDIR)/$(MODULENAME).cpp.o
-OBJS_posix32 = $(OBJDIR)/$(MODULENAME).cpp.posix32.o
-OBJS_posix64 = $(OBJDIR)/$(MODULENAME).cpp.posix64.o
+OBJS = $(OBJDIR)/$(MODULENAME).cpp.o
 endif
-OBJS_win32   = $(OBJDIR)/$(MODULENAME).cpp.win32.o
-OBJS_win64   = $(OBJDIR)/$(MODULENAME).cpp.win64.o
 
 # ---------------------------------------------------------------------------------------------------------------------
 
-all:     $(MODULEDIR)/$(MODULENAME).a
-posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
-posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
-win32:   $(MODULEDIR)/$(MODULENAME).win32.a
-win64:   $(MODULEDIR)/$(MODULENAME).win64.a
+all: $(MODULEDIR)/$(MODULENAME).a
 
 # ---------------------------------------------------------------------------------------------------------------------
 
@@ -56,30 +46,6 @@ $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
 	$(SILENT)rm -f $@
 	$(SILENT)$(AR) crs $@ $^
 
-$(MODULEDIR)/$(MODULENAME).posix32.a: $(OBJS_posix32)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).posix32.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).posix64.a: $(OBJS_posix64)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).posix64.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).win32.a: $(OBJS_win32)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).win32.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).win64.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
@@ -87,16 +53,6 @@ $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-$(OBJDIR)/$(MODULENAME).cpp.%32.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (32bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
-
-$(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (64bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
@@ -104,22 +60,8 @@ $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
 
-$(OBJDIR)/$(MODULENAME).mm.%32.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (32bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -ObjC++ -c -o $@
-
-$(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (64bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 -include $(OBJS:%.o=%.d)
--include $(OBJS_posix32:%.o=%.d)
--include $(OBJS_posix64:%.o=%.d)
--include $(OBJS_win32:%.o=%.d)
--include $(OBJS_win64:%.o=%.d)
 
 # ---------------------------------------------------------------------------------------------------------------------

source/modules/juce_audio_processors/Makefile

@@ -31,24 +31,14 @@ endif
 # ---------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)
-OBJS         = $(OBJDIR)/$(MODULENAME).mm.o
-OBJS_posix32 = $(OBJDIR)/$(MODULENAME).mm.posix32.o
-OBJS_posix64 = $(OBJDIR)/$(MODULENAME).mm.posix64.o
+OBJS = $(OBJDIR)/$(MODULENAME).mm.o
 else
-OBJS         = $(OBJDIR)/$(MODULENAME).cpp.o
-OBJS_posix32 = $(OBJDIR)/$(MODULENAME).cpp.posix32.o
-OBJS_posix64 = $(OBJDIR)/$(MODULENAME).cpp.posix64.o
+OBJS = $(OBJDIR)/$(MODULENAME).cpp.o
 endif
-OBJS_win32   = $(OBJDIR)/$(MODULENAME).cpp.win32.o
-OBJS_win64   = $(OBJDIR)/$(MODULENAME).cpp.win64.o
 
 # ---------------------------------------------------------------------------------------------------------------------
 
-all:     $(MODULEDIR)/$(MODULENAME).a
-posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
-posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
-win32:   $(MODULEDIR)/$(MODULENAME).win32.a
-win64:   $(MODULEDIR)/$(MODULENAME).win64.a
+all: $(MODULEDIR)/$(MODULENAME).a
 
 # ---------------------------------------------------------------------------------------------------------------------
 
@@ -66,30 +56,6 @@ $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
 	$(SILENT)rm -f $@
 	$(SILENT)$(AR) crs $@ $^
 
-$(MODULEDIR)/$(MODULENAME).posix32.a: $(OBJS_posix32)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).posix32.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).posix64.a: $(OBJS_posix64)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).posix64.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).win32.a: $(OBJS_win32)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).win32.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).win64.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
@@ -97,16 +63,6 @@ $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-$(OBJDIR)/$(MODULENAME).cpp.%32.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (32bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
-
-$(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (64bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
@@ -114,22 +70,8 @@ $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
 
-$(OBJDIR)/$(MODULENAME).mm.%32.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (32bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -ObjC++ -c -o $@
-
-$(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (64bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 -include $(OBJS:%.o=%.d)
--include $(OBJS_posix32:%.o=%.d)
--include $(OBJS_posix64:%.o=%.d)
--include $(OBJS_win32:%.o=%.d)
--include $(OBJS_win64:%.o=%.d)
 
 # ---------------------------------------------------------------------------------------------------------------------

source/modules/juce_core/Makefile

@@ -19,24 +19,14 @@ BUILD_CXX_FLAGS += $(JUCE_CORE_FLAGS) -I.. -std=gnu++14
 # ---------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)
-OBJS         = $(OBJDIR)/$(MODULENAME).mm.o
-OBJS_posix32 = $(OBJDIR)/$(MODULENAME).mm.posix32.o
-OBJS_posix64 = $(OBJDIR)/$(MODULENAME).mm.posix64.o
+OBJS = $(OBJDIR)/$(MODULENAME).mm.o
 else
-OBJS         = $(OBJDIR)/$(MODULENAME).cpp.o
-OBJS_posix32 = $(OBJDIR)/$(MODULENAME).cpp.posix32.o
-OBJS_posix64 = $(OBJDIR)/$(MODULENAME).cpp.posix64.o
+OBJS = $(OBJDIR)/$(MODULENAME).cpp.o
 endif
-OBJS_win32   = $(OBJDIR)/$(MODULENAME).cpp.win32.o
-OBJS_win64   = $(OBJDIR)/$(MODULENAME).cpp.win64.o
 
 # ---------------------------------------------------------------------------------------------------------------------
 
-all:     $(MODULEDIR)/$(MODULENAME).a
-posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
-posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
-win32:   $(MODULEDIR)/$(MODULENAME).win32.a
-win64:   $(MODULEDIR)/$(MODULENAME).win64.a
+all: $(MODULEDIR)/$(MODULENAME).a
 
 # ---------------------------------------------------------------------------------------------------------------------
 
@@ -54,30 +44,6 @@ $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
 	$(SILENT)rm -f $@
 	$(SILENT)$(AR) crs $@ $^
 
-$(MODULEDIR)/$(MODULENAME).posix32.a: $(OBJS_posix32)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).posix32.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).posix64.a: $(OBJS_posix64)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).posix64.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).win32.a: $(OBJS_win32)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).win32.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).win64.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
@@ -85,16 +51,6 @@ $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-$(OBJDIR)/$(MODULENAME).cpp.%32.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (32bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
-
-$(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (64bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
@@ -102,22 +58,8 @@ $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
 
-$(OBJDIR)/$(MODULENAME).mm.%32.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (32bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -ObjC++ -c -o $@
-
-$(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (64bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 -include $(OBJS:%.o=%.d)
--include $(OBJS_posix32:%.o=%.d)
--include $(OBJS_posix64:%.o=%.d)
--include $(OBJS_win32:%.o=%.d)
--include $(OBJS_win64:%.o=%.d)
 
 # ---------------------------------------------------------------------------------------------------------------------

source/modules/juce_data_structures/Makefile

@@ -15,24 +15,14 @@ BUILD_CXX_FLAGS += $(JUCE_DATA_STRUCTURES_FLAGS) -I.. -std=gnu++14
 # ---------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)
-OBJS         = $(OBJDIR)/$(MODULENAME).mm.o
-OBJS_posix32 = $(OBJDIR)/$(MODULENAME).mm.posix32.o
-OBJS_posix64 = $(OBJDIR)/$(MODULENAME).mm.posix64.o
+OBJS = $(OBJDIR)/$(MODULENAME).mm.o
 else
-OBJS         = $(OBJDIR)/$(MODULENAME).cpp.o
-OBJS_posix32 = $(OBJDIR)/$(MODULENAME).cpp.posix32.o
-OBJS_posix64 = $(OBJDIR)/$(MODULENAME).cpp.posix64.o
+OBJS = $(OBJDIR)/$(MODULENAME).cpp.o
 endif
-OBJS_win32   = $(OBJDIR)/$(MODULENAME).cpp.win32.o
-OBJS_win64   = $(OBJDIR)/$(MODULENAME).cpp.win64.o
 
 # ---------------------------------------------------------------------------------------------------------------------
 
-all:     $(MODULEDIR)/$(MODULENAME).a
-posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
-posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
-win32:   $(MODULEDIR)/$(MODULENAME).win32.a
-win64:   $(MODULEDIR)/$(MODULENAME).win64.a
+all: $(MODULEDIR)/$(MODULENAME).a
 
 # ---------------------------------------------------------------------------------------------------------------------
 
@@ -50,30 +40,6 @@ $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
 	$(SILENT)rm -f $@
 	$(SILENT)$(AR) crs $@ $^
 
-$(MODULEDIR)/$(MODULENAME).posix32.a: $(OBJS_posix32)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).posix32.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).posix64.a: $(OBJS_posix64)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).posix64.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).win32.a: $(OBJS_win32)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).win32.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).win64.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
@@ -81,16 +47,6 @@ $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-$(OBJDIR)/$(MODULENAME).cpp.%32.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (32bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
-
-$(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (64bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
@@ -98,22 +54,8 @@ $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
 
-$(OBJDIR)/$(MODULENAME).mm.%32.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (32bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -ObjC++ -c -o $@
-
-$(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (64bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 -include $(OBJS:%.o=%.d)
--include $(OBJS_posix32:%.o=%.d)
--include $(OBJS_posix64:%.o=%.d)
--include $(OBJS_win32:%.o=%.d)
--include $(OBJS_win64:%.o=%.d)
 
 # ---------------------------------------------------------------------------------------------------------------------

source/modules/juce_events/Makefile

@@ -19,24 +19,14 @@ BUILD_CXX_FLAGS += $(JUCE_EVENTS_FLAGS) -I.. -std=gnu++14
 # ---------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)
-OBJS         = $(OBJDIR)/$(MODULENAME).mm.o
-OBJS_posix32 = $(OBJDIR)/$(MODULENAME).mm.posix32.o
-OBJS_posix64 = $(OBJDIR)/$(MODULENAME).mm.posix64.o
+OBJS = $(OBJDIR)/$(MODULENAME).mm.o
 else
-OBJS         = $(OBJDIR)/$(MODULENAME).cpp.o
-OBJS_posix32 = $(OBJDIR)/$(MODULENAME).cpp.posix32.o
-OBJS_posix64 = $(OBJDIR)/$(MODULENAME).cpp.posix64.o
+OBJS = $(OBJDIR)/$(MODULENAME).cpp.o
 endif
-OBJS_win32   = $(OBJDIR)/$(MODULENAME).cpp.win32.o
-OBJS_win64   = $(OBJDIR)/$(MODULENAME).cpp.win64.o
 
 # ---------------------------------------------------------------------------------------------------------------------
 
-all:     $(MODULEDIR)/$(MODULENAME).a
-posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
-posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
-win32:   $(MODULEDIR)/$(MODULENAME).win32.a
-win64:   $(MODULEDIR)/$(MODULENAME).win64.a
+all: $(MODULEDIR)/$(MODULENAME).a
 
 # ---------------------------------------------------------------------------------------------------------------------
 
@@ -54,30 +44,6 @@ $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
 	$(SILENT)rm -f $@
 	$(SILENT)$(AR) crs $@ $^
 
-$(MODULEDIR)/$(MODULENAME).posix32.a: $(OBJS_posix32)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).posix32.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).posix64.a: $(OBJS_posix64)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).posix64.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).win32.a: $(OBJS_win32)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).win32.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).win64.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
@@ -85,16 +51,6 @@ $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-$(OBJDIR)/$(MODULENAME).cpp.%32.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (32bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
-
-$(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (64bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
@@ -102,22 +58,8 @@ $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
 
-$(OBJDIR)/$(MODULENAME).mm.%32.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (32bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -ObjC++ -c -o $@
-
-$(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (64bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 -include $(OBJS:%.o=%.d)
--include $(OBJS_posix32:%.o=%.d)
--include $(OBJS_posix64:%.o=%.d)
--include $(OBJS_win32:%.o=%.d)
--include $(OBJS_win64:%.o=%.d)
 
 # ---------------------------------------------------------------------------------------------------------------------

source/modules/juce_graphics/Makefile

@@ -22,24 +22,14 @@ endif
 # ---------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)
-OBJS         = $(OBJDIR)/$(MODULENAME).mm.o
-OBJS_posix32 = $(OBJDIR)/$(MODULENAME).mm.posix32.o
-OBJS_posix64 = $(OBJDIR)/$(MODULENAME).mm.posix64.o
+OBJS = $(OBJDIR)/$(MODULENAME).mm.o
 else
-OBJS         = $(OBJDIR)/$(MODULENAME).cpp.o
-OBJS_posix32 = $(OBJDIR)/$(MODULENAME).cpp.posix32.o
-OBJS_posix64 = $(OBJDIR)/$(MODULENAME).cpp.posix64.o
+OBJS = $(OBJDIR)/$(MODULENAME).cpp.o
 endif
-OBJS_win32   = $(OBJDIR)/$(MODULENAME).cpp.win32.o
-OBJS_win64   = $(OBJDIR)/$(MODULENAME).cpp.win64.o
 
 # ---------------------------------------------------------------------------------------------------------------------
 
-all:     $(MODULEDIR)/$(MODULENAME).a
-posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
-posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
-win32:   $(MODULEDIR)/$(MODULENAME).win32.a
-win64:   $(MODULEDIR)/$(MODULENAME).win64.a
+all: $(MODULEDIR)/$(MODULENAME).a
 
 # ---------------------------------------------------------------------------------------------------------------------
 
@@ -57,30 +47,6 @@ $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
 	$(SILENT)rm -f $@
 	$(SILENT)$(AR) crs $@ $^
 
-$(MODULEDIR)/$(MODULENAME).posix32.a: $(OBJS_posix32)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).posix32.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).posix64.a: $(OBJS_posix64)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).posix64.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).win32.a: $(OBJS_win32)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).win32.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).win64.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
@@ -88,16 +54,6 @@ $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-$(OBJDIR)/$(MODULENAME).cpp.%32.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (32bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
-
-$(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (64bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
@@ -105,22 +61,8 @@ $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
 
-$(OBJDIR)/$(MODULENAME).mm.%32.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (32bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -ObjC++ -c -o $@
-
-$(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (64bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 -include $(OBJS:%.o=%.d)
--include $(OBJS_posix32:%.o=%.d)
--include $(OBJS_posix64:%.o=%.d)
--include $(OBJS_win32:%.o=%.d)
--include $(OBJS_win64:%.o=%.d)
 
 # ---------------------------------------------------------------------------------------------------------------------

source/modules/juce_gui_basics/Makefile

@@ -24,24 +24,14 @@ BUILD_CXX_FLAGS += $(JUCE_GUI_BASICS_FLAGS) -I.. -std=gnu++14
 # ---------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)
-OBJS         = $(OBJDIR)/$(MODULENAME).mm.o
-OBJS_posix32 = $(OBJDIR)/$(MODULENAME).mm.posix32.o
-OBJS_posix64 = $(OBJDIR)/$(MODULENAME).mm.posix64.o
+OBJS = $(OBJDIR)/$(MODULENAME).mm.o
 else
-OBJS         = $(OBJDIR)/$(MODULENAME).cpp.o
-OBJS_posix32 = $(OBJDIR)/$(MODULENAME).cpp.posix32.o
-OBJS_posix64 = $(OBJDIR)/$(MODULENAME).cpp.posix64.o
+OBJS = $(OBJDIR)/$(MODULENAME).cpp.o
 endif
-OBJS_win32   = $(OBJDIR)/$(MODULENAME).cpp.win32.o
-OBJS_win64   = $(OBJDIR)/$(MODULENAME).cpp.win64.o
 
 # ---------------------------------------------------------------------------------------------------------------------
 
-all:     $(MODULEDIR)/$(MODULENAME).a
-posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
-posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
-win32:   $(MODULEDIR)/$(MODULENAME).win32.a
-win64:   $(MODULEDIR)/$(MODULENAME).win64.a
+all: $(MODULEDIR)/$(MODULENAME).a
 
 # ---------------------------------------------------------------------------------------------------------------------
 
@@ -59,30 +49,6 @@ $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
 	$(SILENT)rm -f $@
 	$(SILENT)$(AR) crs $@ $^
 
-$(MODULEDIR)/$(MODULENAME).posix32.a: $(OBJS_posix32)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).posix32.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).posix64.a: $(OBJS_posix64)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).posix64.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).win32.a: $(OBJS_win32)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).win32.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).win64.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
@@ -90,16 +56,6 @@ $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-$(OBJDIR)/$(MODULENAME).cpp.%32.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (32bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
-
-$(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (64bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
@@ -107,22 +63,8 @@ $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
 
-$(OBJDIR)/$(MODULENAME).mm.%32.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (32bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -ObjC++ -c -o $@
-
-$(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (64bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 -include $(OBJS:%.o=%.d)
--include $(OBJS_posix32:%.o=%.d)
--include $(OBJS_posix64:%.o=%.d)
--include $(OBJS_win32:%.o=%.d)
--include $(OBJS_win64:%.o=%.d)
 
 # ---------------------------------------------------------------------------------------------------------------------

source/modules/juce_gui_extra/Makefile

@@ -15,24 +15,14 @@ BUILD_CXX_FLAGS += $(JUCE_GUI_EXTRA_FLAGS) -I.. -std=gnu++14
 # ---------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)
-OBJS         = $(OBJDIR)/$(MODULENAME).mm.o
-OBJS_posix32 = $(OBJDIR)/$(MODULENAME).mm.posix32.o
-OBJS_posix64 = $(OBJDIR)/$(MODULENAME).mm.posix64.o
+OBJS = $(OBJDIR)/$(MODULENAME).mm.o
 else
-OBJS         = $(OBJDIR)/$(MODULENAME).cpp.o
-OBJS_posix32 = $(OBJDIR)/$(MODULENAME).cpp.posix32.o
-OBJS_posix64 = $(OBJDIR)/$(MODULENAME).cpp.posix64.o
+OBJS = $(OBJDIR)/$(MODULENAME).cpp.o
 endif
-OBJS_win32   = $(OBJDIR)/$(MODULENAME).cpp.win32.o
-OBJS_win64   = $(OBJDIR)/$(MODULENAME).cpp.win64.o
 
 # ---------------------------------------------------------------------------------------------------------------------
 
-all:     $(MODULEDIR)/$(MODULENAME).a
-posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
-posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
-win32:   $(MODULEDIR)/$(MODULENAME).win32.a
-win64:   $(MODULEDIR)/$(MODULENAME).win64.a
+all: $(MODULEDIR)/$(MODULENAME).a
 
 # ---------------------------------------------------------------------------------------------------------------------
 
@@ -50,30 +40,6 @@ $(MODULEDIR)/$(MODULENAME).a: $(OBJS)
 	$(SILENT)rm -f $@
 	$(SILENT)$(AR) crs $@ $^
 
-$(MODULEDIR)/$(MODULENAME).posix32.a: $(OBJS_posix32)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).posix32.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).posix64.a: $(OBJS_posix64)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).posix64.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).win32.a: $(OBJS_win32)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).win32.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
-$(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
-	-@mkdir -p $(MODULEDIR)
-	@echo "Creating $(MODULENAME).win64.a"
-	$(SILENT)rm -f $@
-	$(SILENT)$(AR) crs $@ $^
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
@@ -81,16 +47,6 @@ $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-$(OBJDIR)/$(MODULENAME).cpp.%32.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (32bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
-
-$(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (64bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
@@ -98,22 +54,8 @@ $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
 
-$(OBJDIR)/$(MODULENAME).mm.%32.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (32bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -ObjC++ -c -o $@
-
-$(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $< (64bit)"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@
-
 # ---------------------------------------------------------------------------------------------------------------------
 
 -include $(OBJS:%.o=%.d)
--include $(OBJS_posix32:%.o=%.d)
--include $(OBJS_posix64:%.o=%.d)
--include $(OBJS_win32:%.o=%.d)
--include $(OBJS_win64:%.o=%.d)
 
 # ---------------------------------------------------------------------------------------------------------------------