diff --git a/Makefile b/Makefile index 03406c5c8..60d98e685 100644 --- a/Makefile +++ b/Makefile @@ -143,17 +143,18 @@ bin/styles/carlastyle$(LIB_EXT): .FORCE LIBS_POSIX32 += source/modules/jackbridge.posix32.a LIBS_POSIX32 += source/modules/juce_audio_basics.posix32.a -LIBS_POSIX32 += source/modules/juce_audio_devices.posix32.a -LIBS_POSIX32 += source/modules/juce_audio_formats.posix32.a -LIBS_POSIX32 += source/modules/juce_audio_processors.posix32.a LIBS_POSIX32 += source/modules/juce_core.posix32.a +LIBS_POSIX32 += source/modules/lilv.posix32.a +LIBS_POSIX32 += source/modules/rtmempool.posix32.a + +ifeq ($(MACOS),true) +LIBS_POSIX32 += source/modules/juce_audio_processors.posix32.a LIBS_POSIX32 += source/modules/juce_data_structures.posix32.a LIBS_POSIX32 += source/modules/juce_events.posix32.a LIBS_POSIX32 += source/modules/juce_graphics.posix32.a LIBS_POSIX32 += source/modules/juce_gui_basics.posix32.a LIBS_POSIX32 += source/modules/juce_gui_extra.posix32.a -LIBS_POSIX32 += source/modules/lilv.posix32.a -LIBS_POSIX32 += source/modules/rtmempool.posix32.a +endif posix32: $(LIBS_POSIX32) $(MAKE) -C source/bridges posix32 @@ -164,17 +165,18 @@ posix32: $(LIBS_POSIX32) LIBS_POSIX64 += source/modules/jackbridge.posix64.a LIBS_POSIX64 += source/modules/juce_audio_basics.posix64.a -LIBS_POSIX64 += source/modules/juce_audio_devices.posix64.a -LIBS_POSIX64 += source/modules/juce_audio_formats.posix64.a -LIBS_POSIX64 += source/modules/juce_audio_processors.posix64.a LIBS_POSIX64 += source/modules/juce_core.posix64.a +LIBS_POSIX64 += source/modules/lilv.posix64.a +LIBS_POSIX64 += source/modules/rtmempool.posix64.a + +ifeq ($(MACOS),true) +LIBS_POSIX64 += source/modules/juce_audio_processors.posix64.a LIBS_POSIX64 += source/modules/juce_data_structures.posix64.a LIBS_POSIX64 += source/modules/juce_events.posix64.a LIBS_POSIX64 += source/modules/juce_graphics.posix64.a LIBS_POSIX64 += source/modules/juce_gui_basics.posix64.a LIBS_POSIX64 += source/modules/juce_gui_extra.posix64.a -LIBS_POSIX64 += source/modules/lilv.posix64.a -LIBS_POSIX64 += source/modules/rtmempool.posix64.a +endif posix64: $(LIBS_POSIX64) $(MAKE) -C source/bridges posix64 @@ -185,15 +187,12 @@ posix64: $(LIBS_POSIX64) LIBS_WIN32 += source/modules/jackbridge-win32.dll LIBS_WIN32 += source/modules/juce_audio_basics.win32.a -LIBS_WIN32 += source/modules/juce_audio_devices.win32.a -LIBS_WIN32 += source/modules/juce_audio_formats.win32.a LIBS_WIN32 += source/modules/juce_audio_processors.win32.a LIBS_WIN32 += source/modules/juce_core.win32.a LIBS_WIN32 += source/modules/juce_data_structures.win32.a LIBS_WIN32 += source/modules/juce_events.win32.a LIBS_WIN32 += source/modules/juce_graphics.win32.a LIBS_WIN32 += source/modules/juce_gui_basics.win32.a -LIBS_WIN32 += source/modules/juce_gui_extra.win32.a LIBS_WIN32 += source/modules/lilv.win32.a LIBS_WIN32 += source/modules/rtmempool.win32.a @@ -206,15 +205,12 @@ win32: $(LIBS_WIN32) LIBS_WIN64 += source/modules/jackbridge-win64.dll LIBS_WIN64 += source/modules/juce_audio_basics.win64.a -LIBS_WIN64 += source/modules/juce_audio_devices.win64.a -LIBS_WIN64 += source/modules/juce_audio_formats.win64.a LIBS_WIN64 += source/modules/juce_audio_processors.win64.a LIBS_WIN64 += source/modules/juce_core.win64.a LIBS_WIN64 += source/modules/juce_data_structures.win64.a LIBS_WIN64 += source/modules/juce_events.win64.a LIBS_WIN64 += source/modules/juce_graphics.win64.a LIBS_WIN64 += source/modules/juce_gui_basics.win64.a -LIBS_WIN64 += source/modules/juce_gui_extra.win64.a LIBS_WIN64 += source/modules/lilv.win64.a LIBS_WIN64 += source/modules/rtmempool.win64.a diff --git a/source/bridges/Makefile b/source/bridges/Makefile index 02b022edb..b2508eb41 100644 --- a/source/bridges/Makefile +++ b/source/bridges/Makefile @@ -443,8 +443,12 @@ OBJS_POSIX32 = CarlaBridgePlugin__posix32.o \ # carla-engine OBJS_POSIX32 += \ ../backend/engine/CarlaEngine__posix32.o \ + ../backend/engine/CarlaEngineClient__posix32.o \ + ../backend/engine/CarlaEngineData__posix32.o \ ../backend/engine/CarlaEngineInternal__posix32.o \ ../backend/engine/CarlaEngineOsc__posix32.o \ + ../backend/engine/CarlaEngineOscSend__posix32.o \ + ../backend/engine/CarlaEnginePorts__posix32.o \ ../backend/engine/CarlaEngineThread__posix32.o \ ../backend/engine/CarlaEngineJack__posix32.o \ ../backend/engine/CarlaEngineBridge__posix32.o @@ -461,9 +465,7 @@ OBJS_POSIX32 += \ ../backend/plugin/VstPlugin__posix32.o \ ../backend/plugin/Vst3Plugin__posix32.o \ ../backend/plugin/AuPlugin__posix32.o \ - ../backend/plugin/JucePlugin__posix32.o \ - ../backend/plugin/FluidSynthPlugin__posix32.o \ - ../backend/plugin/LinuxSamplerPlugin__posix32.o + ../backend/plugin/JucePlugin__posix32.o # carla-standalone OBJS_POSIX32 += \ @@ -471,14 +473,15 @@ OBJS_POSIX32 += \ # libs LIBS_POSIX32 = \ + ../modules/jackbridge.posix32.a \ + ../modules/juce_audio_basics.posix32.a \ + ../modules/juce_core.posix32.a \ ../modules/lilv.posix32.a \ ../modules/rtmempool.posix32.a ifeq ($(MACOS),true) LIBS_POSIX32 += \ - ../modules/juce_audio_basics.posix32.a \ ../modules/juce_audio_processors.posix32.a \ - ../modules/juce_core.posix32.a \ ../modules/juce_data_structures.posix32.a \ ../modules/juce_events.posix32.a \ ../modules/juce_graphics.posix32.a \ @@ -500,8 +503,12 @@ OBJS_POSIX64 = CarlaBridgePlugin__posix64.o \ # carla-engine OBJS_POSIX64 += \ ../backend/engine/CarlaEngine__posix64.o \ + ../backend/engine/CarlaEngineClient__posix64.o \ + ../backend/engine/CarlaEngineData__posix64.o \ ../backend/engine/CarlaEngineInternal__posix64.o \ ../backend/engine/CarlaEngineOsc__posix64.o \ + ../backend/engine/CarlaEngineOscSend__posix64.o \ + ../backend/engine/CarlaEnginePorts__posix64.o \ ../backend/engine/CarlaEngineThread__posix64.o \ ../backend/engine/CarlaEngineJack__posix64.o \ ../backend/engine/CarlaEngineBridge__posix64.o @@ -518,9 +525,7 @@ OBJS_POSIX64 += \ ../backend/plugin/VstPlugin__posix64.o \ ../backend/plugin/Vst3Plugin__posix64.o \ ../backend/plugin/AuPlugin__posix32.o \ - ../backend/plugin/JucePlugin__posix64.o \ - ../backend/plugin/FluidSynthPlugin__posix64.o \ - ../backend/plugin/LinuxSamplerPlugin__posix64.o + ../backend/plugin/JucePlugin__posix64.o # carla-standalone OBJS_POSIX64 += \ @@ -528,14 +533,15 @@ OBJS_POSIX64 += \ # libs LIBS_POSIX64 = \ + ../modules/jackbridge.posix64.a \ + ../modules/juce_audio_basics.posix64.a \ + ../modules/juce_core.posix64.a \ ../modules/lilv.posix64.a \ ../modules/rtmempool.posix64.a ifeq ($(MACOS),true) LIBS_POSIX64 += \ - ../modules/juce_audio_basics.posix64.a \ ../modules/juce_audio_processors.posix64.a \ - ../modules/juce_core.posix64.a \ ../modules/juce_data_structures.posix64.a \ ../modules/juce_events.posix64.a \ ../modules/juce_graphics.posix64.a \