Rework makefiles

Makefile

@@ -28,9 +28,9 @@ WARN:
 	@echo "git checkout 1.0.x"
 
 # --------------------------------------------------------------
-# C++ code
+# C++ code (native)
 
-CXX: backend bridges discovery
+CXX: backend bridges discovery theme
 
 backend:
 	$(MAKE) -C source/backend
@@ -47,6 +47,9 @@ plugin:
 theme:
 	$(MAKE) -C source/modules/theme
 
+# --------------------------------------------------------------
+# C++ code (variants)
+
 posix32:
 	$(MAKE) -C source/bridges posix32
 	$(MAKE) -C source/discovery posix32
@@ -237,53 +240,38 @@ uninstall:
 ANS_NO=\033[31m NO \033[0m
 ANS_YES=\033[32m YES \033[0m
 mS=\033[33m[
+mZ=\033[30;1m[
 mE=]\033[0m
 
 features:
-ifeq ($(MACOS),true)
-# --- MacOS ---
-	@echo "\033[36m---> Engine drivers: (MacOS)\033[0m"
-	@echo "JACK:     $(ANS_YES)"
-ifeq ($(CARLA_RTAUDIO_SUPPORT),true)
-	@echo "CoreAudio:$(ANS_YES)"
-else
-	@echo "CoreAudio:$(ANS_NO) $(mS)RtAudio disabled$(mE)"
-endif
-# --- MacOS ---
-else
-# --- Win32 ---
-ifeq ($(WIN32),true)
-	@echo "\033[36m---> Engine drivers: (Windows)\033[0m"
-	@echo "JACK:       $(ANS_YES)"
-ifeq ($(CARLA_RTAUDIO_SUPPORT),true)
-	@echo "ASIO:       $(ANS_YES)"
-	@echo "DirectSound:$(ANS_YES)"
-else
-	@echo "ASIO:       $(ANS_NO) $(mS)RtAudio disabled$(mE)"
-	@echo "DirectSound:$(ANS_NO) $(mS)RtAudio disabled$(mE)"
-endif
-# --- Win32 ---
-else
-# --- Others ---
 	@echo "\033[36m---> Engine drivers: \033[0m"
-	@echo "JACK:      $(ANS_YES)"
-ifeq ($(CARLA_RTAUDIO_SUPPORT),true)
+	@echo "JACK:       $(ANS_YES)"
+ifeq ($(LINUX),true)
 ifeq ($(HAVE_ALSA),true)
-	@echo "ALSA:      $(ANS_YES)"
+	@echo "ALSA:       $(ANS_YES)"
 else
-	@echo "ALSA:      $(ANS_NO) $(mS)Missing ALSA$(mE)"
+	@echo "ALSA:       $(ANS_NO)  $(mS)Missing ALSA$(mE)"
 endif
 ifeq ($(HAVE_PULSEAUDIO),true)
-	@echo "PulseAudio:$(ANS_YES)"
+	@echo "PulseAudio: $(ANS_YES)"
 else
-	@echo "PulseAudio:$(ANS_NO) $(mS)Missing PulseAudio$(mE)"
+	@echo "PulseAudio: $(ANS_NO)  $(mS)Missing PulseAudio$(mE)"
 endif
 else
-	@echo "ALSA:      $(ANS_NO) $(mS)RtAudio disabled$(mE)"
-	@echo "PulseAudio:$(ANS_NO) $(mS)RtAudio disabled$(mE)"
+	@echo "ALSA:       $(ANS_NO)  $(mZ)Linux only$(mE)"
+	@echo "PulseAudio: $(ANS_NO)  $(mZ)Linux only$(mE)"
 endif
-# --- Others ---
+ifeq ($(MACOS),true)
+	@echo "CoreAudio:  $(ANS_YES)"
+else
+	@echo "CoreAudio:  $(ANS_NO)  $(mZ)MacOS only$(mE)"
 endif
+ifeq ($(WIN32),true)
+	@echo "ASIO:       $(ANS_YES)"
+	@echo "DirectSound:$(ANS_YES)"
+else
+	@echo "ASIO:       $(ANS_NO)  $(mZ)Windows only$(mE)"
+	@echo "DirectSound:$(ANS_NO)  $(mZ)Windows only$(mE)"
 endif
 	@echo ""
 
@@ -294,76 +282,87 @@ ifeq ($(CARLA_PLUGIN_SUPPORT),true)
 	@echo "DSSI:    $(ANS_YES)"
 	@echo "LV2:     $(ANS_YES)"
 	@echo "VST:     $(ANS_YES)"
+ifeq ($(MACOS),true)
+	@echo "AU:      $(ANS_YES)"
+else
+	@echo "AU:      $(ANS_NO)  $(mZ)MacOS only$(mE)"
+endif
 else
-	@echo "LADSPA:  $(ANS_NO) $(mS)Plugins disabled$(mE)"
-	@echo "DSSI:    $(ANS_NO) $(mS)Plugins disabled$(mE)"
-	@echo "LV2:     $(ANS_NO) $(mS)Plugins disabled$(mE)"
-	@echo "VST:     $(ANS_NO) $(mS)Plugins disabled$(mE)"
+	@echo "LADSPA:  $(ANS_NO)  $(mS)Plugins disabled$(mE)"
+	@echo "DSSI:    $(ANS_NO)  $(mS)Plugins disabled$(mE)"
+	@echo "LV2:     $(ANS_NO)  $(mS)Plugins disabled$(mE)"
+	@echo "VST:     $(ANS_NO)  $(mS)Plugins disabled$(mE)"
+	@echo "AU:      $(ANS_NO)  $(mS)Plugins disabled$(mE)"
 endif
 	@echo ""
 
 ifeq ($(CARLA_PLUGIN_SUPPORT),true)
 	@echo "\033[36m---> LV2 UI toolkit support: \033[0m"
-	@echo "ExternalUI:$(ANS_YES) (direct+bridge)"
-ifeq ($(MACOS),true)
-# --- MacOS ---
-	@echo "CocoaUI:   $(ANS_YES) (direct+bridge)"
-# --- MacOS ---
-else
-# --- Win32 ---
-ifeq ($(WIN32),true)
-# --- Win32 ---
-	@echo "WindowsUI: $(ANS_YES) (direct+bridge)"
-else
-# --- Others ---
+	@echo "External:$(ANS_YES) (direct+bridge)"
+ifeq ($(LINUX),true)
 ifeq ($(HAVE_GTK2),true)
-	@echo "GtkUI:     $(ANS_YES) (bridge)"
+	@echo "Gtk2:    $(ANS_YES) (bridge)"
 else
-	@echo "GtkUI:     $(ANS_NO) $(mS)Gtk2 missing$(mE)"
+	@echo "Gtk2:    $(ANS_NO)  $(mS)Gtk2 missing$(mE)"
 endif
 ifeq ($(HAVE_GTK3),true)
-	@echo "Gtk3UI:    $(ANS_YES) (bridge)"
+	@echo "Gtk3:    $(ANS_YES) (bridge)"
 else
-	@echo "Gtk3UI:    $(ANS_NO) $(mS)Gtk3 missing$(mE)"
+	@echo "Gtk3:    $(ANS_NO)  $(mS)Gtk3 missing$(mE)"
 endif
 ifeq ($(HAVE_QT4),true)
-	@echo "Qt4UI:     $(ANS_YES) (bridge)"
+	@echo "Qt4:     $(ANS_YES) (bridge)"
 else
-	@echo "Qt4UI:     $(ANS_NO) $(mS)Qt4 missing$(mE)"
+	@echo "Qt4:     $(ANS_NO)  $(mS)Qt4 missing$(mE)"
 endif
-ifeq ($(HAVE_QT5),true)
-	@echo "Qt5UI:     $(ANS_YES) (bridge)"
+	@echo "Qt5:     $(ANS_YES) (bridge)"
+	@echo "X11:     $(ANS_YES) (direct+bridge)"
 else
-	@echo "Qt5UI:     $(ANS_NO) $(mS)Qt5 missing$(mE)"
+	@echo "Gtk2:    $(ANS_NO)  $(mZ)Linux only$(mE)"
+	@echo "Gtk3:    $(ANS_NO)  $(mZ)Linux only$(mE)"
+	@echo "Qt4:     $(ANS_NO)  $(mZ)Linux only$(mE)"
+	@echo "Qt5:     $(ANS_NO)  $(mZ)Linux only$(mE)"
+	@echo "X11:     $(ANS_NO)  $(mZ)Linux only$(mE)"
 endif
-	@echo "X11UI:     $(ANS_YES) (direct+bridge)"
+ifeq ($(MACOS),true)
+	@echo "Cocoa:   $(ANS_YES) (direct+bridge)"
+else
+	@echo "Cocoa:   $(ANS_NO)  $(mZ)MacOS only$(mE)"
 endif
-# --- Others ---
+ifeq ($(WIN32),true)
+	@echo "Windows: $(ANS_YES) (direct+bridge)"
+else
+	@echo "Windows: $(ANS_NO)  $(mZ)Windows only$(mE)"
 endif
 	@echo ""
 endif
 
-	@echo "\033[36m---> Sample formats: \033[0m"
+	@echo "\033[36m---> File formats: \033[0m"
+ifeq ($(CARLA_CSOUND_SUPPORT),true)
+	@echo "CSD:$(ANS_YES)"
+else
+	@echo "CSD:$(ANS_NO)  $(mS)CSound disabled$(mE)"
+endif
 ifeq ($(CARLA_SAMPLERS_SUPPORT),true)
 ifeq ($(HAVE_LINUXSAMPLER),true)
 	@echo "GIG:$(ANS_YES)"
 else
-	@echo "GIG:$(ANS_NO) $(mS)LinuxSampler missing$(mE)"
+	@echo "GIG:$(ANS_NO)  $(mS)LinuxSampler missing$(mE)"
 endif
 ifeq ($(HAVE_FLUIDSYNTH),true)
 	@echo "SF2:$(ANS_YES)"
 else
-	@echo "SF2:$(ANS_NO) $(mS)FluidSynth missing$(mE)"
+	@echo "SF2:$(ANS_NO)  $(mS)FluidSynth missing$(mE)"
 endif
 ifeq ($(HAVE_LINUXSAMPLER),true)
 	@echo "SFZ:$(ANS_YES)"
 else
-	@echo "SFZ:$(ANS_NO) $(mS)LinuxSampler missing$(mE)"
+	@echo "SFZ:$(ANS_NO)  $(mS)LinuxSampler missing$(mE)"
 endif
 else
-	@echo "GIG:$(ANS_NO) $(mS)Samplers disabled$(mE)"
-	@echo "SF2:$(ANS_NO) $(mS)Samplers disabled$(mE)"
-	@echo "SFZ:$(ANS_NO) $(mS)Samplers disabled$(mE)"
+	@echo "GIG:$(ANS_NO)  $(mS)Samplers disabled$(mE)"
+	@echo "SF2:$(ANS_NO)  $(mS)Samplers disabled$(mE)"
+	@echo "SFZ:$(ANS_NO)  $(mS)Samplers disabled$(mE)"
 endif
 	@echo ""
 
@@ -375,21 +374,18 @@ else
 	@echo "AudioFile:  $(ANS_YES) (without ffmpeg) $(mS)ffmpeg/libav missing or too new$(mE)"
 endif
 else
-	@echo "AudioFile:  $(ANS_NO) $(mS)libsndfile missing$(mE)"
+	@echo "AudioFile:  $(ANS_NO)  $(mS)libsndfile missing$(mE)"
 endif
-
 ifeq ($(HAVE_MF_DEPS),true)
 	@echo "MidiFile:   $(ANS_YES)"
 else
-	@echo "MidiFile:   $(ANS_NO) $(mS)libsmf missing$(mE)"
+	@echo "MidiFile:   $(ANS_NO)  $(mS)libsmf missing$(mE)"
 endif
-
 ifeq ($(HAVE_OPENGL),true)
 	@echo "DISTRHO:    $(ANS_YES)"
 else
-	@echo "DISTRHO:    $(ANS_NO) $(mS)OpenGL missing$(mE)"
+	@echo "DISTRHO:    $(ANS_NO)  $(mS)OpenGL missing$(mE)"
 endif
-
 ifeq ($(HAVE_ZYN_DEPS),true)
 ifeq ($(HAVE_ZYN_UI_DEPS),true)
 	@echo "ZynAddSubFX:$(ANS_YES) (with UI)"
@@ -397,7 +393,7 @@ else
 	@echo "ZynAddSubFX:$(ANS_YES) (without UI) $(mS)NTK missing$(mE)"
 endif
 else
-	@echo "ZynAddSubFX:$(ANS_NO) $(mS)fftw-3, mxml or zlib missing$(mE)"
+	@echo "ZynAddSubFX:$(ANS_NO)  $(mS)fftw-3, mxml or zlib missing$(mE)"
 endif
 
 # --------------------------------------------------------------

source/Makefile.mk

@@ -4,6 +4,8 @@
 # Created by falkTX
 #
 
+# libx11-dev libxext-dev libxinerama-dev libfreetype6-dev libxcursor-dev
+
 # --------------------------------------------------------------
 # Modify to enable/disable specific features
 
@@ -30,6 +32,18 @@ RCC ?= rcc
 UIC ?= uic
 
 # --------------------------------------------------------------
+# Fallback to Linux if no other OS defined
+
+ifneq ($(HAIKU),true)
+ifneq ($(MACOS),true)
+ifneq ($(WIN32),true)
+LINUX=true
+endif
+endif
+endif
+
+# --------------------------------------------------------------
+# Common build and link flags
 
 BASE_FLAGS = -Wall -Wextra -fPIC -DPIC -pipe -DREAL_BUILD
 BASE_OPTS  = -O3 -ffast-math -mtune=generic -msse -msse2 -mfpmath=sse -fdata-sections -ffunction-sections
@@ -65,27 +79,99 @@ LINK_FLAGS      = $(32BIT_FLAGS) $(LDFLAGS)
 endif
 
 # --------------------------------------------------------------
+# Check for required libs
+
+ifneq ($(shell pkg-config --exists liblo && echo true),true)
+$(error liblo missing, cannot continue)
+endif
+
+ifneq ($(shell pkg-config --exists Qt5Core Qt5Gui Qt5Widgets && echo true),true)
+$(error Qt5 missing, cannot continue)
+endif
+
+ifeq ($(LINUX),true)
+ifneq ($(shell pkg-config --exists x11 && echo true),true)
+$(error X11 missing, cannot continue)
+endif
+ifneq ($(shell pkg-config --exists xinerama && echo true),true)
+$(error Xinerama missing, cannot continue)
+endif
+ifneq ($(shell pkg-config --exists xext && echo true),true)
+$(error Xext missing, cannot continue)
+endif
+ifneq ($(shell pkg-config --exists xcursor && echo true),true)
+$(error Xcursor missing, cannot continue)
+endif
+ifneq ($(shell pkg-config --exists freetype2 && echo true),true)
+$(error FreeType2 missing, cannot continue)
+endif
+endif
+
+# --------------------------------------------------------------
+# Check for optional libs (required by backend or bridges)
 
-HAVE_ALSA         = $(shell pkg-config --exists alsa && echo true)
 HAVE_FFMPEG       = $(shell pkg-config --exists libavcodec libavformat libavutil && pkg-config --max-version=1.9 libavcodec && echo true)
 HAVE_OPENGL       = $(shell pkg-config --exists gl && echo true)
+
+ifeq ($(LINUX),true)
+HAVE_ALSA         = $(shell pkg-config --exists alsa && echo true)
 HAVE_GTK2         = $(shell pkg-config --exists gtk+-2.0 && echo true)
 HAVE_GTK3         = $(shell pkg-config --exists gtk+-3.0 && echo true)
 HAVE_PULSEAUDIO   = $(shell pkg-config --exists libpulse-simple && echo true)
 HAVE_QT4          = $(shell pkg-config --exists QtCore && echo true)
-HAVE_QT5          = $(shell pkg-config --exists Qt5Core && echo true)
-HAVE_X11          = $(shell pkg-config --exists x11 && echo true)
-
-HAVE_AF_DEPS      = $(shell pkg-config --exists sndfile && echo true)
-HAVE_MF_DEPS      = $(shell pkg-config --exists smf && echo true)
-HAVE_ZYN_DEPS     = $(shell pkg-config --exists fftw3 mxml zlib && echo true)
-HAVE_ZYN_UI_DEPS  = $(shell pkg-config --exists ntk ntk_images && echo true)
+endif
 
 ifeq ($(CARLA_SAMPLERS_SUPPORT),true)
 HAVE_FLUIDSYNTH   = $(shell pkg-config --exists fluidsynth && echo true)
 HAVE_LINUXSAMPLER = $(shell pkg-config --exists linuxsampler && echo true)
 endif
 
+# --------------------------------------------------------------
+# Check for optional libs (required by internal plugins)
+
+HAVE_AF_DEPS       = $(shell pkg-config --exists sndfile && echo true)
+HAVE_MF_DEPS       = $(shell pkg-config --exists smf && echo true)
+HAVE_ZYN_DEPS      = $(shell pkg-config --exists fftw3 mxml zlib && echo true)
+HAVE_ZYN_UI_DEPS   = $(shell pkg-config --exists ntk ntk_images && echo true)
+
+# --------------------------------------------------------------
+# Set Juce flags
+
+ifeq ($(HAIKU),true)
+endif
+
+ifeq ($(LINUX),true)
+# JUCE_AUDIO_DEVICES_FLAGS = $(shell pkg-config --cflags alsa)
+# JUCE_AUDIO_DEVICES_LIBS  = $(shell pkg-config --libs alsa)
+JUCE_CORE_LIBS           = -lrt -ldl -lpthread
+JUCE_EVENTS_FLAGS        = $(shell pkg-config --cflags x11)
+JUCE_EVENTS_LIBS         = $(shell pkg-config --libs x11)
+JUCE_GRAPHICS_FLAGS      = $(shell pkg-config --cflags x11 xinerama xext freetype2)
+JUCE_GRAPHICS_LIBS       = $(shell pkg-config --libs x11 xinerama xext freetype2)
+JUCE_GUI_BASICS_FLAGS    = $(shell pkg-config --cflags x11 xinerama xext xcursor)
+JUCE_GUI_BASICS_LIBS     = $(shell pkg-config --libs x11 xinerama xext xcursor) -ldl
+endif
+
+ifeq ($(MACOS),true)
+JUCE_AUDIO_BASICS_LIBS  = -framework Accelerate
+JUCE_AUDIO_DEVICES_LIBS = -framework CoreAudio -framework CoreMIDI -framework DiscRecording
+JUCE_AUDIO_FORMATS_LIBS = -framework CoreAudio -framework CoreMIDI -framework QuartzCore -framework AudioToolbox
+JUCE_CORE_LIBS          = -framework Cocoa -framework IOKit
+JUCE_GRAPHICS_LIBS      = -framework Cocoa -framework QuartzCore
+JUCE_GUI_BASICS_LIBS    = -framework Cocoa -framework Carbon -framework QuartzCore
+endif
+
+ifeq ($(WIN32),true)
+JUCE_AUDIO_DEVICES_LIBS = -lwinmm -lole32
+JUCE_CORE_LIBS          = -luuid -lwsock32 -lwininet -lversion -lole32 -lws2_32 -loleaut32 -limm32 -lcomdlg32 -lshlwapi -lrpcrt4 -lwinmm
+JUCE_EVENTS_LIBS        = -lole32
+JUCE_GRAPHICS_LIBS      = -lgdi32
+JUCE_GUI_BASICS_LIBS    = -lgdi32 -limm32 -lcomdlg32 -lole32
+endif
+
+# --------------------------------------------------------------
+# Set Qt4 tools
+
 ifeq ($(HAVE_QT4),true)
 MOC_QT4 ?= $(shell pkg-config --variable=moc_location QtCore)
 RCC_QT4 ?= $(shell pkg-config --variable=rcc_location QtCore)

source/modules/Makefile

@@ -131,6 +131,17 @@ jackbridge-wine64:
 
 # --------------------------------------------------------------
 
+libjuce_%.dll:
+	$(MAKE) -C juce_$* ../libjuce_$*.dll
+
+libjuce_%.dylib:
+	$(MAKE) -C juce_$* ../libjuce_$*.dylib
+
+libjuce_%.so:
+	$(MAKE) -C juce_$* ../libjuce_$*.so
+
+# --------------------------------------------------------------
+
 clean:
 	rm -f *.a *.def *.dll *.dylib *.so
 	$(MAKE) clean -C carla_native

source/modules/juce_audio_basics/Makefile

@@ -8,7 +8,8 @@ include ../../Makefile.mk
 
 # --------------------------------------------------------------
 
-BUILD_CXX_FLAGS += -I.
+BUILD_CXX_FLAGS += $(JUCE_AUDIO_BASICS_FLAGS) -I.
+LINK_FLAGS      += $(JUCE_AUDIO_BASICS_LIBS) -L.. -ljuce_core
 
 ifeq ($(MACOS),true)
 BUILD_CXX_FLAGS += -objc++
@@ -50,13 +51,13 @@ win64:   ../juce_audio_basics.win64.a
 ../juce_audio_basics.win64.a: $(OBJS_win64)
 	$(AR) rs $@ $^
 
-../juce_audio_basics.dll: $(OBJS)
+../libjuce_audio_basics.dll: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
-../juce_audio_basics.dylib: $(OBJS)
+../libjuce_audio_basics.dylib: $(OBJS)
 	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
 
-../juce_audio_basics.so: $(OBJS)
+../libjuce_audio_basics.so: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
 # --------------------------------------------------------------
@@ -82,7 +83,7 @@ win64:   ../juce_audio_basics.win64.a
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o ../juce_audio_basics*.a
+	rm -f *.o ../juce_audio_basics*.a ../libjuce_audio_basics.*
 
 debug:
 	$(MAKE) DEBUG=true

source/modules/juce_audio_devices/AppConfig.h

@@ -22,7 +22,7 @@
     See the comments in the ASIOAudioIODevice class's header file for more
     info about this.
 */
-#if WINDOWS
+#if JUCE_WINDOWS
  #define JUCE_ASIO 1
 #else
  #define JUCE_ASIO 0
@@ -36,7 +36,7 @@
 /** Config: JUCE_DIRECTSOUND
     Enables DirectSound audio (MS Windows only).
 */
-#if WINDOWS
+#if JUCE_WINDOWS
  #define JUCE_DIRECTSOUND 1
 #else
  #define JUCE_DIRECTSOUND 0
@@ -45,7 +45,7 @@
 /** Config: JUCE_ALSA
     Enables ALSA audio devices (Linux only).
 */
-#if LINUX
+#if 0 //JUCE_LINUX
  #define JUCE_ALSA 1
  #define JUCE_ALSA_MIDI_INPUT_NAME  "Carla"
  #define JUCE_ALSA_MIDI_OUTPUT_NAME "Carla"
@@ -58,7 +58,7 @@
 /** Config: JUCE_JACK
     Enables JACK audio devices (Linux only).
 */
-#if LINUX
+#if 0 //JUCE_LINUX
  #define JUCE_JACK 1
  #define JUCE_JACK_CLIENT_NAME "Carla"
 #else

source/modules/juce_audio_devices/Makefile

@@ -8,7 +8,12 @@ include ../../Makefile.mk
 
 # --------------------------------------------------------------
 
-BUILD_CXX_FLAGS += -I.
+BUILD_CXX_FLAGS += $(JUCE_AUDIO_DEVICES_FLAGS) -I.
+LINK_FLAGS      += $(JUCE_AUDIO_DEVICES_LIBS) -L.. -ljuce_events -ljuce_audio_formats -ljuce_audio_basics -ljuce_core
+
+ifeq ($(WIN32),true)
+BUILD_CXX_FLAGS += -I../../includes/asio
+endif
 
 ifeq ($(MACOS),true)
 BUILD_CXX_FLAGS += -objc++
@@ -50,13 +55,13 @@ win64:   ../juce_audio_devices.win64.a
 ../juce_audio_devices.win64.a: $(OBJS_win64)
 	$(AR) rs $@ $^
 
-../juce_audio_devices.dll: $(OBJS)
+../libjuce_audio_devices.dll: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
-../juce_audio_devices.dylib: $(OBJS)
+../libjuce_audio_devices.dylib: $(OBJS)
 	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
 
-../juce_audio_devices.so: $(OBJS)
+../libjuce_audio_devices.so: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
 # --------------------------------------------------------------
@@ -82,7 +87,7 @@ win64:   ../juce_audio_devices.win64.a
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o ../juce_audio_devices*.a
+	rm -f *.o ../juce_audio_devices*.a ../libjuce_audio_devices.*
 
 debug:
 	$(MAKE) DEBUG=true

source/modules/juce_audio_formats/Makefile

@@ -8,7 +8,8 @@ include ../../Makefile.mk
 
 # --------------------------------------------------------------
 
-BUILD_CXX_FLAGS += -I.
+BUILD_CXX_FLAGS += $(JUCE_AUDIO_FORMATS_FLAGS) -I.
+LINK_FLAGS      += $(JUCE_AUDIO_FORMATS_LIBS) -L.. -ljuce_audio_basics -ljuce_core
 
 ifeq ($(MACOS),true)
 BUILD_CXX_FLAGS += -objc++
@@ -50,13 +51,13 @@ win64:   ../juce_audio_formats.win64.a
 ../juce_audio_formats.win64.a: $(OBJS_win64)
 	$(AR) rs $@ $^
 
-../juce_audio_formats.dll: $(OBJS)
+../libjuce_audio_formats.dll: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
-../juce_audio_formats.dylib: $(OBJS)
+../libjuce_audio_formats.dylib: $(OBJS)
 	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
 
-../juce_audio_formats.so: $(OBJS)
+../libjuce_audio_formats.so: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
 # --------------------------------------------------------------
@@ -82,7 +83,7 @@ win64:   ../juce_audio_formats.win64.a
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o ../juce_audio_formats*.a
+	rm -f *.o ../juce_audio_formats*.a ../libjuce_audio_formats.*
 
 debug:
 	$(MAKE) DEBUG=true

source/modules/juce_audio_processors/Makefile

@@ -8,7 +8,8 @@ include ../../Makefile.mk
 
 # --------------------------------------------------------------
 
-BUILD_CXX_FLAGS += -I.
+BUILD_CXX_FLAGS += $(JUCE_AUDIO_PROCESSORS_FLAGS) -I.
+LINK_FLAGS      += $(JUCE_AUDIO_PROCESSORS_LIBS)
 
 ifeq ($(MACOS),true)
 BUILD_CXX_FLAGS += -objc++
@@ -50,13 +51,13 @@ win64:   ../juce_audio_processors.win64.a
 ../juce_audio_processors.win64.a: $(OBJS_win64)
 	$(AR) rs $@ $^
 
-../juce_audio_processors.dll: $(OBJS)
+../libjuce_audio_processors.dll: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
-../juce_audio_processors.dylib: $(OBJS)
+../libjuce_audio_processors.dylib: $(OBJS)
 	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
 
-../juce_audio_processors.so: $(OBJS)
+../libjuce_audio_processors.so: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
 # --------------------------------------------------------------
@@ -82,7 +83,7 @@ win64:   ../juce_audio_processors.win64.a
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o ../juce_audio_processors*.a
+	rm -f *.o ../juce_audio_processors*.a ../libjuce_audio_processors.*
 
 debug:
 	$(MAKE) DEBUG=true

source/modules/juce_core/AppConfig.h

@@ -9,6 +9,8 @@
 #ifndef CARLA_JUCE_CORE_APPCONFIG_H_INCLUDED
 #define CARLA_JUCE_CORE_APPCONFIG_H_INCLUDED
 
+#include "system/juce_TargetPlatform.h"
+
 //=============================================================================
 /** Config: JUCE_FORCE_DEBUG
 

source/modules/juce_core/Makefile

@@ -8,7 +8,8 @@ include ../../Makefile.mk
 
 # --------------------------------------------------------------
 
-BUILD_CXX_FLAGS += -I.
+BUILD_CXX_FLAGS += $(JUCE_CORE_FLAGS) -I.
+LINK_FLAGS      += $(JUCE_CORE_LIBS)
 
 ifeq ($(MACOS),true)
 BUILD_CXX_FLAGS += -objc++
@@ -50,13 +51,13 @@ win64:   ../juce_core.win64.a
 ../juce_core.win64.a: $(OBJS_win64)
 	$(AR) rs $@ $^
 
-../juce_core.dll: $(OBJS)
+../libjuce_core.dll: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
-../juce_core.dylib: $(OBJS)
+../libjuce_core.dylib: $(OBJS)
 	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
 
-../juce_core.so: $(OBJS)
+../libjuce_core.so: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
 # --------------------------------------------------------------
@@ -82,7 +83,7 @@ win64:   ../juce_core.win64.a
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o ../juce_core*.a
+	rm -f *.o ../juce_core*.a ../libjuce_core.*
 
 debug:
 	$(MAKE) DEBUG=true

source/modules/juce_data_structures/Makefile

@@ -8,7 +8,8 @@ include ../../Makefile.mk
 
 # --------------------------------------------------------------
 
-BUILD_CXX_FLAGS += -I.
+BUILD_CXX_FLAGS += $(JUCE_DATA_STRUCTURES_FLAGS) -I.
+LINK_FLAGS      += $(JUCE_DATA_STRUCTURES_LIBS) -L.. -ljuce_events -ljuce_core
 
 ifeq ($(MACOS),true)
 BUILD_CXX_FLAGS += -objc++
@@ -50,13 +51,13 @@ win64:   ../juce_data_structures.win64.a
 ../juce_data_structures.win64.a: $(OBJS_win64)
 	$(AR) rs $@ $^
 
-../juce_data_structures.dll: $(OBJS)
+../libjuce_data_structures.dll: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
-../juce_data_structures.dylib: $(OBJS)
+../libjuce_data_structures.dylib: $(OBJS)
 	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
 
-../juce_data_structures.so: $(OBJS)
+../libjuce_data_structures.so: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
 # --------------------------------------------------------------
@@ -82,7 +83,7 @@ win64:   ../juce_data_structures.win64.a
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o ../juce_data_structures*.a
+	rm -f *.o ../juce_data_structures*.a ../libjuce_data_structures.*
 
 debug:
 	$(MAKE) DEBUG=true

source/modules/juce_events/Makefile

@@ -8,7 +8,8 @@ include ../../Makefile.mk
 
 # --------------------------------------------------------------
 
-BUILD_CXX_FLAGS += -I.
+BUILD_CXX_FLAGS += $(JUCE_EVENTS_FLAGS) -I.
+LINK_FLAGS      += $(JUCE_EVENTS_LIBS) -L.. -ljuce_core
 
 ifeq ($(MACOS),true)
 BUILD_CXX_FLAGS += -objc++
@@ -50,13 +51,13 @@ win64:   ../juce_events.win64.a
 ../juce_events.win64.a: $(OBJS_win64)
 	$(AR) rs $@ $^
 
-../juce_events.dll: $(OBJS)
+../libjuce_events.dll: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
-../juce_events.dylib: $(OBJS)
+../libjuce_events.dylib: $(OBJS)
 	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
 
-../juce_events.so: $(OBJS)
+../libjuce_events.so: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
 # --------------------------------------------------------------
@@ -82,7 +83,7 @@ win64:   ../juce_events.win64.a
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o ../juce_events*.a
+	rm -f *.o ../juce_events*.a ../libjuce_events.*
 
 debug:
 	$(MAKE) DEBUG=true

source/modules/juce_graphics/Makefile

@@ -8,7 +8,8 @@ include ../../Makefile.mk
 
 # --------------------------------------------------------------
 
-BUILD_CXX_FLAGS += -I.
+BUILD_CXX_FLAGS += $(JUCE_GRAPHICS_FLAGS) -I.
+LINK_FLAGS      += $(JUCE_GRAPHICS_LIBS) -L.. -ljuce_events -ljuce_core
 
 ifeq ($(MACOS),true)
 BUILD_CXX_FLAGS += -objc++
@@ -19,9 +20,6 @@ else
 OBJS         = juce_graphics.cpp.o
 OBJS_posix32 = juce_graphics.cpp.posix32.o
 OBJS_posix64 = juce_graphics.cpp.posix64.o
-ifneq ($(WIN32),true)
-BUILD_CXX_FLAGS += $(shell pkg-config --cflags freetype2)
-endif
 endif
 
 OBJS_win32 = juce_graphics.cpp.win32.o
@@ -53,13 +51,13 @@ win64:   ../juce_graphics.win64.a
 ../juce_graphics.win64.a: $(OBJS_win64)
 	$(AR) rs $@ $^
 
-../juce_graphics.dll: $(OBJS)
+../libjuce_graphics.dll: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
-../juce_graphics.dylib: $(OBJS)
+../libjuce_graphics.dylib: $(OBJS)
 	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
 
-../juce_graphics.so: $(OBJS)
+../libjuce_graphics.so: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
 # --------------------------------------------------------------
@@ -85,7 +83,7 @@ win64:   ../juce_graphics.win64.a
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o ../juce_graphics*.a
+	rm -f *.o ../juce_graphics*.a ../libjuce_graphics.*
 
 debug:
 	$(MAKE) DEBUG=true

source/modules/juce_gui_basics/Makefile

@@ -8,7 +8,8 @@ include ../../Makefile.mk
 
 # --------------------------------------------------------------
 
-BUILD_CXX_FLAGS += -I.
+BUILD_CXX_FLAGS += $(JUCE_GUI_BASICS_FLAGS) -I.
+LINK_FLAGS      += $(JUCE_GUI_BASICS_LIBS) -L.. -ljuce_data_structures -ljuce_graphics -ljuce_events -ljuce_core
 
 ifeq ($(MACOS),true)
 BUILD_CXX_FLAGS += -objc++
@@ -50,13 +51,13 @@ win64:   ../juce_gui_basics.win64.a
 ../juce_gui_basics.win64.a: $(OBJS_win64)
 	$(AR) rs $@ $^
 
-../juce_gui_basics.dll: $(OBJS)
+../libjuce_gui_basics.dll: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
-../juce_gui_basics.dylib: $(OBJS)
+../libjuce_gui_basics.dylib: $(OBJS)
 	$(CXX) $^ -dynamiclib $(LINK_FLAGS) -o $@
 
-../juce_gui_basics.so: $(OBJS)
+../libjuce_gui_basics.so: $(OBJS)
 	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
 # --------------------------------------------------------------
@@ -82,7 +83,7 @@ win64:   ../juce_gui_basics.win64.a
 # --------------------------------------------------------------
 
 clean:
-	rm -f *.o ../juce_gui_basics*.a
+	rm -f *.o ../juce_gui_basics*.a ../libjuce_gui_basics.*
 
 debug:
 	$(MAKE) DEBUG=true

source/modules/theme/CarlaStylePlugin.hpp

@@ -18,6 +18,8 @@
 #ifndef CARLA_STYLE_PLUGIN_HPP_INCLUDED
 #define CARLA_STYLE_PLUGIN_HPP_INCLUDED
 
+#include "CarlaDefines.hpp"
+
 #include <QtCore/Qt>
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))