More makefile work

Makefile

@@ -52,40 +52,39 @@ ALL_LIBS += $(MODULEDIR)/jackbridge.a
 ALL_LIBS += $(MODULEDIR)/juce_audio_basics.a
 ALL_LIBS += $(MODULEDIR)/juce_audio_formats.a
 ALL_LIBS += $(MODULEDIR)/juce_core.a
-
-# ALL_LIBS += $(MODULEDIR)/lilv.a
+ALL_LIBS += $(MODULEDIR)/lilv.a
 # ALL_LIBS += $(MODULEDIR)/native-plugins.a
-# ALL_LIBS += $(MODULEDIR)/rtmempool.a
-#
-# ifeq ($(MACOS_OR_WIN32),true)
-# ALL_LIBS += $(MODULEDIR)/juce_audio_devices.a
-# ALL_LIBS += $(MODULEDIR)/juce_audio_processors.a
-# ALL_LIBS += $(MODULEDIR)/juce_data_structures.a
-# ALL_LIBS += $(MODULEDIR)/juce_events.a
-# ALL_LIBS += $(MODULEDIR)/juce_graphics.a
-# ALL_LIBS += $(MODULEDIR)/juce_gui_basics.a
-# ifeq ($(MACOS),true)
-# ALL_LIBS += $(MODULEDIR)/juce_gui_extra.a
-# endif
-# else
-# ALL_LIBS += $(MODULEDIR)/rtaudio.a
-# ALL_LIBS += $(MODULEDIR)/rtmidi.a
-# endif
-#
-# ifeq ($(HAVE_QT4),true)
-# ALL_LIBS += $(MODULEDIR)/theme.qt4.a
-# endif
-#
-# ifeq ($(HAVE_QT5),true)
-# ALL_LIBS += $(MODULEDIR)/theme.qt5.a
-# endif
+ALL_LIBS += $(MODULEDIR)/rtmempool.a
+
+ifeq ($(MACOS_OR_WIN32),true)
+ALL_LIBS += $(MODULEDIR)/juce_audio_devices.a
+ALL_LIBS += $(MODULEDIR)/juce_audio_processors.a
+ALL_LIBS += $(MODULEDIR)/juce_data_structures.a
+ALL_LIBS += $(MODULEDIR)/juce_events.a
+ALL_LIBS += $(MODULEDIR)/juce_graphics.a
+ALL_LIBS += $(MODULEDIR)/juce_gui_basics.a
+ifeq ($(MACOS),true)
+ALL_LIBS += $(MODULEDIR)/juce_gui_extra.a
+endif
+else
+ALL_LIBS += $(MODULEDIR)/rtaudio.a
+ALL_LIBS += $(MODULEDIR)/rtmidi.a
+endif
+
+ifeq ($(HAVE_QT4),true)
+ALL_LIBS += $(MODULEDIR)/theme.qt4.a
+endif
+
+ifeq ($(HAVE_QT5),true)
+ALL_LIBS += $(MODULEDIR)/theme.qt5.a
+endif
 
 libs: $(ALL_LIBS)
 
 $(MODULEDIR)/carla_engine.a: .FORCE
 	@$(MAKE) -C source/backend/engine
 
-$(MODULEDIR)/carla_engine_plugin.a: $(MODULEDIR)/carla_engine.a .FORCE
+$(MODULEDIR)/carla_engine_plugin.a: $(MODULEDIR)/carla_engine.a
 	@$(MAKE) -C source/backend/engine
 
 $(MODULEDIR)/carla_plugin.a: .FORCE
@@ -126,19 +125,19 @@ $(MODULEDIR)/%.a: .FORCE
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-backend: bin/libcarla_standalone2$(LIB_EXT) bin/libcarla_utils$(LIB_EXT)
+backend: $(BINDIR)/libcarla_standalone2$(LIB_EXT) $(BINDIR)/libcarla_utils$(LIB_EXT)
 
-bin/libcarla_standalone2$(LIB_EXT): libs .FORCE
-	$(MAKE) -C source/backend ../../bin/libcarla_standalone2$(LIB_EXT)
+$(BINDIR)/libcarla_standalone2$(LIB_EXT): libs .FORCE
+	$(MAKE) -C source/backend
 
-bin/libcarla_utils$(LIB_EXT): libs .FORCE
-	$(MAKE) -C source/backend ../../bin/libcarla_utils$(LIB_EXT)
+bin/libcarla_utils$(LIB_EXT): $(BINDIR)/libcarla_standalone2$(LIB_EXT)
+	$(MAKE) -C source/backend
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-bridges-plugin: bin/carla-bridge-native$(APP_EXT)
+bridges-plugin: $(BINDIR)/carla-bridge-native$(APP_EXT)
 
-bin/carla-bridge-native$(APP_EXT): libs .FORCE
+$(BINDIR)/carla-bridge-native$(APP_EXT): libs .FORCE
 	$(MAKE) -C source/bridges-plugin
 
 # ----------------------------------------------------------------------------------------------------------------------------
@@ -148,35 +147,35 @@ bridges-ui: libs .FORCE
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-discovery: bin/carla-discovery-native$(APP_EXT)
+discovery: $(BINDIR)/carla-discovery-native$(APP_EXT)
 
-bin/carla-discovery-native$(APP_EXT): libs .FORCE
+$(BINDIR)/carla-discovery-native$(APP_EXT): libs .FORCE
 	$(MAKE) -C source/discovery
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-interposer: bin/libcarla_interposer.so
+interposer: $(BINDIR)/libcarla_interposer.so
 
-bin/libcarla_interposer.so: .FORCE
+$(BINDIR)/libcarla_interposer.so: .FORCE
 	$(MAKE) -C source/interposer
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-plugin: plugin_build bin/carla.lv2/manifest.ttl
+plugin: plugin_build $(BINDIR)/carla.lv2/manifest.ttl
 
 plugin_build: libs .FORCE
 	$(MAKE) -C source/plugin
 
-bin/carla.lv2/manifest.ttl: plugin_build bridges-plugin bridges-ui discovery
+$(BINDIR)/carla.lv2/manifest.ttl: plugin_build bridges-plugin bridges-ui discovery
 	cd bin && ./carla-lv2-export$(APP_EXT); cd ..
-	cd bin/carla.lv2 && $(LINK) ../*bridge-* ../carla-discovery-* .; cd ..
+	cd $(BINDIR)/carla.lv2 && $(LINK) ../*bridge-* ../carla-discovery-* .; cd ..
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(HAVE_QT),true)
-theme: bin/styles/carlastyle$(LIB_EXT)
+theme: $(BINDIR)/styles/carlastyle$(LIB_EXT)
 
-bin/styles/carlastyle$(LIB_EXT): .FORCE
+$(BINDIR)/styles/carlastyle$(LIB_EXT): .FORCE
 	$(MAKE) -C source/modules/theme
 else
 theme:
@@ -185,7 +184,7 @@ endif
 # ----------------------------------------------------------------------------------------------------------------------------
 # Binaries (posix32)
 
-LIBS_POSIX32 += $(MODULEDIR)/jackbridge.posix32.a
+LIBS_POSIX32  = $(MODULEDIR)/jackbridge.posix32.a
 LIBS_POSIX32 += $(MODULEDIR)/juce_audio_basics.posix32.a
 LIBS_POSIX32 += $(MODULEDIR)/juce_core.posix32.a
 LIBS_POSIX32 += $(MODULEDIR)/lilv.posix32.a
@@ -207,7 +206,7 @@ posix32: $(LIBS_POSIX32)
 # ----------------------------------------------------------------------------------------------------------------------------
 # Binaries (posix64)
 
-LIBS_POSIX64 += $(MODULEDIR)/jackbridge.posix64.a
+LIBS_POSIX64  = $(MODULEDIR)/jackbridge.posix64.a
 LIBS_POSIX64 += $(MODULEDIR)/juce_audio_basics.posix64.a
 LIBS_POSIX64 += $(MODULEDIR)/juce_core.posix64.a
 LIBS_POSIX64 += $(MODULEDIR)/lilv.posix64.a
@@ -223,13 +222,13 @@ LIBS_POSIX64 += $(MODULEDIR)/juce_gui_extra.posix64.a
 endif
 
 posix64: $(LIBS_POSIX64)
-	$(MAKE) -C source/bridges-plugin posix64
-	$(MAKE) -C source/discovery posix64
+# 	$(MAKE) -C source/bridges-plugin posix64
+# 	$(MAKE) -C source/discovery posix64
 
 # ----------------------------------------------------------------------------------------------------------------------------
 # Binaries (win32)
 
-LIBS_WIN32 += $(MODULEDIR)/jackbridge.win32e.a
+LIBS_WIN32  = $(MODULEDIR)/jackbridge.win32e.a
 LIBS_WIN32 += $(MODULEDIR)/juce_audio_basics.win32.a
 LIBS_WIN32 += $(MODULEDIR)/juce_audio_processors.win32.a
 LIBS_WIN32 += $(MODULEDIR)/juce_core.win32.a
@@ -247,7 +246,7 @@ win32: $(LIBS_WIN32)
 # ----------------------------------------------------------------------------------------------------------------------------
 # Binaries (win64)
 
-LIBS_WIN64 += $(MODULEDIR)/jackbridge.win64e.a
+LIBS_WIN64  = $(MODULEDIR)/jackbridge.win64e.a
 LIBS_WIN64 += $(MODULEDIR)/juce_audio_basics.win64.a
 LIBS_WIN64 += $(MODULEDIR)/juce_audio_processors.win64.a
 LIBS_WIN64 += $(MODULEDIR)/juce_core.win64.a

bin/styles

@@ -1 +0,0 @@
-../source/modules/theme/styles/

source/modules/Makefile.mk

@@ -27,6 +27,7 @@ endif
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
+BUILD_C_FLAGS   += -I. -I$(CWD)/includes
 BUILD_CXX_FLAGS += -I. -I$(CWD)/includes -I$(CWD)/utils
 
 # ----------------------------------------------------------------------------------------------------------------------------

source/modules/juce_audio_devices/Makefile

@@ -4,92 +4,126 @@
 # Created by falkTX
 #
 
-include ../../Makefile.mk
+CWD=../..
+MODULENAME=juce_audio_devices
+include ../Makefile.mk
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-BUILD_CXX_FLAGS += $(JUCE_AUDIO_DEVICES_FLAGS) -I. -w
+BUILD_CXX_FLAGS += $(JUCE_AUDIO_DEVICES_FLAGS) -w
 
 ifeq ($(WIN32),true)
-BUILD_CXX_FLAGS += -I../../includes/asio
+BUILD_CXX_FLAGS += -I$(CWD)/includes/asio
 endif
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)
-OBJS         = juce_audio_devices.mm.o
-OBJS_posix32 = juce_audio_devices.mm.posix32.o
-OBJS_posix64 = juce_audio_devices.mm.posix64.o
+OBJS         = $(OBJDIR)/$(MODULENAME).mm.o
+OBJS_posix32 = $(OBJDIR)/$(MODULENAME).mm.posix32.o
+OBJS_posix64 = $(OBJDIR)/$(MODULENAME).mm.posix64.o
 else
-OBJS         = juce_audio_devices.cpp.o
-OBJS_posix32 = juce_audio_devices.cpp.posix32.o
-OBJS_posix64 = juce_audio_devices.cpp.posix64.o
+OBJS         = $(OBJDIR)/$(MODULENAME).cpp.o
+OBJS_posix32 = $(OBJDIR)/$(MODULENAME).cpp.posix32.o
+OBJS_posix64 = $(OBJDIR)/$(MODULENAME).cpp.posix64.o
 endif
-OBJS_win32   = juce_audio_devices.cpp.win32.o
-OBJS_win64   = juce_audio_devices.cpp.win64.o
+OBJS_win32   = $(OBJDIR)/$(MODULENAME).cpp.win32.o
+OBJS_win64   = $(OBJDIR)/$(MODULENAME).cpp.win64.o
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-all:     ../juce_audio_devices.a
-posix32: ../juce_audio_devices.posix32.a
-posix64: ../juce_audio_devices.posix64.a
-win32:   ../juce_audio_devices.win32.a
-win64:   ../juce_audio_devices.win64.a
+all:     $(MODULEDIR)/$(MODULENAME).a
+posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
+posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
+win32:   $(MODULEDIR)/$(MODULENAME).win32.a
+win64:   $(MODULEDIR)/$(MODULENAME).win64.a
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
 clean:
-	$(RM) *.o ../juce_audio_devices*.a
+	rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
 
 debug:
 	$(MAKE) DEBUG=true
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(MODULEDIR)/$(MODULENAME).a: $(OBJS)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).posix32.a: $(OBJS_posix32)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).posix32.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).posix64.a: $(OBJS_posix64)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).posix64.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).win32.a: $(OBJS_win32)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).win32.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).win64.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) -MMD -c -o $@
+
+$(OBJDIR)/$(MODULENAME).cpp.%32.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (32bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -MMD -c -o $@
+
+$(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (64bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -MMD -c -o $@
+
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) -MMD -ObjC++ -c -o $@
+
+$(OBJDIR)/$(MODULENAME).mm.%32.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (32bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -MMD -ObjC++ -c -o $@
+
+$(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (64bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -MMD -ObjC++ -c -o $@
+
+# ----------------------------------------------------------------------------------------------------------------------------
 
-../juce_audio_devices.a: $(OBJS)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_audio_devices.posix32.a: $(OBJS_posix32)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_audio_devices.posix64.a: $(OBJS_posix64)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_audio_devices.win32.a: $(OBJS_win32)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_audio_devices.win64.a: $(OBJS_win64)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-# --------------------------------------------------------------
-
-CPP_DEPS = juce_audio_devices.cpp juce_audio_devices.h AppConfig.h */*.cpp */*.h
-
-juce_audio_devices.cpp.o: $(CPP_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
-
-juce_audio_devices.cpp.%32.o: $(CPP_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
-
-juce_audio_devices.cpp.%64.o: $(CPP_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
-
-# --------------------------------------------------------------
-
-MM_DEPS = juce_audio_devices.cpp juce_audio_devices.h AppConfig.h */*.mm */*.cpp */*.h
-
-juce_audio_devices.mm.o: $(MM_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
-
-juce_audio_devices.mm.%32.o: $(MM_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(32BIT_FLAGS) -c -o $@
-
-juce_audio_devices.mm.%64.o: $(MM_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(64BIT_FLAGS) -c -o $@
+ifeq ($(MACOS),true)
+-include $(OBJDIR)/$(MODULENAME).mm.d
+-include $(OBJDIR)/$(MODULENAME).mm.posix32.d
+-include $(OBJDIR)/$(MODULENAME).mm.posix64.d
+else
+-include $(OBJDIR)/$(MODULENAME).cpp.d
+-include $(OBJDIR)/$(MODULENAME).cpp.posix32.d
+-include $(OBJDIR)/$(MODULENAME).cpp.posix64.d
+endif
+-include $(OBJDIR)/$(MODULENAME).cpp.win32.d
+-include $(OBJDIR)/$(MODULENAME).cpp.win64.d
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------

source/modules/juce_audio_processors/Makefile

@@ -4,9 +4,11 @@
 # Created by falkTX
 #
 
-include ../../Makefile.mk
+CWD=../..
+MODULENAME=juce_audio_processors
+include ../Makefile.mk
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
 BUILD_CXX_FLAGS += $(JUCE_AUDIO_PROCESSORS_FLAGS) -I. -I../../includes/ladspa -I../../includes/vst -I../../includes/vst3 -w
 
@@ -25,82 +27,114 @@ BUILD_CXX_FLAGS += -D_NATIVE_WCHAR_T_DEFINED -D__wchar_t=wchar_t -fpermissive
 endif
 endif
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)
-OBJS         = juce_audio_processors.mm.o
-OBJS_posix32 = juce_audio_processors.mm.posix32.o
-OBJS_posix64 = juce_audio_processors.mm.posix64.o
+OBJS         = $(OBJDIR)/$(MODULENAME).mm.o
+OBJS_posix32 = $(OBJDIR)/$(MODULENAME).mm.posix32.o
+OBJS_posix64 = $(OBJDIR)/$(MODULENAME).mm.posix64.o
 else
-OBJS         = juce_audio_processors.cpp.o
-OBJS_posix32 = juce_audio_processors.cpp.posix32.o
-OBJS_posix64 = juce_audio_processors.cpp.posix64.o
+OBJS         = $(OBJDIR)/$(MODULENAME).cpp.o
+OBJS_posix32 = $(OBJDIR)/$(MODULENAME).cpp.posix32.o
+OBJS_posix64 = $(OBJDIR)/$(MODULENAME).cpp.posix64.o
 endif
-OBJS_win32   = juce_audio_processors.cpp.win32.o
-OBJS_win64   = juce_audio_processors.cpp.win64.o
+OBJS_win32   = $(OBJDIR)/$(MODULENAME).cpp.win32.o
+OBJS_win64   = $(OBJDIR)/$(MODULENAME).cpp.win64.o
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-all:     ../juce_audio_processors.a
-posix32: ../juce_audio_processors.posix32.a
-posix64: ../juce_audio_processors.posix64.a
-win32:   ../juce_audio_processors.win32.a
-win64:   ../juce_audio_processors.win64.a
+all:     $(MODULEDIR)/$(MODULENAME).a
+posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
+posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
+win32:   $(MODULEDIR)/$(MODULENAME).win32.a
+win64:   $(MODULEDIR)/$(MODULENAME).win64.a
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
 clean:
-	$(RM) *.o ../juce_audio_processors*.a
+	rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
 
 debug:
 	$(MAKE) DEBUG=true
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(MODULEDIR)/$(MODULENAME).a: $(OBJS)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).posix32.a: $(OBJS_posix32)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).posix32.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).posix64.a: $(OBJS_posix64)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).posix64.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).win32.a: $(OBJS_win32)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).win32.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).win64.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) -MMD -c -o $@
+
+$(OBJDIR)/$(MODULENAME).cpp.%32.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (32bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -MMD -c -o $@
+
+$(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (64bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -MMD -c -o $@
+
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) -MMD -ObjC++ -c -o $@
+
+$(OBJDIR)/$(MODULENAME).mm.%32.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (32bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -MMD -ObjC++ -c -o $@
+
+$(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (64bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -MMD -ObjC++ -c -o $@
+
+# ----------------------------------------------------------------------------------------------------------------------------
 
-../juce_audio_processors.a: $(OBJS)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_audio_processors.posix32.a: $(OBJS_posix32)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_audio_processors.posix64.a: $(OBJS_posix64)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_audio_processors.win32.a: $(OBJS_win32)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_audio_processors.win64.a: $(OBJS_win64)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-# --------------------------------------------------------------
-
-CPP_DEPS = juce_audio_processors.cpp juce_audio_processors.h AppConfig.h */*.cpp */*.h
-
-juce_audio_processors.cpp.o: $(CPP_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
-
-juce_audio_processors.cpp.%32.o: $(CPP_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
-
-juce_audio_processors.cpp.%64.o: $(CPP_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
-
-# --------------------------------------------------------------
-
-MM_DEPS = juce_audio_processors.cpp juce_audio_processors.h AppConfig.h */*.mm */*.cpp */*.h
-
-juce_audio_processors.mm.o: $(MM_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
-
-juce_audio_processors.mm.%32.o: $(MM_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(32BIT_FLAGS) -c -o $@
-
-juce_audio_processors.mm.%64.o: $(MM_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(64BIT_FLAGS) -c -o $@
+ifeq ($(MACOS),true)
+-include $(OBJDIR)/$(MODULENAME).mm.d
+-include $(OBJDIR)/$(MODULENAME).mm.posix32.d
+-include $(OBJDIR)/$(MODULENAME).mm.posix64.d
+else
+-include $(OBJDIR)/$(MODULENAME).cpp.d
+-include $(OBJDIR)/$(MODULENAME).cpp.posix32.d
+-include $(OBJDIR)/$(MODULENAME).cpp.posix64.d
+endif
+-include $(OBJDIR)/$(MODULENAME).cpp.win32.d
+-include $(OBJDIR)/$(MODULENAME).cpp.win64.d
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------

source/modules/juce_data_structures/Makefile

@@ -4,88 +4,122 @@
 # Created by falkTX
 #
 
-include ../../Makefile.mk
+CWD=../..
+MODULENAME=juce_data_structures
+include ../Makefile.mk
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-BUILD_CXX_FLAGS += $(JUCE_DATA_STRUCTURES_FLAGS) -I. -w
+BUILD_CXX_FLAGS += $(JUCE_DATA_STRUCTURES_FLAGS) -w
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)
-OBJS         = juce_data_structures.mm.o
-OBJS_posix32 = juce_data_structures.mm.posix32.o
-OBJS_posix64 = juce_data_structures.mm.posix64.o
+OBJS         = $(OBJDIR)/$(MODULENAME).mm.o
+OBJS_posix32 = $(OBJDIR)/$(MODULENAME).mm.posix32.o
+OBJS_posix64 = $(OBJDIR)/$(MODULENAME).mm.posix64.o
 else
-OBJS         = juce_data_structures.cpp.o
-OBJS_posix32 = juce_data_structures.cpp.posix32.o
-OBJS_posix64 = juce_data_structures.cpp.posix64.o
+OBJS         = $(OBJDIR)/$(MODULENAME).cpp.o
+OBJS_posix32 = $(OBJDIR)/$(MODULENAME).cpp.posix32.o
+OBJS_posix64 = $(OBJDIR)/$(MODULENAME).cpp.posix64.o
 endif
-OBJS_win32   = juce_data_structures.cpp.win32.o
-OBJS_win64   = juce_data_structures.cpp.win64.o
+OBJS_win32   = $(OBJDIR)/$(MODULENAME).cpp.win32.o
+OBJS_win64   = $(OBJDIR)/$(MODULENAME).cpp.win64.o
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-all:     ../juce_data_structures.a
-posix32: ../juce_data_structures.posix32.a
-posix64: ../juce_data_structures.posix64.a
-win32:   ../juce_data_structures.win32.a
-win64:   ../juce_data_structures.win64.a
+all:     $(MODULEDIR)/$(MODULENAME).a
+posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
+posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
+win32:   $(MODULEDIR)/$(MODULENAME).win32.a
+win64:   $(MODULEDIR)/$(MODULENAME).win64.a
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
 clean:
-	$(RM) *.o ../juce_data_structures*.a
+	rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
 
 debug:
 	$(MAKE) DEBUG=true
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(MODULEDIR)/$(MODULENAME).a: $(OBJS)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).posix32.a: $(OBJS_posix32)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).posix32.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).posix64.a: $(OBJS_posix64)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).posix64.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).win32.a: $(OBJS_win32)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).win32.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).win64.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) -MMD -c -o $@
+
+$(OBJDIR)/$(MODULENAME).cpp.%32.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (32bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -MMD -c -o $@
+
+$(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (64bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -MMD -c -o $@
+
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) -MMD -ObjC++ -c -o $@
+
+$(OBJDIR)/$(MODULENAME).mm.%32.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (32bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -MMD -ObjC++ -c -o $@
+
+$(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (64bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -MMD -ObjC++ -c -o $@
+
+# ----------------------------------------------------------------------------------------------------------------------------
 
-../juce_data_structures.a: $(OBJS)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_data_structures.posix32.a: $(OBJS_posix32)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_data_structures.posix64.a: $(OBJS_posix64)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_data_structures.win32.a: $(OBJS_win32)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_data_structures.win64.a: $(OBJS_win64)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-# --------------------------------------------------------------
-
-CPP_DEPS = juce_data_structures.cpp juce_data_structures.h AppConfig.h */*.cpp */*.h
-
-juce_data_structures.cpp.o: $(CPP_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
-
-juce_data_structures.cpp.%32.o: $(CPP_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
-
-juce_data_structures.cpp.%64.o: $(CPP_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
-
-# --------------------------------------------------------------
-
-MM_DEPS = juce_data_structures.cpp juce_data_structures.h AppConfig.h */*.cpp */*.h
-
-juce_data_structures.mm.o: $(MM_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
-
-juce_data_structures.mm.%32.o: $(MM_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(32BIT_FLAGS) -c -o $@
-
-juce_data_structures.mm.%64.o: $(MM_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(64BIT_FLAGS) -c -o $@
+ifeq ($(MACOS),true)
+-include $(OBJDIR)/$(MODULENAME).mm.d
+-include $(OBJDIR)/$(MODULENAME).mm.posix32.d
+-include $(OBJDIR)/$(MODULENAME).mm.posix64.d
+else
+-include $(OBJDIR)/$(MODULENAME).cpp.d
+-include $(OBJDIR)/$(MODULENAME).cpp.posix32.d
+-include $(OBJDIR)/$(MODULENAME).cpp.posix64.d
+endif
+-include $(OBJDIR)/$(MODULENAME).cpp.win32.d
+-include $(OBJDIR)/$(MODULENAME).cpp.win64.d
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------

source/modules/juce_events/Makefile

@@ -4,88 +4,122 @@
 # Created by falkTX
 #
 
-include ../../Makefile.mk
+CWD=../..
+MODULENAME=juce_events
+include ../Makefile.mk
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-BUILD_CXX_FLAGS += $(JUCE_EVENTS_FLAGS) -I. -w
+BUILD_CXX_FLAGS += $(JUCE_EVENTS_FLAGS) -w
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)
-OBJS         = juce_events.mm.o
-OBJS_posix32 = juce_events.mm.posix32.o
-OBJS_posix64 = juce_events.mm.posix64.o
+OBJS         = $(OBJDIR)/$(MODULENAME).mm.o
+OBJS_posix32 = $(OBJDIR)/$(MODULENAME).mm.posix32.o
+OBJS_posix64 = $(OBJDIR)/$(MODULENAME).mm.posix64.o
 else
-OBJS         = juce_events.cpp.o
-OBJS_posix32 = juce_events.cpp.posix32.o
-OBJS_posix64 = juce_events.cpp.posix64.o
+OBJS         = $(OBJDIR)/$(MODULENAME).cpp.o
+OBJS_posix32 = $(OBJDIR)/$(MODULENAME).cpp.posix32.o
+OBJS_posix64 = $(OBJDIR)/$(MODULENAME).cpp.posix64.o
 endif
-OBJS_win32   = juce_events.cpp.win32.o
-OBJS_win64   = juce_events.cpp.win64.o
+OBJS_win32   = $(OBJDIR)/$(MODULENAME).cpp.win32.o
+OBJS_win64   = $(OBJDIR)/$(MODULENAME).cpp.win64.o
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-all:     ../juce_events.a
-posix32: ../juce_events.posix32.a
-posix64: ../juce_events.posix64.a
-win32:   ../juce_events.win32.a
-win64:   ../juce_events.win64.a
+all:     $(MODULEDIR)/$(MODULENAME).a
+posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
+posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
+win32:   $(MODULEDIR)/$(MODULENAME).win32.a
+win64:   $(MODULEDIR)/$(MODULENAME).win64.a
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
 clean:
-	$(RM) *.o ../juce_events*.a
+	rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
 
 debug:
 	$(MAKE) DEBUG=true
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(MODULEDIR)/$(MODULENAME).a: $(OBJS)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).posix32.a: $(OBJS_posix32)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).posix32.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).posix64.a: $(OBJS_posix64)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).posix64.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).win32.a: $(OBJS_win32)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).win32.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).win64.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) -MMD -c -o $@
+
+$(OBJDIR)/$(MODULENAME).cpp.%32.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (32bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -MMD -c -o $@
+
+$(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (64bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -MMD -c -o $@
+
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) -MMD -ObjC++ -c -o $@
+
+$(OBJDIR)/$(MODULENAME).mm.%32.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (32bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -MMD -ObjC++ -c -o $@
+
+$(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (64bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -MMD -ObjC++ -c -o $@
+
+# ----------------------------------------------------------------------------------------------------------------------------
 
-../juce_events.a: $(OBJS)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_events.posix32.a: $(OBJS_posix32)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_events.posix64.a: $(OBJS_posix64)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_events.win32.a: $(OBJS_win32)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_events.win64.a: $(OBJS_win64)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-# --------------------------------------------------------------
-
-CPP_DEPS = juce_events.cpp juce_events.h AppConfig.h */*.cpp */*.h
-
-juce_events.cpp.o: $(CPP_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
-
-juce_events.cpp.%32.o: $(CPP_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
-
-juce_events.cpp.%64.o: $(CPP_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
-
-# --------------------------------------------------------------
-
-MM_DEPS = juce_events.cpp juce_events.h AppConfig.h */*.mm */*.cpp */*.h
-
-juce_events.mm.o: $(MM_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
-
-juce_events.mm.%32.o: $(MM_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(32BIT_FLAGS) -c -o $@
-
-juce_events.mm.%64.o: $(MM_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(64BIT_FLAGS) -c -o $@
+ifeq ($(MACOS),true)
+-include $(OBJDIR)/$(MODULENAME).mm.d
+-include $(OBJDIR)/$(MODULENAME).mm.posix32.d
+-include $(OBJDIR)/$(MODULENAME).mm.posix64.d
+else
+-include $(OBJDIR)/$(MODULENAME).cpp.d
+-include $(OBJDIR)/$(MODULENAME).cpp.posix32.d
+-include $(OBJDIR)/$(MODULENAME).cpp.posix64.d
+endif
+-include $(OBJDIR)/$(MODULENAME).cpp.win32.d
+-include $(OBJDIR)/$(MODULENAME).cpp.win64.d
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------

source/modules/juce_graphics/Makefile

@@ -4,88 +4,122 @@
 # Created by falkTX
 #
 
-include ../../Makefile.mk
+CWD=../..
+MODULENAME=juce_graphics
+include ../Makefile.mk
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-BUILD_CXX_FLAGS += $(JUCE_GRAPHICS_FLAGS) -I. -w
+BUILD_CXX_FLAGS += $(JUCE_GRAPHICS_FLAGS) -w
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)
-OBJS         = juce_graphics.mm.o
-OBJS_posix32 = juce_graphics.mm.posix32.o
-OBJS_posix64 = juce_graphics.mm.posix64.o
+OBJS         = $(OBJDIR)/$(MODULENAME).mm.o
+OBJS_posix32 = $(OBJDIR)/$(MODULENAME).mm.posix32.o
+OBJS_posix64 = $(OBJDIR)/$(MODULENAME).mm.posix64.o
 else
-OBJS         = juce_graphics.cpp.o
-OBJS_posix32 = juce_graphics.cpp.posix32.o
-OBJS_posix64 = juce_graphics.cpp.posix64.o
+OBJS         = $(OBJDIR)/$(MODULENAME).cpp.o
+OBJS_posix32 = $(OBJDIR)/$(MODULENAME).cpp.posix32.o
+OBJS_posix64 = $(OBJDIR)/$(MODULENAME).cpp.posix64.o
 endif
-OBJS_win32   = juce_graphics.cpp.win32.o
-OBJS_win64   = juce_graphics.cpp.win64.o
+OBJS_win32   = $(OBJDIR)/$(MODULENAME).cpp.win32.o
+OBJS_win64   = $(OBJDIR)/$(MODULENAME).cpp.win64.o
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-all:     ../juce_graphics.a
-posix32: ../juce_graphics.posix32.a
-posix64: ../juce_graphics.posix64.a
-win32:   ../juce_graphics.win32.a
-win64:   ../juce_graphics.win64.a
+all:     $(MODULEDIR)/$(MODULENAME).a
+posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
+posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
+win32:   $(MODULEDIR)/$(MODULENAME).win32.a
+win64:   $(MODULEDIR)/$(MODULENAME).win64.a
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
 clean:
-	$(RM) *.o ../juce_graphics*.a
+	rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
 
 debug:
 	$(MAKE) DEBUG=true
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(MODULEDIR)/$(MODULENAME).a: $(OBJS)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).posix32.a: $(OBJS_posix32)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).posix32.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).posix64.a: $(OBJS_posix64)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).posix64.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).win32.a: $(OBJS_win32)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).win32.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).win64.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) -MMD -c -o $@
+
+$(OBJDIR)/$(MODULENAME).cpp.%32.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (32bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -MMD -c -o $@
+
+$(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (64bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -MMD -c -o $@
+
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) -MMD -ObjC++ -c -o $@
+
+$(OBJDIR)/$(MODULENAME).mm.%32.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (32bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -MMD -ObjC++ -c -o $@
+
+$(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (64bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -MMD -ObjC++ -c -o $@
+
+# ----------------------------------------------------------------------------------------------------------------------------
 
-../juce_graphics.a: $(OBJS)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_graphics.posix32.a: $(OBJS_posix32)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_graphics.posix64.a: $(OBJS_posix64)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_graphics.win32.a: $(OBJS_win32)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_graphics.win64.a: $(OBJS_win64)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-# --------------------------------------------------------------
-
-CPP_DEPS = juce_graphics.cpp juce_graphics.h AppConfig.h */*.cpp */*.h
-
-juce_graphics.cpp.o: $(CPP_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
-
-juce_graphics.cpp.%32.o: $(CPP_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
-
-juce_graphics.cpp.%64.o: $(CPP_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
-
-# --------------------------------------------------------------
-
-MM_DEPS = juce_graphics.cpp juce_graphics.h AppConfig.h */*.mm */*.cpp */*.h
-
-juce_graphics.mm.o: $(MM_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
-
-juce_graphics.mm.%32.o: $(MM_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(32BIT_FLAGS) -c -o $@
-
-juce_graphics.mm.%64.o: $(MM_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(64BIT_FLAGS) -c -o $@
+ifeq ($(MACOS),true)
+-include $(OBJDIR)/$(MODULENAME).mm.d
+-include $(OBJDIR)/$(MODULENAME).mm.posix32.d
+-include $(OBJDIR)/$(MODULENAME).mm.posix64.d
+else
+-include $(OBJDIR)/$(MODULENAME).cpp.d
+-include $(OBJDIR)/$(MODULENAME).cpp.posix32.d
+-include $(OBJDIR)/$(MODULENAME).cpp.posix64.d
+endif
+-include $(OBJDIR)/$(MODULENAME).cpp.win32.d
+-include $(OBJDIR)/$(MODULENAME).cpp.win64.d
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------

source/modules/juce_gui_basics/Makefile

@@ -4,88 +4,122 @@
 # Created by falkTX
 #
 
-include ../../Makefile.mk
+CWD=../..
+MODULENAME=juce_gui_basics
+include ../Makefile.mk
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-BUILD_CXX_FLAGS += $(JUCE_GUI_BASICS_FLAGS) -I. -w
+BUILD_CXX_FLAGS += $(JUCE_GUI_BASICS_FLAGS) -w
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)
-OBJS         = juce_gui_basics.mm.o
-OBJS_posix32 = juce_gui_basics.mm.posix32.o
-OBJS_posix64 = juce_gui_basics.mm.posix64.o
+OBJS         = $(OBJDIR)/$(MODULENAME).mm.o
+OBJS_posix32 = $(OBJDIR)/$(MODULENAME).mm.posix32.o
+OBJS_posix64 = $(OBJDIR)/$(MODULENAME).mm.posix64.o
 else
-OBJS         = juce_gui_basics.cpp.o
-OBJS_posix32 = juce_gui_basics.cpp.posix32.o
-OBJS_posix64 = juce_gui_basics.cpp.posix64.o
+OBJS         = $(OBJDIR)/$(MODULENAME).cpp.o
+OBJS_posix32 = $(OBJDIR)/$(MODULENAME).cpp.posix32.o
+OBJS_posix64 = $(OBJDIR)/$(MODULENAME).cpp.posix64.o
 endif
-OBJS_win32   = juce_gui_basics.cpp.win32.o
-OBJS_win64   = juce_gui_basics.cpp.win64.o
+OBJS_win32   = $(OBJDIR)/$(MODULENAME).cpp.win32.o
+OBJS_win64   = $(OBJDIR)/$(MODULENAME).cpp.win64.o
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-all:     ../juce_gui_basics.a
-posix32: ../juce_gui_basics.posix32.a
-posix64: ../juce_gui_basics.posix64.a
-win32:   ../juce_gui_basics.win32.a
-win64:   ../juce_gui_basics.win64.a
+all:     $(MODULEDIR)/$(MODULENAME).a
+posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
+posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
+win32:   $(MODULEDIR)/$(MODULENAME).win32.a
+win64:   $(MODULEDIR)/$(MODULENAME).win64.a
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
 clean:
-	$(RM) *.o ../juce_gui_basics*.a
+	rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
 
 debug:
 	$(MAKE) DEBUG=true
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(MODULEDIR)/$(MODULENAME).a: $(OBJS)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).posix32.a: $(OBJS_posix32)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).posix32.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).posix64.a: $(OBJS_posix64)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).posix64.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).win32.a: $(OBJS_win32)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).win32.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).win64.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) -MMD -c -o $@
+
+$(OBJDIR)/$(MODULENAME).cpp.%32.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (32bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -MMD -c -o $@
+
+$(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (64bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -MMD -c -o $@
+
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) -MMD -ObjC++ -c -o $@
+
+$(OBJDIR)/$(MODULENAME).mm.%32.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (32bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -MMD -ObjC++ -c -o $@
+
+$(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (64bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -MMD -ObjC++ -c -o $@
+
+# ----------------------------------------------------------------------------------------------------------------------------
 
-../juce_gui_basics.a: $(OBJS)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_gui_basics.posix32.a: $(OBJS_posix32)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_gui_basics.posix64.a: $(OBJS_posix64)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_gui_basics.win32.a: $(OBJS_win32)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_gui_basics.win64.a: $(OBJS_win64)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-# --------------------------------------------------------------
-
-CPP_DEPS = juce_gui_basics.cpp juce_gui_basics.h AppConfig.h */*.cpp */*.h
-
-juce_gui_basics.cpp.o: $(CPP_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
-
-juce_gui_basics.cpp.%32.o: $(CPP_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
-
-juce_gui_basics.cpp.%64.o: $(CPP_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
-
-# --------------------------------------------------------------
-
-MM_DEPS = juce_gui_basics.cpp juce_gui_basics.h AppConfig.h */*.mm */*.cpp */*.h
-
-juce_gui_basics.mm.o: $(MM_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
-
-juce_gui_basics.mm.%32.o: $(MM_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(32BIT_FLAGS) -c -o $@
-
-juce_gui_basics.mm.%64.o: $(MM_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(64BIT_FLAGS) -c -o $@
+ifeq ($(MACOS),true)
+-include $(OBJDIR)/$(MODULENAME).mm.d
+-include $(OBJDIR)/$(MODULENAME).mm.posix32.d
+-include $(OBJDIR)/$(MODULENAME).mm.posix64.d
+else
+-include $(OBJDIR)/$(MODULENAME).cpp.d
+-include $(OBJDIR)/$(MODULENAME).cpp.posix32.d
+-include $(OBJDIR)/$(MODULENAME).cpp.posix64.d
+endif
+-include $(OBJDIR)/$(MODULENAME).cpp.win32.d
+-include $(OBJDIR)/$(MODULENAME).cpp.win64.d
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------

source/modules/juce_gui_extra/Makefile

@@ -4,88 +4,122 @@
 # Created by falkTX
 #
 
-include ../../Makefile.mk
+CWD=../..
+MODULENAME=juce_gui_extra
+include ../Makefile.mk
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-BUILD_CXX_FLAGS += $(JUCE_GUI_EXTRA_FLAGS) -I. -w
+BUILD_CXX_FLAGS += $(JUCE_GUI_EXTRA_FLAGS) -w
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(MACOS),true)
-OBJS         = juce_gui_extra.mm.o
-OBJS_posix32 = juce_gui_extra.mm.posix32.o
-OBJS_posix64 = juce_gui_extra.mm.posix64.o
+OBJS         = $(OBJDIR)/$(MODULENAME).mm.o
+OBJS_posix32 = $(OBJDIR)/$(MODULENAME).mm.posix32.o
+OBJS_posix64 = $(OBJDIR)/$(MODULENAME).mm.posix64.o
 else
-OBJS         = juce_gui_extra.cpp.o
-OBJS_posix32 = juce_gui_extra.cpp.posix32.o
-OBJS_posix64 = juce_gui_extra.cpp.posix64.o
+OBJS         = $(OBJDIR)/$(MODULENAME).cpp.o
+OBJS_posix32 = $(OBJDIR)/$(MODULENAME).cpp.posix32.o
+OBJS_posix64 = $(OBJDIR)/$(MODULENAME).cpp.posix64.o
 endif
-OBJS_win32   = juce_gui_extra.cpp.win32.o
-OBJS_win64   = juce_gui_extra.cpp.win64.o
+OBJS_win32   = $(OBJDIR)/$(MODULENAME).cpp.win32.o
+OBJS_win64   = $(OBJDIR)/$(MODULENAME).cpp.win64.o
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-all:     ../juce_gui_extra.a
-posix32: ../juce_gui_extra.posix32.a
-posix64: ../juce_gui_extra.posix64.a
-win32:   ../juce_gui_extra.win32.a
-win64:   ../juce_gui_extra.win64.a
+all:     $(MODULEDIR)/$(MODULENAME).a
+posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
+posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
+win32:   $(MODULEDIR)/$(MODULENAME).win32.a
+win64:   $(MODULEDIR)/$(MODULENAME).win64.a
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
 clean:
-	$(RM) *.o ../juce_gui_extra*.a
+	rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
 
 debug:
 	$(MAKE) DEBUG=true
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(MODULEDIR)/$(MODULENAME).a: $(OBJS)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).posix32.a: $(OBJS_posix32)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).posix32.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).posix64.a: $(OBJS_posix64)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).posix64.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).win32.a: $(OBJS_win32)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).win32.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).win64.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) -MMD -c -o $@
+
+$(OBJDIR)/$(MODULENAME).cpp.%32.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (32bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -MMD -c -o $@
+
+$(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (64bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -MMD -c -o $@
+
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) -MMD -ObjC++ -c -o $@
+
+$(OBJDIR)/$(MODULENAME).mm.%32.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (32bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -MMD -ObjC++ -c -o $@
+
+$(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (64bit)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -MMD -ObjC++ -c -o $@
+
+# ----------------------------------------------------------------------------------------------------------------------------
 
-../juce_gui_extra.a: $(OBJS)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_gui_extra.posix32.a: $(OBJS_posix32)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_gui_extra.posix64.a: $(OBJS_posix64)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_gui_extra.win32.a: $(OBJS_win32)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../juce_gui_extra.win64.a: $(OBJS_win64)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-# --------------------------------------------------------------
-
-CPP_DEPS = juce_gui_extra.cpp juce_gui_extra.h AppConfig.h */*.cpp */*.h
-
-juce_gui_extra.cpp.o: $(CPP_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
-
-juce_gui_extra.cpp.%32.o: $(CPP_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
-
-juce_gui_extra.cpp.%64.o: $(CPP_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
-
-# --------------------------------------------------------------
-
-MM_DEPS = juce_gui_extra.cpp juce_gui_extra.h AppConfig.h */*.mm */*.cpp */*.h
-
-juce_gui_extra.mm.o: $(MM_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ -c -o $@
-
-juce_gui_extra.mm.%32.o: $(MM_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(32BIT_FLAGS) -c -o $@
-
-juce_gui_extra.mm.%64.o: $(MM_DEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -ObjC++ $(64BIT_FLAGS) -c -o $@
+ifeq ($(MACOS),true)
+-include $(OBJDIR)/$(MODULENAME).mm.d
+-include $(OBJDIR)/$(MODULENAME).mm.posix32.d
+-include $(OBJDIR)/$(MODULENAME).mm.posix64.d
+else
+-include $(OBJDIR)/$(MODULENAME).cpp.d
+-include $(OBJDIR)/$(MODULENAME).cpp.posix32.d
+-include $(OBJDIR)/$(MODULENAME).cpp.posix64.d
+endif
+-include $(OBJDIR)/$(MODULENAME).cpp.win32.d
+-include $(OBJDIR)/$(MODULENAME).cpp.win64.d
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------

source/modules/lilv/Makefile

@@ -4,116 +4,151 @@
 # Created by falkTX
 #
 
-include ../../Makefile.mk
+CWD=../..
+MODULENAME=lilv
+include ../Makefile.mk
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
 SERD_VERSION   = 0.20.0
 SORD_VERSION   = 0.12.2
 SRATOM_VERSION = 0.4.6
 LILV_VERSION   = 0.20.0
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-BUILD_C_FLAGS += $(LILV_FLAGS) -Iconfig -I../../includes -w
-LINK_FLAGS    += $(LILV_LIBS)
+BUILD_C_FLAGS += $(LILV_FLAGS) -Iconfig -w
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-OBJS         = serd.c.o         sord.c.o         sratom.c.o         lilv.c.o
-OBJS_posix32 = serd.c.posix32.o sord.c.posix32.o sratom.c.posix32.o lilv.c.posix32.o
-OBJS_posix64 = serd.c.posix64.o sord.c.posix64.o sratom.c.posix64.o lilv.c.posix64.o
-OBJS_win32   = serd.c.win32.o   sord.c.win32.o   sratom.c.win32.o   lilv.c.win32.o
-OBJS_win64   = serd.c.win64.o   sord.c.win64.o   sratom.c.win64.o   lilv.c.win64.o
+OBJS         = $(OBJDIR)/serd.c.o         $(OBJDIR)/sord.c.o         $(OBJDIR)/sratom.c.o         $(OBJDIR)/lilv.c.o
+OBJS_posix32 = $(OBJDIR)/serd.c.posix32.o $(OBJDIR)/sord.c.posix32.o $(OBJDIR)/sratom.c.posix32.o $(OBJDIR)/lilv.c.posix32.o
+OBJS_posix64 = $(OBJDIR)/serd.c.posix64.o $(OBJDIR)/sord.c.posix64.o $(OBJDIR)/sratom.c.posix64.o $(OBJDIR)/lilv.c.posix64.o
+OBJS_win32   = $(OBJDIR)/serd.c.win32.o   $(OBJDIR)/sord.c.win32.o   $(OBJDIR)/sratom.c.win32.o   $(OBJDIR)/lilv.c.win32.o
+OBJS_win64   = $(OBJDIR)/serd.c.win64.o   $(OBJDIR)/sord.c.win64.o   $(OBJDIR)/sratom.c.win64.o   $(OBJDIR)/lilv.c.win64.o
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-all:     ../lilv.a
-posix32: ../lilv.posix32.a
-posix64: ../lilv.posix64.a
-win32:   ../lilv.win32.a
-win64:   ../lilv.win64.a
+all:     $(MODULEDIR)/$(MODULENAME).a
+posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
+posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
+win32:   $(MODULEDIR)/$(MODULENAME).win32.a
+win64:   $(MODULEDIR)/$(MODULENAME).win64.a
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
 clean:
-	$(RM) *.o ../lilv*.a
+	rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
 
 debug:
 	$(MAKE) DEBUG=true
 
-# --------------------------------------------------------------
-
-../lilv.a: $(OBJS)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../lilv.posix32.a: $(OBJS_posix32)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../lilv.posix64.a: $(OBJS_posix64)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../lilv.win32.a: $(OBJS_win32)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../lilv.win64.a: $(OBJS_win64)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-# --------------------------------------------------------------
-
-SERD_DEPS = serd.c serd-$(SERD_VERSION)/src/* serd-$(SERD_VERSION)/serd/serd.h
-
-serd.c.o: $(SERD_DEPS)
-	$(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) -c -o $@
-
-serd.c.%32.o: $(SERD_DEPS)
-	$(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) $(32BIT_FLAGS) -c -o $@
-
-serd.c.%64.o: $(SERD_DEPS)
-	$(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) $(64BIT_FLAGS) -c -o $@
-
-# --------------------------------------------------------------
-
-SORD_DEPS = sord.c sord-$(SORD_VERSION)/src/* sord-$(SORD_VERSION)/sord/sord.h
-
-sord.c.o: $(SORD_DEPS)
-	$(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src -c -o $@
-
-sord.c.%32.o: $(SORD_DEPS)
-	$(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(32BIT_FLAGS) -c -o $@
-
-sord.c.%64.o: $(SORD_DEPS)
-	$(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(64BIT_FLAGS) -c -o $@
-
-# --------------------------------------------------------------
-
-SRATOM_DEPS = sratom.c sratom-$(SRATOM_VERSION)/src/* sratom-$(SRATOM_VERSION)/sratom/sratom.h
-
-sratom.c.o: $(SRATOM_DEPS)
-	$(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) -c -o $@
-
-sratom.c.%32.o: $(SRATOM_DEPS)
-	$(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) $(32BIT_FLAGS) -c -o $@
-
-sratom.c.%64.o: $(SRATOM_DEPS)
-	$(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) $(64BIT_FLAGS) -c -o $@
-
-# --------------------------------------------------------------
-
-LILV_DEPS = lilv.c lilv-$(LILV_VERSION)/src/* lilv-$(LILV_VERSION)/src/zix/* lilv-$(LILV_VERSION)/lilv/lilv.h
-
-lilv.c.o: $(LILV_DEPS)
-	$(CC) $< $(BUILD_C_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src -c -o $@
-
-lilv.c.%32.o: $(LILV_DEPS)
-	$(CC) $< $(BUILD_C_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src $(32BIT_FLAGS) -c -o $@
-
-lilv.c.%64.o: $(LILV_DEPS)
-	$(CC) $< $(BUILD_C_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src $(64BIT_FLAGS) -c -o $@
-
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(MODULEDIR)/$(MODULENAME).a: $(OBJS)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).posix32.a: $(OBJS_posix32)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).posix32.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).posix64.a: $(OBJS_posix64)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).posix64.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).win32.a: $(OBJS_win32)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).win32.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).win64.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(OBJDIR)/serd.c.o: serd.c
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) -MMD -c -o $@
+
+$(OBJDIR)/serd.c.%32.o: serd.c
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (32bit)"
+	@$(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) $(32BIT_FLAGS) -MMD -c -o $@
+
+$(OBJDIR)/serd.c.%64.o: serd.c
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (64bit)"
+	@$(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) $(64BIT_FLAGS) -MMD -c -o $@
+
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(OBJDIR)/sord.c.o: sord.c
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src -MMD -c -o $@
+
+$(OBJDIR)/sord.c.%32.o: sord.c
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (32bit)"
+	@$(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(32BIT_FLAGS) -MMD -c -o $@
+
+$(OBJDIR)/sord.c.%64.o: sord.c
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (64bit)"
+	@$(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(64BIT_FLAGS) -MMD -c -o $@
+
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(OBJDIR)/sratom.c.o: sratom.c
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) -MMD -c -o $@
+
+$(OBJDIR)/sratom.c.%32.o: sratom.c
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (32bit)"
+	@$(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) $(32BIT_FLAGS) -MMD -c -o $@
+
+$(OBJDIR)/sratom.c.%64.o: sratom.c
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (64bit)"
+	@$(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) $(64BIT_FLAGS) -MMD -c -o $@
+
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(OBJDIR)/lilv.c.o: lilv.c
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CC) $< $(BUILD_C_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src -MMD -c -o $@
+
+$(OBJDIR)/lilv.c.%32.o: lilv.c
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (32bit)"
+	@$(CC) $< $(BUILD_C_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src $(32BIT_FLAGS) -MMD -c -o $@
+
+$(OBJDIR)/lilv.c.%64.o: lilv.c
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (64bit)"
+	@$(CC) $< $(BUILD_C_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src $(64BIT_FLAGS) -MMD -c -o $@
+
+# ----------------------------------------------------------------------------------------------------------------------------
+
+-include $(OBJS:%.c.o=%.c.d)
+-include $(OBJS_posix32:%.c.posix32.o=%.c.posix32.d)
+-include $(OBJS_posix64:%.c.posix64.o=%.c.posix64.d)
+-include $(OBJS_win32:%.c.win32.o=%.c.win32.d)
+-include $(OBJS_win64:%.c.win64.o=%.c.win64.d)
+
+# ----------------------------------------------------------------------------------------------------------------------------

source/modules/rtaudio/Makefile

@@ -4,50 +4,45 @@
 # Created by falkTX
 #
 
-include ../../Makefile.mk
+CWD=../..
+MODULENAME=rtaudio
+include ../Makefile.mk
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-BUILD_CXX_FLAGS += $(RTAUDIO_FLAGS) -I. -Iinclude -I.. -I../../includes
+BUILD_CXX_FLAGS += $(RTAUDIO_FLAGS) -I.. -w
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-OBJS = \
-	RtAudio.cpp.o
+OBJS = $(OBJDIR)/RtAudio.cpp.o
 
-ifeq ($(WIN32),true)
-OBJS += \
-	include/asio.cpp.o \
-	include/asiodrivers.cpp.o \
-	include/asiolist.cpp.o \
-	include/iasiothiscallresolver.cpp.o
-endif
+# ----------------------------------------------------------------------------------------------------------------------------
 
-TARGETS = \
-	../rtaudio.a
+all: $(MODULEDIR)/$(MODULENAME).a
 
-# --------------------------------------------------------------
-
-all: $(TARGETS)
-
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
 clean:
-	$(RM) $(OBJS)
-	$(RM) $(TARGETS)
+	rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
 
 debug:
 	$(MAKE) DEBUG=true
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(MODULEDIR)/$(MODULENAME).a: $(OBJS)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).a"
+	@rm -f $@
+	@$(AR) crs $@ $^
 
-../rtaudio.a: $(OBJS)
-	$(RM) $@
-	$(AR) crs $@ $^
+# ----------------------------------------------------------------------------------------------------------------------------
 
-# --------------------------------------------------------------
+$(OBJDIR)/%.cpp.o: %.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) -MMD -c -o $@
 
-RtAudio.cpp.o: RtAudio.cpp RtAudio.h
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+-include $(OBJS:%.cpp.o=%.cpp.d)
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------

source/modules/rtmempool/Makefile

@@ -4,69 +4,93 @@
 # Created by falkTX
 #
 
-include ../../Makefile.mk
+CWD=../..
+MODULENAME=rtmempool
+include ../Makefile.mk
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-BUILD_C_FLAGS += $(RTMEMPOOL_FLAGS) -I. -I../../includes
+BUILD_C_FLAGS += $(RTMEMPOOL_FLAGS)
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-OBJS         = rtmempool.c.o
-OBJS_posix32 = rtmempool.c.posix32.o
-OBJS_posix64 = rtmempool.c.posix64.o
-OBJS_win32   = rtmempool.c.win32.o
-OBJS_win64   = rtmempool.c.win64.o
+OBJS         = $(OBJDIR)/$(MODULENAME).c.o
+OBJS_posix32 = $(OBJDIR)/$(MODULENAME).c.posix32.o
+OBJS_posix64 = $(OBJDIR)/$(MODULENAME).c.posix64.o
+OBJS_win32   = $(OBJDIR)/$(MODULENAME).c.win32.o
+OBJS_win64   = $(OBJDIR)/$(MODULENAME).c.win64.o
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-all:     ../rtmempool.a
-posix32: ../rtmempool.posix32.a
-posix64: ../rtmempool.posix64.a
-win32:   ../rtmempool.win32.a
-win64:   ../rtmempool.win64.a
+all:     $(MODULEDIR)/$(MODULENAME).a
+posix32: $(MODULEDIR)/$(MODULENAME).posix32.a
+posix64: $(MODULEDIR)/$(MODULENAME).posix64.a
+win32:   $(MODULEDIR)/$(MODULENAME).win32.a
+win64:   $(MODULEDIR)/$(MODULENAME).win64.a
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
 clean:
-	$(RM) *.o ../rtmempool*.a
+	rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
 
 debug:
 	$(MAKE) DEBUG=true
 
-# --------------------------------------------------------------
-
-../rtmempool.a: $(OBJS)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../rtmempool.posix32.a: $(OBJS_posix32)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../rtmempool.posix64.a: $(OBJS_posix64)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../rtmempool.win32.a: $(OBJS_win32)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-../rtmempool.win64.a: $(OBJS_win64)
-	$(RM) $@
-	$(AR) crs $@ $^
-
-# --------------------------------------------------------------
-
-DEPS = rtmempool.c rtmempool.h rtmempool-lv2.h list.h
-
-rtmempool.c.o: $(DEPS)
-	$(CC) $< $(BUILD_C_FLAGS) -c -o $@
-
-rtmempool.c.%32.o: $(DEPS)
-	$(CC) $< $(BUILD_C_FLAGS) $(32BIT_FLAGS) -c -o $@
-
-rtmempool.c.%64.o: $(DEPS)
-	$(CC) $< $(BUILD_C_FLAGS) $(64BIT_FLAGS) -c -o $@
-
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(MODULEDIR)/$(MODULENAME).a: $(OBJS)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).posix32.a: $(OBJS_posix32)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).posix32.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).posix64.a: $(OBJS_posix64)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).posix64.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).win32.a: $(OBJS_win32)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).win32.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+$(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).win64.a"
+	@rm -f $@
+	@$(AR) crs $@ $^
+
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(OBJDIR)/$(MODULENAME).c.o: $(MODULENAME).c
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CC) $< $(BUILD_C_FLAGS) -MMD -c -o $@
+
+$(OBJDIR)/$(MODULENAME).c.%32.o: $(MODULENAME).c
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (32bit)"
+	@$(CC) $< $(BUILD_C_FLAGS) $(32BIT_FLAGS) -MMD -c -o $@
+
+$(OBJDIR)/$(MODULENAME).c.%64.o: $(MODULENAME).c
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (64bit)"
+	@$(CC) $< $(BUILD_C_FLAGS) $(64BIT_FLAGS) -MMD -c -o $@
+
+# ----------------------------------------------------------------------------------------------------------------------------
+
+-include $(OBJS:%.c.o=%.c.d)
+-include $(OBJS_posix32:%.c.posix32.o=%.c.posix32.d)
+-include $(OBJS_posix64:%.c.posix64.o=%.c.posix64.d)
+-include $(OBJS_win32:%.c.win32.o=%.c.win32.d)
+-include $(OBJS_win64:%.c.win64.o=%.c.win64.d)
+
+# ----------------------------------------------------------------------------------------------------------------------------

source/modules/rtmidi/Makefile

@@ -4,42 +4,45 @@
 # Created by falkTX
 #
 
-include ../../Makefile.mk
+CWD=../..
+MODULENAME=rtmidi
+include ../Makefile.mk
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-BUILD_CXX_FLAGS += $(RTMIDI_FLAGS) -I. -Iinclude -I.. -I../../includes
+BUILD_CXX_FLAGS += $(RTMIDI_FLAGS) -w
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
-OBJS = \
-	RtMidi.cpp.o
+OBJS = $(OBJDIR)/RtMidi.cpp.o
 
-TARGETS = \
-	../rtmidi.a
+# ----------------------------------------------------------------------------------------------------------------------------
 
-# --------------------------------------------------------------
+all: $(MODULEDIR)/$(MODULENAME).a
 
-all: $(TARGETS)
-
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
 clean:
-	$(RM) $(OBJS)
-	$(RM) $(TARGETS)
+	rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a
 
 debug:
 	$(MAKE) DEBUG=true
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(MODULEDIR)/$(MODULENAME).a: $(OBJS)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).a"
+	@rm -f $@
+	@$(AR) crs $@ $^
 
-../rtmidi.a: $(OBJS)
-	$(RM) $@
-	$(AR) crs $@ $^
+# ----------------------------------------------------------------------------------------------------------------------------
 
-# --------------------------------------------------------------
+$(OBJDIR)/%.cpp.o: %.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) -MMD -c -o $@
 
-RtMidi.cpp.o: RtMidi.cpp RtMidi.h
-	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+-include $(OBJS:%.cpp.o=%.cpp.d)
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------

source/modules/theme/Makefile

@@ -4,26 +4,22 @@
 # Created by falkTX
 #
 
-include ../../Makefile.mk
+CWD=../..
+MODULENAME=theme
+include ../Makefile.mk
 
-# --------------------------------------------------------------
-
-BUILD_CXX_FLAGS += -I. -I../../includes -I../../utils
+# ----------------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(HAVE_QT4),true)
-QT4_CXX_FLAGS    = $(BUILD_CXX_FLAGS)
-QT4_CXX_FLAGS   += $(shell pkg-config --cflags QtCore QtGui)
-QT4_LINK_FLAGS   = $(LINK_FLAGS)
-QT4_LINK_FLAGS  += $(shell pkg-config --libs QtCore QtGui)
-QT4_STYLES_DIR   = $(shell pkg-config --variable=libdir QtCore)/qt4/plugins/styles
+QT4_CXX_FLAGS  = $(BUILD_CXX_FLAGS) $(shell pkg-config --cflags QtCore QtGui)
+QT4_LINK_FLAGS = $(LINK_FLAGS) $(shell pkg-config --libs QtCore QtGui)
+QT4_STYLES_DIR = $(shell pkg-config --variable=libdir QtCore)/qt4/plugins/styles
 endif
 
 ifeq ($(HAVE_QT5),true)
-QT5_CXX_FLAGS    = $(BUILD_CXX_FLAGS)
-QT5_CXX_FLAGS   += $(shell pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets)
-QT5_LINK_FLAGS   = $(LINK_FLAGS)
-QT5_LINK_FLAGS  += $(shell pkg-config --libs Qt5Core Qt5Gui Qt5Widgets)
-QT5_STYLES_DIR   = $(shell pkg-config --variable=libdir Qt5Core)/qt5/plugins/styles
+QT5_CXX_FLAGS  = $(BUILD_CXX_FLAGS) $(shell pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets)
+QT5_LINK_FLAGS = $(LINK_FLAGS) $(shell pkg-config --libs Qt5Core Qt5Gui Qt5Widgets)
+QT5_STYLES_DIR = $(shell pkg-config --variable=libdir Qt5Core)/qt5/plugins/styles
 endif
 
 ifeq ($(DEFAULT_QT),4)
@@ -34,24 +30,24 @@ QT_STYLES_DIR     = $(QT5_STYLES_DIR)
 SHARED_LINK_FLAGS = $(QT5_LINK_FLAGS)
 endif
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(HAVE_QT4),true)
 FILES_qt4 = \
-	moc_CarlaStyle.qt4.cpp \
-	moc_CarlaStyleAnimations.qt4.cpp \
-	moc_CarlaStylePlugin.qt4.cpp \
-	moc_CarlaStylePrivate.qt4.cpp \
-	resources.qt4.cpp
+	$(OBJDIR)/moc_CarlaStyle.qt4.cpp \
+	$(OBJDIR)/moc_CarlaStyleAnimations.qt4.cpp \
+	$(OBJDIR)/moc_CarlaStylePlugin.qt4.cpp \
+	$(OBJDIR)/moc_CarlaStylePrivate.qt4.cpp \
+	$(OBJDIR)/resources.qt4.cpp
 endif
 
 ifeq ($(HAVE_QT5),true)
 FILES_qt5 = \
-	moc_CarlaStyle.qt5.cpp \
-	moc_CarlaStyleAnimations.qt5.cpp \
-	moc_CarlaStylePlugin.qt5.cpp \
-	moc_CarlaStylePrivate.qt5.cpp \
-	resources.qt5.cpp
+	$(OBJDIR)/moc_CarlaStyle.qt5.cpp \
+	$(OBJDIR)/moc_CarlaStyleAnimations.qt5.cpp \
+	$(OBJDIR)/moc_CarlaStylePlugin.qt5.cpp \
+	$(OBJDIR)/moc_CarlaStylePrivate.qt5.cpp \
+	$(OBJDIR)/resources.qt5.cpp
 endif
 
 ifeq ($(DEFAULT_QT),4)
@@ -60,121 +56,155 @@ else
 FILES_shared = $(FILES_qt5)
 endif
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
 ifeq ($(HAVE_QT4),true)
 OBJS_qt4 = \
-	CarlaStyle.cpp.qt4.o \
-	moc_CarlaStyle.qt4.cpp.o \
-	moc_CarlaStyleAnimations.qt4.cpp.o \
-	moc_CarlaStylePrivate.qt4.cpp.o \
-	resources.qt4.cpp.o
+	$(OBJDIR)/CarlaStyle.cpp.qt4.o \
+	$(OBJDIR)/moc_CarlaStyle.qt4.cpp.o \
+	$(OBJDIR)/moc_CarlaStyleAnimations.qt4.cpp.o \
+	$(OBJDIR)/moc_CarlaStylePrivate.qt4.cpp.o \
+	$(OBJDIR)/resources.qt4.cpp.o
 
 OBJS_qt4_shared = $(OBJS_qt4) \
-	CarlaStylePlugin.cpp.qt4.o \
-	moc_CarlaStylePlugin.qt4.cpp.o
+	$(OBJDIR)/CarlaStylePlugin.cpp.qt4.o \
+	$(OBJDIR)/moc_CarlaStylePlugin.qt4.cpp.o
 endif
 
 ifeq ($(HAVE_QT5),true)
 OBJS_qt5 = \
-	CarlaStyle.cpp.qt5.o \
-	moc_CarlaStyle.qt5.cpp.o \
-	moc_CarlaStyleAnimations.qt5.cpp.o \
-	moc_CarlaStylePrivate.qt5.cpp.o \
-	resources.qt5.cpp.o
+	$(OBJDIR)/CarlaStyle.cpp.qt5.o \
+	$(OBJDIR)/moc_CarlaStyle.qt5.cpp.o \
+	$(OBJDIR)/moc_CarlaStyleAnimations.qt5.cpp.o \
+	$(OBJDIR)/moc_CarlaStylePrivate.qt5.cpp.o \
+	$(OBJDIR)/resources.qt5.cpp.o
 
 OBJS_qt5_shared = $(OBJS_qt5) \
-	CarlaStylePlugin.cpp.qt5.o \
-	moc_CarlaStylePlugin.qt5.cpp.o
+	$(OBJDIR)/CarlaStylePlugin.cpp.qt5.o \
+	$(OBJDIR)/moc_CarlaStylePlugin.qt5.cpp.o
 endif
 
 ifeq ($(DEFAULT_QT),4)
-OBJS_shared += $(OBJS_qt4_shared)
+OBJS_shared = $(OBJS_qt4_shared)
 else
-OBJS_shared += $(OBJS_qt5_shared)
+OBJS_shared = $(OBJS_qt5_shared)
 endif
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
 all:
 
 ifeq ($(DEFAULT_QT),4)
 ifeq ($(HAVE_QT4),true)
-all: styles/carlastyle$(LIB_EXT)
+all: $(BINDIR)/styles/carlastyle$(LIB_EXT) $(BINDIR)/styles/carlastyle.json
 endif
 else # DEFAULT_QT
 ifeq ($(HAVE_QT5),true)
-all: styles/carlastyle$(LIB_EXT)
+all: $(BINDIR)/styles/carlastyle$(LIB_EXT) $(BINDIR)/styles/carlastyle.json
 endif
 endif
 
-qt4: ../theme.qt4.a
-qt5: ../theme.qt5.a
-
-# --------------------------------------------------------------
-
-../theme.qt4.a: $(FILES_qt4) $(OBJS_qt4)
-	$(RM) $@
-	$(AR) crs $@ $(OBJS_qt4)
-
-../theme.qt5.a: $(FILES_qt5) $(OBJS_qt5)
-	$(RM) $@
-	$(AR) crs $@ $(OBJS_qt5)
-
-# --------------------------------------------------------------
-
-styles/carlastyle.dll: $(FILES_shared) $(OBJS_shared)
-	$(CXX) $(OBJS_shared) $(SHARED_LINK_FLAGS) -luuid -lwinspool -lgdi32 -limm32 -lole32 -lshell32 -lws2_32 -shared -o $@
-# 	$(CXX) $(OBJS_shared) \
-# 	-L/home/falktx/.winepy3/drive_c/Python33/Lib/site-packages/PyQt4/ -lQtGui4 -lQtCore4 \
-# 	-shared -o $@
-
-styles/carlastyle.dylib: $(FILES_shared) $(OBJS_shared)
-	$(CXX) $(OBJS_shared) $(SHARED_LINK_FLAGS) -dynamiclib -o $@
-
-styles/carlastyle.so: $(FILES_shared) $(OBJS_shared)
-	$(CXX) $(OBJS_shared) $(SHARED_LINK_FLAGS) -shared -o $@
-
-# --------------------------------------------------------------
-
-%.qt4.cpp.o: %.qt4.cpp CarlaStyle.hpp moc_CarlaStyle.qt4.cpp
-	$(CXX) $< $(QT4_CXX_FLAGS) -c -o $@
-
-%.qt5.cpp.o: %.qt5.cpp CarlaStyle.hpp moc_CarlaStyle.qt5.cpp
-	$(CXX) $< $(QT5_CXX_FLAGS) -c -o $@
-
-%.cpp.qt4.o: %.cpp CarlaStyle.hpp moc_CarlaStyle.qt4.cpp
-	$(CXX) $< $(QT4_CXX_FLAGS) -c -o $@
-
-%.cpp.qt5.o: %.cpp CarlaStyle.hpp moc_CarlaStyle.qt5.cpp
-	$(CXX) $< $(QT5_CXX_FLAGS) -c -o $@
-
-moc_%.qt4.cpp: %.hpp
-	$(MOC_QT4) $< -o $@
-
-moc_%.qt5.cpp: %.hpp
-	$(MOC_QT5) -Istyles $< -o $@
-
-resources.qt4.cpp: ../../../resources/resources-theme.qrc
-	$(RCC_QT4) $< -o $@
-
-resources.qt5.cpp: ../../../resources/resources-theme.qrc
-	$(RCC_QT5) $< -o $@
+qt4: $(MODULEDIR)/$(MODULENAME).qt4.a
+qt5: $(MODULEDIR)/$(MODULENAME).qt5.a
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
 
 clean:
-	$(RM) *.o ../theme*.a styles/carlastyle$(LIB_EXT) $(FILES_qt4) $(FILES_qt5)
+	rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a $(BINDIR)/styles/carlastyle$(LIB_EXT) $(FILES_qt4) $(FILES_qt5)
 
 debug:
 	$(MAKE) DEBUG=true
 
-install: styles/carlastyle$(LIB_EXT) styles/carlastyle.json
+install: $(BINDIR)/styles/carlastyle$(LIB_EXT) $(BINDIR)/styles/carlastyle.json
 	install -d $(QT_STYLES_DIR)
 	install -m 644 $^ $(QT_STYLES_DIR)
 
-install-main: styles/carlastyle$(LIB_EXT) styles/carlastyle.json
+install-main: $(BINDIR)/styles/carlastyle$(LIB_EXT) $(BINDIR)/styles/carlastyle.json
 	install -d $(STYLES_DIR)
 	install -m 644 $^ $(STYLES_DIR)
 
-# --------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(MODULEDIR)/$(MODULENAME).qt4.a: $(FILES_qt4) $(OBJS_qt4)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).qt4.a"
+	@rm -f $@
+	@$(AR) crs $@ $(OBJS_qt4)
+
+$(MODULEDIR)/$(MODULENAME).qt5.a: $(FILES_qt5) $(OBJS_qt5)
+	-@mkdir -p $(MODULEDIR)
+	@echo "Creating $(MODULENAME).qt5.a"
+	@rm -f $@
+	@$(AR) crs $@ $(OBJS_qt5)
+
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(BINDIR)/styles/carlastyle.dll: $(FILES_shared) $(OBJS_shared)
+	-@mkdir -p $(BINDIR)/styles
+	@echo "Linking carlastyle.dll"
+	@$(CXX) $(OBJS_shared) $(SHARED_LINK_FLAGS) -luuid -lwinspool -lgdi32 -limm32 -lole32 -lshell32 -lws2_32 -shared -o $@
+
+$(BINDIR)/styles/carlastyle.dylib: $(FILES_shared) $(OBJS_shared)
+	-@mkdir -p $(BINDIR)/styles
+	@echo "Linking carlastyle.dylib"
+	@$(CXX) $(OBJS_shared) $(SHARED_LINK_FLAGS) -dynamiclib -o $@
+
+$(BINDIR)/styles/carlastyle.so: $(FILES_shared) $(OBJS_shared)
+	-@mkdir -p $(BINDIR)/styles
+	@echo "Linking carlastyle.so"
+	@$(CXX) $(OBJS_shared) $(SHARED_LINK_FLAGS) -shared -o $@
+
+$(BINDIR)/styles/carlastyle.json: styles/carlastyle.json
+	-@mkdir -p $(BINDIR)/styles
+	@cp -f $< $@
+
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(OBJDIR)/moc_%.qt4.cpp: %.hpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Generating moc_$*.qt4.cpp"
+	@$(MOC_QT4) $< -o $@
+
+$(OBJDIR)/moc_%.qt5.cpp: %.hpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Generating moc_$*.qt5.cpp"
+	@$(MOC_QT5) -Istyles $< -o $@
+
+$(OBJDIR)/resources.qt4.cpp: ../../../resources/resources-theme.qrc
+	-@mkdir -p $(OBJDIR)
+	@echo "Generating resources.qt4.cpp"
+	@$(RCC_QT4) $< -o $@
+
+$(OBJDIR)/resources.qt5.cpp: ../../../resources/resources-theme.qrc
+	-@mkdir -p $(OBJDIR)
+	@echo "Generating resources.qt5.cpp"
+	@$(RCC_QT5) $< -o $@
+
+# ----------------------------------------------------------------------------------------------------------------------------
+
+$(OBJDIR)/%.qt4.cpp.o: $(OBJDIR)/%.qt4.cpp $(OBJDIR)/moc_CarlaStyle.qt4.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $*.cpp (Qt4)"
+	@$(CXX) $< $(QT4_CXX_FLAGS) -MMD -c -o $@
+
+$(OBJDIR)/%.qt5.cpp.o: $(OBJDIR)/%.qt5.cpp $(OBJDIR)/moc_CarlaStyle.qt5.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $*.cpp (Qt5)"
+	@$(CXX) $< $(QT5_CXX_FLAGS) -MMD -c -o $@
+
+$(OBJDIR)/%.cpp.qt4.o: %.cpp $(OBJDIR)/moc_CarlaStyle.qt4.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (Qt4)"
+	@$(CXX) $< $(QT4_CXX_FLAGS) -MMD -c -o $@
+
+$(OBJDIR)/%.cpp.qt5.o: %.cpp $(OBJDIR)/moc_CarlaStyle.qt5.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $< (Qt5)"
+	@$(CXX) $< $(QT5_CXX_FLAGS) -MMD -c -o $@
+
+-include $(OBJSDIR)/CarlaStyle.cpp.qt4.d
+-include $(OBJSDIR)/CarlaStyle.cpp.qt5.d
+-include $(OBJSDIR)/CarlaStylePlugin.cpp.qt4.d
+-include $(OBJSDIR)/CarlaStylePlugin.cpp.qt5.d
+
+# ----------------------------------------------------------------------------------------------------------------------------