diff --git a/source/backend/Makefile.mk b/source/backend/Makefile.mk index 1575fa770..d55088d36 100644 --- a/source/backend/Makefile.mk +++ b/source/backend/Makefile.mk @@ -59,22 +59,36 @@ endif # -------------------------------------------------------------- +CARLA_DEFINES_H = ../../includes/CarlaDefines.h +CARLA_MIDI_H = ../../includes/CarlaMIDI.h + CARLA_BACKEND_H = ../CarlaBackend.h $(CARLA_DEFINES_H) CARLA_HOST_H = ../CarlaHost.h $(CARLA_BACKEND_H) CARLA_ENGINE_HPP = ../CarlaEngine.hpp $(CARLA_BACKEND_H) CARLA_PLUGIN_HPP = ../CarlaPlugin.hpp $(CARLA_BACKEND_H) -CARLA_DEFINES_H = ../../includes/CarlaDefines.h -CARLA_MIDI_H = ../../includes/CarlaMIDI.h +CARLA_UTILS_HPP = ../../utils/CarlaUtils.hpp $(CARLA_DEFINES_H) +CARLA_JUCE_UTILS_HPP = ../../utils/CarlaJuceUtils.hpp $(CARLA_UTILS_HPP) +CARLA_OSC_UTILS_HPP = ../../utils/CarlaOscUtils.hpp $(CARLA_UTILS_HPP) + +CARLA_MUTEX_HPP = ../../utils/CarlaMutex.hpp $(CARLA_UTILS_HPP) +CARLA_RING_BUFFER_HPP = ../../utils/CarlaRingBuffer.hpp $(CARLA_UTILS_HPP) +CARLA_STRING_HPP = ../../utils/CarlaString.hpp $(CARLA_JUCE_UTILS_HPP) +CARLA_THREAD_HPP = ../../utils/CarlaThread.hpp $(CARLA_MUTEX_HPP) $(CARLA_STRING_HPP) + +LINKED_LIST_HPP = ../../utils/LinkedList.hpp $(CARLA_UTILS_HPP) +RT_LINKED_LIST_HPP = ../../utils/RtLinkedList.hpp $(LINKED_LIST_HPP) -CARLA_UTILS_HPP = ../../utils/CarlaUtils.hpp $(CARLA_DEFINES_H) CARLA_BACKEND_UTILS_HPP = ../../utils/CarlaBackendUtils.hpp $(CARLA_BACKEND_H) $(CARLA_HOST_H) $(CARLA_STRING_HPP) +CARLA_BRIDGE_UTILS_HPP = ../../utils/CarlaBridgeUtils.hpp $(CARLA_RING_BUFFER_HPP) CARLA_ENGINE_UTILS_HPP = ../../utils/CarlaEngineUtils.hpp $(CARLA_ENGINE_HPP) $(CARLA_UTILS_HPP) -CARLA_JUCE_UTILS_HPP = ../../utils/CarlaJuceUtils.hpp $(CARLA_UTILS_HPP) +CARLA_PIPE_UTILS_HPP = ../../utils/CarlaPipeUtils.hpp $(CARLA_STRING_HPP) CARLA_STATE_UTILS_HPP = ../../utils/CarlaStateUtils.hpp $(CARLA_BACKEND_UTILS_HPP) $(CARLA_MIDI_H) $(LINKED_LIST_HPP) -CARLA_MUTEX_HPP = ../../utils/CarlaMutex.hpp $(CARLA_UTILS_HPP) -CARLA_STRING_HPP = ../../utils/CarlaString.hpp $(CARLA_JUCE_UTILS_HPP) -CARLA_THREAD_HPP = ../../utils/CarlaThread.hpp $(CARLA_MUTEX_HPP) $(CARLA_STRING_HPP) +CARLA_NATIVE_H = ../../modules/CarlaNative.h +CARLA_NATIVE_HPP = ../../modules/CarlaNative.hpp $(CARLA_NATIVE_H) $(CARLA_MIDI_H) $(CARLA_JUCE_UTILS_HPP) +JACK_BRIDGE_HPP = ../../modules/jackbridge/JackBridge.hpp $(CARLA_DEFINES_H) +RTAUDIO_HPP = ../../modules/rtaudio/RtAudio.h +RTMIDI_HPP = ../../modules/rtmidi/RtMidi.h $(CARLA_DEFINES_H) -LINKED_LIST_HPP = ../../utils/LinkedList.hpp $(CARLA_UTILS_HPP) +# -------------------------------------------------------------- diff --git a/source/backend/engine/CarlaEngineJack.cpp b/source/backend/engine/CarlaEngineJack.cpp index bf7d066c6..627c5ac59 100644 --- a/source/backend/engine/CarlaEngineJack.cpp +++ b/source/backend/engine/CarlaEngineJack.cpp @@ -21,7 +21,6 @@ #include "CarlaBackendUtils.hpp" #include "CarlaEngineUtils.hpp" #include "CarlaMIDI.h" -#include "LinkedList.hpp" #include "jackbridge/JackBridge.hpp" diff --git a/source/backend/engine/Makefile b/source/backend/engine/Makefile index ab5298da5..f949559f4 100644 --- a/source/backend/engine/Makefile +++ b/source/backend/engine/Makefile @@ -6,7 +6,13 @@ include ../Makefile.mk -# -------------------------------------------------------------- +# ---------------------------------------------------------------------------------------------------------------------------- + +CARLA_ENGINE_OSC_HPP = CarlaEngineOsc.hpp $(CARLA_BACKEND_H) $(CARLA_OSC_UTILS_HPP) $(CARLA_STRING_HPP) +CARLA_ENGINE_THREAD_HPP = CarlaEngineThread.hpp $(CARLA_BACKEND_H) $(CARLA_THREAD_HPP) +CARLA_ENGINE_INTERNAL_HPP = CarlaEngineInternal.hpp $(CARLA_ENGINE_OSC_HPP) $(CARLA_ENGINE_THREAD_HPP) $(CARLA_ENGINE_HPP) $(CARLA_MUTEX_HPP) $(LINKED_LIST_HPP) + +# ---------------------------------------------------------------------------------------------------------------------------- OBJS = \ CarlaEngine.cpp.o \ @@ -30,23 +36,25 @@ OBJSp = $(OBJS) \ CarlaEngineNative.cpp.exp.o endif +# ---------------------------------------------------------------------------------------------------------------------------- + TARGETa = ../carla_engine.a ifneq ($(WIN32),true) TARGETp = ../carla_engine_plugin.a endif -# -------------------------------------------------------------- +# ---------------------------------------------------------------------------------------------------------------------------- all: $(TARGETa) $(TARGETp) -# -------------------------------------------------------------- +clean: + $(RM) *.o $(OBJSp) $(TARGET) $(TARGETp) -CarlaEngine.cpp.o: CarlaEngine.cpp $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_ENGINE_UTILS_HPP) $(CARLA_STATE_UTILS_HPP) - $(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ +debug: + $(MAKE) DEBUG=true -CarlaEngineRtAudio.cpp.o: CarlaEngineRtAudio.cpp $(HEADERS) - $(CXX) $< $(BUILD_CXX_FLAGS) $(RTAUDIO_FLAGS) $(RTMIDI_FLAGS) -c -o $@ +# ---------------------------------------------------------------------------------------------------------------------------- $(TARGETa): $(OBJSa) $(RM) $@ @@ -56,20 +64,33 @@ $(TARGETp): $(OBJSp) $(RM) $@ $(AR) crs $@ $^ -# -------------------------------------------------------------- +# ---------------------------------------------------------------------------------------------------------------------------- -clean: - $(RM) *.o $(OBJSp) $(TARGET) $(TARGETp) +CarlaEngine.cpp.o: CarlaEngine.cpp $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_ENGINE_UTILS_HPP) $(CARLA_STATE_UTILS_HPP) + $(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ -debug: - $(MAKE) DEBUG=true +CarlaEngineInternal.cpp.o: CarlaEngineInternal.cpp $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_MIDI_H) + $(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ -# -------------------------------------------------------------- +CarlaEngineOsc.cpp.o: CarlaEngineOsc.cpp $(CARLA_ENGINE_HPP) $(CARLA_ENGINE_OSC_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_BRIDGE_UTILS_HPP) $(CARLA_MIDI_H) + $(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ -CARLA_ENGINE_INTERNAL_HPP = CarlaEngineInternal.hpp CarlaEngineOsc.hpp CarlaEngineThread.hpp $(CARLA_ENGINE_HPP) $(CARLA_MUTEX_HPP) $(LINKED_LIST_HPP) +CarlaEngineThread.cpp.o: CarlaEngineThread.cpp $(CARLA_ENGINE_HPP) $(CARLA_ENGINE_THREAD_HPP) $(CARLA_PLUGIN_HPP) + $(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ -# %.cpp.o: %.cpp $(HEADERS) -# $(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ -# -# %.cpp.exp.o: %.cpp $(HEADERS) -# $(CXX) $< $(BUILD_CXX_FLAGS) -DCARLA_PLUGIN_EXPORT -c -o $@ +CarlaEngineJack.cpp.o: CarlaEngineJack.cpp $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_ENGINE_UTILS_HPP) $(CARLA_MIDI_H) $(JACK_BRIDGE_HPP) + $(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ + +CarlaEngineRtAudio.cpp.o: CarlaEngineRtAudio.cpp $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_BACKEND_UTILS_HPP) $(RT_LINKED_LIST_HPP) $(RTAUDIO_HPP) $(RTMIDI_HPP) + $(CXX) $< $(BUILD_CXX_FLAGS) $(RTAUDIO_FLAGS) $(RTMIDI_FLAGS) -c -o $@ + +CarlaEngineJuce.cpp.o: CarlaEngineJuce.cpp $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_BACKEND_UTILS_HPP) + $(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ + +CarlaEngineNative.cpp.o: CarlaEngineNative.cpp $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_NATIVE_HPP) $(CARLA_PIPE_UTILS_HPP) $(CARLA_STATE_UTILS_HPP) + $(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ + +CarlaEngineNative.cpp.exp.o: CarlaEngineNative.cpp $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_NATIVE_HPP) $(CARLA_PIPE_UTILS_HPP) $(CARLA_STATE_UTILS_HPP) + $(CXX) $< $(BUILD_CXX_FLAGS) -DCARLA_PLUGIN_EXPORT -c -o $@ + +# ---------------------------------------------------------------------------------------------------------------------------- diff --git a/source/utils/CarlaPipeUtils.hpp b/source/utils/CarlaPipeUtils.hpp index 428ab0a3f..c95feb7c0 100644 --- a/source/utils/CarlaPipeUtils.hpp +++ b/source/utils/CarlaPipeUtils.hpp @@ -19,7 +19,6 @@ #ifndef CARLA_PIPE_UTILS_HPP_INCLUDED #define CARLA_PIPE_UTILS_HPP_INCLUDED -#include "CarlaUtils.hpp" #include "CarlaString.hpp" #include