From 932b4c97461ff2150d41b81e07e6935c3cd30b49 Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 14 Mar 2019 10:38:46 +0100 Subject: [PATCH] Cleanup Signed-off-by: falkTX --- source/backend/Makefile | 16 ++++++++-------- source/backend/Makefile.mk | 8 ++++---- source/backend/engine/Makefile | 12 ++++++------ source/backend/plugin/Makefile | 12 ++++++------ source/backend/utils/Makefile | 14 +++++++------- source/bridges-plugin/Makefile | 32 +++++++++++++++---------------- source/jackbridge/Makefile | 24 +++++++++++------------ source/libjack/Makefile | 18 ++++++++--------- source/modules/rtmempool/Makefile | 16 ++++++++-------- source/tests/Makefile | 28 +++++++++++++-------------- source/theme/Makefile | 22 ++++++++++----------- 11 files changed, 101 insertions(+), 101 deletions(-) diff --git a/source/backend/Makefile b/source/backend/Makefile index 054cd9d41..7cbc5cd2c 100644 --- a/source/backend/Makefile +++ b/source/backend/Makefile @@ -7,7 +7,7 @@ CWD=.. include Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- OBJS_standalone = \ $(OBJDIR)/CarlaStandalone.cpp.o \ @@ -16,7 +16,7 @@ OBJS_standalone = \ TARGETS = \ $(BINDIR)/libcarla_standalone2$(LIB_EXT) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- STANDALONE_LIBS = $(MODULEDIR)/carla_engine.a STANDALONE_LIBS += $(MODULEDIR)/carla_plugin.a @@ -54,7 +54,7 @@ STANDALONE_LIBS += $(MODULEDIR)/rtaudio.a STANDALONE_LIBS += $(MODULEDIR)/rtmidi.a endif -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- STANDALONE_LINK_FLAGS = $(JACKBRIDGE_LIBS) STANDALONE_LINK_FLAGS += $(LILV_LIBS) @@ -84,12 +84,12 @@ STANDALONE_LINK_FLAGS += $(RTAUDIO_LIBS) STANDALONE_LINK_FLAGS += $(RTMIDI_LIBS) endif -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(TARGETS) $(MAKE) -C utils -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJS_standalone) $(TARGETS) @@ -103,14 +103,14 @@ debug: doxygen: CarlaBackend.doxygen doxygen $^ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(BINDIR)/libcarla_standalone2$(LIB_EXT): $(OBJS_standalone) $(STANDALONE_LIBS) -@mkdir -p $(BINDIR) @echo "Linking libcarla_standalone2$(LIB_EXT)" @$(CXX) $(OBJS_standalone) $(LIBS_START) $(STANDALONE_LIBS) $(LIBS_END) $(LINK_FLAGS) $(STANDALONE_LINK_FLAGS) $(SHARED) -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- ifeq ($(MACOS),true) $(OBJDIR)/CarlaStandalone.cpp.o: CarlaStandalone.cpp @@ -126,4 +126,4 @@ $(OBJDIR)/%.cpp.o: %.cpp -include $(OBJS_standalone:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/backend/Makefile.mk b/source/backend/Makefile.mk index f337b3c21..a5211c406 100644 --- a/source/backend/Makefile.mk +++ b/source/backend/Makefile.mk @@ -17,7 +17,7 @@ BUILD_CXX_FLAGS += -Wno-undef endif endif -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BINDIR := $(CWD)/../bin @@ -29,13 +29,13 @@ OBJDIR := $(CWD)/../build/backend/Release MODULEDIR := $(CWD)/../build/modules/Release endif -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_CXX_FLAGS += -I. -I.. -I$(CWD) -I$(CWD)/includes -I$(CWD)/modules -I$(CWD)/utils BUILD_CXX_FLAGS += $(LIBLO_FLAGS) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_CXX_FLAGS += $(NATIVE_PLUGINS_FLAGS) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/backend/engine/Makefile b/source/backend/engine/Makefile index b46471a77..f2283c329 100644 --- a/source/backend/engine/Makefile +++ b/source/backend/engine/Makefile @@ -14,7 +14,7 @@ BUILD_CXX_FLAGS += -Wno-undef endif endif -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- OBJS = \ $(OBJDIR)/CarlaEngine.cpp.o \ @@ -51,11 +51,11 @@ TARGETS = \ $(MODULEDIR)/carla_engine.a \ $(MODULEDIR)/carla_engine_plugin.a -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(TARGETS) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJSa) $(OBJSp) $(TARGETS) @@ -63,7 +63,7 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(MODULEDIR)/carla_engine.a: $(OBJSa) -@mkdir -p $(MODULEDIR) @@ -77,7 +77,7 @@ $(MODULEDIR)/carla_engine_plugin.a: $(OBJSp) @rm -f $@ @$(AR) crs $@ $^ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/CarlaEngineRtAudio.cpp.o: CarlaEngineRtAudio.cpp -@mkdir -p $(OBJDIR) @@ -104,4 +104,4 @@ $(OBJDIR)/%.cpp.o: %.cpp -include $(OBJSa:%.o=%.d) -include $(OBJDIR)/CarlaEngineNative.cpp.exp.d -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/backend/plugin/Makefile b/source/backend/plugin/Makefile index ee24e6f62..7b53af08a 100644 --- a/source/backend/plugin/Makefile +++ b/source/backend/plugin/Makefile @@ -14,7 +14,7 @@ BUILD_CXX_FLAGS += -Wno-undef endif endif -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- OBJS = \ $(OBJDIR)/CarlaPlugin.cpp.o \ @@ -35,11 +35,11 @@ OBJS = \ TARGETS = \ $(MODULEDIR)/carla_plugin.a -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(TARGETS) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJS) $(TARGETS) @@ -47,7 +47,7 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(MODULEDIR)/carla_plugin.a: $(OBJS) -@mkdir -p $(MODULEDIR) @@ -55,7 +55,7 @@ $(MODULEDIR)/carla_plugin.a: $(OBJS) @rm -f $@ @$(AR) crs $@ $^ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/CarlaPluginFluidSynth.cpp.o: CarlaPluginFluidSynth.cpp -@mkdir -p $(OBJDIR) @@ -81,4 +81,4 @@ $(OBJDIR)/%.cpp.o: %.cpp -include $(OBJS:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/backend/utils/Makefile b/source/backend/utils/Makefile index eef9bbf4d..bb722b53e 100644 --- a/source/backend/utils/Makefile +++ b/source/backend/utils/Makefile @@ -7,7 +7,7 @@ CWD=../.. include ../Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- OBJS = \ $(OBJDIR)/CachedPlugins.cpp.o \ @@ -18,7 +18,7 @@ OBJS = \ TARGETS = $(BINDIR)/libcarla_utils$(LIB_EXT) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- LIBS = $(MODULEDIR)/lilv.a LIBS += $(MODULEDIR)/water.files.a @@ -60,11 +60,11 @@ LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS) endif endif -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(TARGETS) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJS) $(TARGETS) @@ -72,14 +72,14 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(BINDIR)/libcarla_utils$(LIB_EXT): $(OBJS) $(LIBS) -@mkdir -p $(BINDIR) @echo "Linking libcarla_utils$(LIB_EXT)" @$(CXX) $(OBJS) $(LIBS_START) $(LIBS) $(LIBS_END) $(LINK_FLAGS) $(LINK_FLAGS) $(SHARED) -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- ifeq ($(MACOS),true) $(OBJDIR)/Windows.cpp.o: Windows.cpp @@ -95,4 +95,4 @@ $(OBJDIR)/%.cpp.o: %.cpp -include $(OBJS:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/bridges-plugin/Makefile b/source/bridges-plugin/Makefile index b1b3ddade..6a32ba4d5 100644 --- a/source/bridges-plugin/Makefile +++ b/source/bridges-plugin/Makefile @@ -15,7 +15,7 @@ BUILD_CXX_FLAGS += -Wno-undef endif endif -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BINDIR := $(CWD)/../bin @@ -27,7 +27,7 @@ OBJDIR := $(CWD)/../build/bridges-plugin/Release MODULEDIR := $(CWD)/../build/modules/Release endif -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_CXX_FLAGS += -DBUILD_BRIDGE -I. -I$(CWD) -I$(CWD)/backend -I$(CWD)/includes -I$(CWD)/modules -I$(CWD)/utils BUILD_CXX_FLAGS += -I$(CWD)/backend/engine -I$(CWD)/backend/plugin @@ -36,7 +36,7 @@ BUILD_CXX_FLAGS += -I$(CWD)/backend/engine -I$(CWD)/backend/plugin 64BIT_FLAGS += -DBUILD_BRIDGE_ALTERNATIVE_ARCH ARM32_FLAGS += -DBUILD_BRIDGE_ALTERNATIVE_ARCH -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- LIBS_native = $(MODULEDIR)/jackbridge.a LIBS_arm32 = $(MODULEDIR)/jackbridge.arm32.a @@ -135,7 +135,7 @@ endif LINK_FLAGS += $(X11_LIBS) -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- NATIVE_BUILD_FLAGS = $(NATIVE_PLUGINS_FLAGS) NATIVE_LINK_FLAGS = $(NATIVE_PLUGINS_LIBS) @@ -160,7 +160,7 @@ ifeq ($(WIN32),true) EXTRA_LINK_FLAGS += -lole32 -mwindows endif -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- OBJS_native = \ $(OBJDIR)/CarlaBridgePlugin.cpp.o \ @@ -222,11 +222,11 @@ OBJS_posix64 = $(OBJS_arch:%.arch.o=%.posix64.o) OBJS_win32 = $(OBJS_arch:%.arch.o=%.win32.o) OBJS_win64 = $(OBJS_arch:%.arch.o=%.win64.o) -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: native -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJDIR)/*.o @@ -238,7 +238,7 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- native: $(BINDIR)/$(MODULENAME)-native$(APP_EXT) $(BINDIR)/$(MODULENAME)-lv2$(LIB_EXT) arm32: $(BINDIR)/$(MODULENAME)-arm32 @@ -247,7 +247,7 @@ posix64: $(BINDIR)/$(MODULENAME)-posix64 win32: $(BINDIR)/$(MODULENAME)-win32.exe win64: $(BINDIR)/$(MODULENAME)-win64.exe -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- # linking $(BINDIR)/$(MODULENAME)-native$(APP_EXT): $(OBJS_native) $(LIBS_native) @@ -285,7 +285,7 @@ $(BINDIR)/$(MODULENAME)-win64.exe: $(OBJS_win64) $(LIBS_win64) @echo "Linking $(MODULENAME)-win64.exe" @$(CXX) $(OBJS_win64) $(LIBS_START) $(LIBS_win64) $(LIBS_END) $(LINK_FLAGS) $(EXTRA_LINK_FLAGS) $(64BIT_FLAGS) -o $@ -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- # native ifeq ($(MACOS),true) @@ -335,7 +335,7 @@ $(OBJDIR)/CarlaEng%.cpp.o: $(CWD)/backend/engine/CarlaEng%.cpp @echo "Compiling CarlaEng$*.cpp (bridge)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(NATIVE_BUILD_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- # arm32 $(OBJDIR)/CarlaBridgePlugin.cpp.arm32.o: CarlaBridgePlugin.cpp @@ -403,7 +403,7 @@ $(OBJDIR)/CarlaPlug%.cpp.posix32.o: $(CWD)/backend/plugin/CarlaPlug%.cpp @echo "Compiling CarlaPlug$*.cpp (posix32 bridge)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- # posix64 ifeq ($(MACOS),true) @@ -448,7 +448,7 @@ $(OBJDIR)/CarlaPlug%.cpp.posix64.o: $(CWD)/backend/plugin/CarlaPlug%.cpp @echo "Compiling CarlaPlug$*.cpp (posix64 bridge)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- # win32 $(OBJDIR)/CarlaBridgePlugin.cpp.win32.o: CarlaBridgePlugin.cpp @@ -471,7 +471,7 @@ $(OBJDIR)/CarlaStandalone.cpp.win32.o: $(CWD)/backend/CarlaStandalone.cpp @echo "Compiling CarlaStandalone.cpp (win32 bridge)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- # win64 $(OBJDIR)/CarlaBridgePlugin.cpp.win64.o: CarlaBridgePlugin.cpp @@ -494,7 +494,7 @@ $(OBJDIR)/CarlaStandalone.cpp.win64.o: $(CWD)/backend/CarlaStandalone.cpp @echo "Compiling CarlaStandalone.cpp (win64 bridge)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- -include $(OBJS_lv2:%.o=%.d) -include $(OBJS_arm32:%.o=%.d) @@ -503,4 +503,4 @@ $(OBJDIR)/CarlaStandalone.cpp.win64.o: $(CWD)/backend/CarlaStandalone.cpp -include $(OBJS_win32:%.o=%.d) -include $(OBJS_win64:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/jackbridge/Makefile b/source/jackbridge/Makefile index 33dc58afc..aac0fba27 100644 --- a/source/jackbridge/Makefile +++ b/source/jackbridge/Makefile @@ -8,7 +8,7 @@ CWD=.. MODULENAME=jackbridge include ../modules/Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_CXX_FLAGS += $(JACKBRIDGE_FLAGS) LINK_FLAGS += $(JACKBRIDGE_LIBS) @@ -35,7 +35,7 @@ WINE_64BIT_FLAGS += -L/opt/wine-staging/lib64/wine WINE_LINK_FLAGS += -lrt endif -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- OBJS = $(OBJDIR)/JackBridge1.cpp.o $(OBJDIR)/JackBridge2.cpp.o OBJS_arm32 = $(OBJDIR)/JackBridge1.cpp.arm32.o $(OBJDIR)/JackBridge2.cpp.arm32.o @@ -51,7 +51,7 @@ OBJS_posix64e = $(OBJDIR)/JackBridgeExport.cpp.posix64e.o OBJS_win64e = $(OBJDIR)/JackBridgeExport.cpp.win64e.o OBJS_win32e = $(OBJDIR)/JackBridgeExport.cpp.win32e.o -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(MODULEDIR)/$(MODULENAME).a @@ -80,7 +80,7 @@ wine32: $(MODULEDIR)/$(MODULENAME)-wine32.dll$(LIB_EXT) wine64: $(MODULEDIR)/$(MODULENAME)-wine64.dll$(LIB_EXT) endif -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.* @@ -88,7 +88,7 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(MODULEDIR)/$(MODULENAME).a: $(OBJS) -@mkdir -p $(MODULEDIR) @@ -126,7 +126,7 @@ $(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64) @rm -f $@ @$(AR) crs $@ $^ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(MODULEDIR)/$(MODULENAME).posix32e.a: $(OBJS_posix32e) -@mkdir -p $(MODULEDIR) @@ -152,7 +152,7 @@ $(MODULEDIR)/$(MODULENAME).win64e.a: $(OBJS_win64e) @rm -f $@ @$(AR) crs $@ $^ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(MODULEDIR)/$(MODULENAME)-wine32.dll$(LIB_EXT): $(OBJS_wine32) JackBridgeExport.def -@mkdir -p $(MODULEDIR) @@ -164,7 +164,7 @@ $(MODULEDIR)/$(MODULENAME)-wine64.dll$(LIB_EXT): $(OBJS_wine64) JackBridgeExport @echo "Linking $(MODULENAME)-wine64.dll$(LIB_EXT)" @$(WINECC) $^ $(WINE_64BIT_FLAGS) $(WINE_LINK_FLAGS) $(SHARED) -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/JackBridge1.cpp.o: JackBridge1.cpp -@mkdir -p $(OBJDIR) @@ -176,7 +176,7 @@ $(OBJDIR)/JackBridge2.cpp.o: JackBridge2.cpp @echo "Compiling JackBridge2.cpp" @$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/JackBridgeExport.cpp.%32e.o: JackBridgeExport.cpp -@mkdir -p $(OBJDIR) @@ -188,7 +188,7 @@ $(OBJDIR)/JackBridgeExport.cpp.%64e.o: JackBridgeExport.cpp @echo "Compiling $<" @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -fpermissive -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/%.cpp.arm32.o: %.cpp -@mkdir -p $(OBJDIR) @@ -225,7 +225,7 @@ $(OBJDIR)/%.cpp.wine64.o: %.cpp @echo "Compiling $< (wine64)" @$(WINECC) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- -include $(OBJS:%.o=%.d) -include $(OBJS_arm32:%.o=%.d) @@ -240,4 +240,4 @@ $(OBJDIR)/%.cpp.wine64.o: %.cpp -include $(OBJS_wine32:%.o=%.d) -include $(OBJS_wine64:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/libjack/Makefile b/source/libjack/Makefile index 80d8767e2..75f9aa4d4 100644 --- a/source/libjack/Makefile +++ b/source/libjack/Makefile @@ -7,7 +7,7 @@ CWD=.. include $(CWD)/Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BINDIR := $(CWD)/../bin @@ -19,13 +19,13 @@ OBJDIR := $(CWD)/../build/libjack/Release MODULEDIR := $(CWD)/../build/modules/Release endif -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_C_FLAGS += -I$(CWD) -I$(CWD)/includes BUILD_CXX_FLAGS += -I$(CWD) -I$(CWD)/backend -I$(CWD)/includes -I$(CWD)/utils LINK_FLAGS += -lpthread -lrt -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- ifeq ($(LINUX),true) OBJS = \ @@ -51,11 +51,11 @@ OBJS = TARGET = endif -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(TARGET) -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJDIR)/*.o $(TARGET) @@ -63,14 +63,14 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(TARGET): $(OBJS) -@mkdir -p $(BINDIR)/jack @echo "Linking libjack.so.0" @$(CXX) $^ $(SHARED) $(LINK_FLAGS) $(LIBJACK_LIBS) -o $@ -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/%.c.o: %.c -@mkdir -p $(OBJDIR) @@ -82,8 +82,8 @@ $(OBJDIR)/%.cpp.o: %.cpp @echo "Compiling $<" @$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- -include $(OBJS:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/modules/rtmempool/Makefile b/source/modules/rtmempool/Makefile index 52f153dc9..327d05f3a 100644 --- a/source/modules/rtmempool/Makefile +++ b/source/modules/rtmempool/Makefile @@ -8,11 +8,11 @@ CWD=../.. MODULENAME=rtmempool include ../Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_C_FLAGS += $(RTMEMPOOL_FLAGS) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- OBJS = $(OBJDIR)/$(MODULENAME).c.o OBJS_arm32 = $(OBJDIR)/$(MODULENAME).c.arm32.o @@ -21,7 +21,7 @@ OBJS_posix64 = $(OBJDIR)/$(MODULENAME).c.posix64.o OBJS_win32 = $(OBJDIR)/$(MODULENAME).c.win32.o OBJS_win64 = $(OBJDIR)/$(MODULENAME).c.win64.o -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(MODULEDIR)/$(MODULENAME).a arm32: $(MODULEDIR)/$(MODULENAME).arm32.a @@ -30,7 +30,7 @@ posix64: $(MODULEDIR)/$(MODULENAME).posix64.a win32: $(MODULEDIR)/$(MODULENAME).win32.a win64: $(MODULEDIR)/$(MODULENAME).win64.a -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a @@ -38,7 +38,7 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(MODULEDIR)/$(MODULENAME).a: $(OBJS) -@mkdir -p $(MODULEDIR) @@ -76,7 +76,7 @@ $(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64) @rm -f $@ @$(AR) crs $@ $^ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/$(MODULENAME).c.o: $(MODULENAME).c -@mkdir -p $(OBJDIR) @@ -98,7 +98,7 @@ $(OBJDIR)/$(MODULENAME).c.arm32.o: $(MODULENAME).c @echo "Compiling $< (ARM32)" @$(CC) $< $(BUILD_C_FLAGS) $(ARM32_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- -include $(OBJS:%.o=%.d) -include $(OBJS_arm32:%.o=%.d) @@ -107,4 +107,4 @@ $(OBJDIR)/$(MODULENAME).c.arm32.o: $(MODULENAME).c -include $(OBJS_win32:%.o=%.d) -include $(OBJS_win64:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/tests/Makefile b/source/tests/Makefile index fa0c583bd..087411f8f 100644 --- a/source/tests/Makefile +++ b/source/tests/Makefile @@ -4,7 +4,7 @@ # Created by falkTX # -# -------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- CLANG ?= clang CXXLANG ?= clang++ @@ -14,7 +14,7 @@ MODULEDIR=../../build/modules/Release WINECXX ?= wineg++ -# -------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BASE_FLAGS = -Wall -Wextra -Werror -pipe -DBUILDING_CARLA -DREAL_BUILD BASE_FLAGS += -I. -I../backend -I../includes -I../modules -I../utils @@ -37,13 +37,13 @@ BASE_FLAGS += -O3 -ffast-math -mtune=generic -msse -msse2 -mfpmath=sse -fdata-se LINK_FLAGS += -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,-O1 -Wl,--as-needed -Wl,--strip-all endif -# -------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- ANSI_FLAGS = $(BASE_FLAGS) -DBUILD_ANSI_TEST # ANSI_FLAGS += -ansi -pedantic -pedantic-errors -Waggregate-return # ANSI_FLAGS += -L../backend -lcarla_standalone2 -# -------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- GNU_CXX_FLAGS = $(BASE_FLAGS) GNU_CXX_FLAGS += -std=c++11 -std=gnu++11 -Weffc++ -Wnon-virtual-dtor -Woverloaded-virtual @@ -51,7 +51,7 @@ ifneq ($(CC),clang-3.4) GNU_CXX_FLAGS += -Wzero-as-null-pointer-constant endif -# -------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- PEDANTIC_CXX_FLAGS = $(BASE_FLAGS) PEDANTIC_CXX_FLAGS += -std=c++11 -pedantic -pedantic-errors @@ -64,7 +64,7 @@ else PEDANTIC_CXX_FLAGS += -Wzero-as-null-pointer-constant endif -# -------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- # TARGETS = ansi-pedantic-test_c_ansi # TARGETS += ansi-pedantic-test_c89 @@ -90,7 +90,7 @@ TARGETS += CarlaUtils1 all: $(TARGETS) -# -------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- ansi-pedantic-test_c_ansi: ansi-pedantic-test.c ../backend/Carla*.h ../includes/*.h $(CC) $< $(ANSI_FLAGS) -ansi -pedantic -pedantic-errors -Wc++-compat -L../../bin -lcarla_standalone2 -o $@ @@ -119,13 +119,13 @@ ansi-pedantic-test_cxx11: ansi-pedantic-test.cpp ../backend/Carla*.h ../includes ansi-pedantic-test_cxxlang: ansi-pedantic-test.cpp ../backend/Carla*.h ../includes/*.h $(CXXLANG) $< $(ANSI_FLAGS) -ansi -pedantic -pedantic-errors -Weverything -Wno-padded -Wno-unknown-warning-option -L../../bin -lcarla_standalone2 -o $@ -# -------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- ctypes-test.so: ctypes-test.c .FORCED $(CC) $< $(BASE_FLAGS) -fPIC -shared -o $@ set -e; ./ctypes-test.py -# -------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- CachedPlugins: CachedPlugins.cpp $(CXX) $< $(PEDANTIC_CXX_FLAGS) -o $@ $(MODULEDIR)/juce_core.a $(MODULEDIR)/lilv.a -ldl -lpthread @@ -201,7 +201,7 @@ WineJack: WineJack.cpp $(WINECXX) $< $(BASE_FLAGS) -m32 -ljack -lpthread -o $@ set -e; ./$@.exe -# -------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- carla-uhe-test: carla-uhe-test.c $(CC) $< -Wall -Wextra -O0 -g -I../backend -I../includes -DREAL_BUILD -ldl -o $@ @@ -211,7 +211,7 @@ sem: sem.cpp $(MODULEDIR)/jackbridge/* $(CXX) $< -Wall -Wextra -O0 -g -I../utils -I../includes -DREAL_BUILD -o $@ ./$@ -# -------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- ChildProcess: ChildProcess.cpp $(CXX) $< $(PEDANTIC_CXX_FLAGS) $(MODULEDIR)/juce_core.a -ldl -lpthread -lrt -o $@ @@ -252,7 +252,7 @@ RtLinkedListGnu: RtLinkedList.cpp ../utils/LinkedList.hpp ../utils/RtLinkedList. $(CXX) $< $(MODULEDIR)/rtmempool.a $(GNU_CXX_FLAGS) -lpthread -o $@ valgrind --leak-check=full ./$@ -# -------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f *.o $(TARGETS) @@ -260,7 +260,7 @@ clean: debug: $(MAKE) DEBUG=true -# -------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- DISTRHO: DISTRHO.cpp ../modules/distrho/*.hpp ../modules/distrho/src/*.cpp $(CXX) $< ../modules/dgl.a $(PEDANTIC_CXX_FLAGS) -I../modules/distrho -I../modules/native-plugins/nekobi $(LINK_FLAGS) $(DGL_LIBS) -lpthread -o $@ @@ -274,6 +274,6 @@ DGL: DGL.cpp ../modules/distrho/dgl/src/Window.cpp # ./DGL # valgrind ./DGL -# -------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- .PHONY: .FORCED diff --git a/source/theme/Makefile b/source/theme/Makefile index 1457f751d..5426b738a 100644 --- a/source/theme/Makefile +++ b/source/theme/Makefile @@ -8,7 +8,7 @@ CWD=.. MODULENAME=theme include ../modules/Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- ifeq ($(HAVE_QT4),true) QT4_CXX_FLAGS = $(BUILD_CXX_FLAGS) $(shell pkg-config --cflags QtCore QtGui) @@ -22,7 +22,7 @@ QT5_LINK_FLAGS = $(LINK_FLAGS) $(shell pkg-config --libs Qt5Core Qt5Gui Qt5Widge QT5_STYLES_DIR = $(shell pkg-config --variable=libdir Qt5Core)/qt5/plugins/styles endif -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- ifeq ($(HAVE_QT4),true) FILES_qt4 = \ @@ -42,7 +42,7 @@ FILES_qt5 = \ $(OBJDIR)/resources.qt5.cpp endif -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- ifeq ($(HAVE_QT4),true) OBJS_qt4 = \ @@ -70,7 +70,7 @@ OBJS_qt5_shared = $(OBJS_qt5) \ $(OBJDIR)/moc_CarlaStylePlugin.qt5.cpp.o endif -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- ifeq ($(HAVE_QT5),true) all: $(BINDIR)/styles/carlastyle$(LIB_EXT) $(BINDIR)/styles/carlastyle.json @@ -81,7 +81,7 @@ endif qt4: $(MODULEDIR)/$(MODULENAME).qt4.a qt5: $(MODULEDIR)/$(MODULENAME).qt5.a -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a $(BINDIR)/styles/carlastyle$(LIB_EXT) $(FILES_qt4) $(FILES_qt5) @@ -93,7 +93,7 @@ install: $(BINDIR)/styles/carlastyle$(LIB_EXT) $(BINDIR)/styles/carlastyle.json install -d $(QT5_STYLES_DIR) install -m 644 $^ $(QT5_STYLES_DIR) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(MODULEDIR)/$(MODULENAME).qt4.a: $(FILES_qt4) $(OBJS_qt4) -@mkdir -p $(MODULEDIR) @@ -107,7 +107,7 @@ $(MODULEDIR)/$(MODULENAME).qt5.a: $(FILES_qt5) $(OBJS_qt5) @rm -f $@ @$(AR) crs $@ $(OBJS_qt5) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(BINDIR)/styles/carlastyle.dll: $(FILES_qt5) $(OBJS_qt5_shared) -@mkdir -p $(BINDIR)/styles @@ -128,7 +128,7 @@ $(BINDIR)/styles/carlastyle.json: styles/carlastyle.json -@mkdir -p $(BINDIR)/styles @cp -f $< $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/moc_%.qt4.cpp: %.hpp -@mkdir -p $(OBJDIR) @@ -150,7 +150,7 @@ $(OBJDIR)/resources.qt5.cpp: $(CWD)/../resources/resources-theme.qrc @echo "Generating resources.qt5.cpp" @$(RCC_QT5) $< -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/%.qt4.cpp.o: $(OBJDIR)/%.qt4.cpp $(OBJDIR)/moc_CarlaStyle.qt4.cpp -@mkdir -p $(OBJDIR) @@ -172,9 +172,9 @@ $(OBJDIR)/%.cpp.qt5.o: %.cpp $(OBJDIR)/moc_CarlaStyle.qt5.cpp @echo "Compiling $< (Qt5)" @$(CXX) $< $(QT5_CXX_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- -include $(OBJS_qt4_shared:%.o=%.d) -include $(OBJS_qt5_shared:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------------- +# ---------------------------------------------------------------------------------------------------------------------