From 4b7aae363abf4303865808bfe5ecb81ae6913cf3 Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 15 Mar 2019 02:14:42 +0100 Subject: [PATCH] Cleanup Signed-off-by: falkTX --- source/discovery/Makefile | 24 +++++++++---------- source/frontend/Makefile | 10 ++++---- source/frontend/widgets/Makefile | 16 ++++++------- source/interposer/Makefile | 18 +++++++------- source/modules/Makefile | 4 ++-- source/modules/Makefile.mk | 6 ++--- source/modules/audio_decoder/Makefile | 14 +++++------ source/modules/dgl/Makefile | 14 +++++------ source/modules/hylia/Makefile | 14 +++++------ source/modules/juce_audio_basics/Makefile | 18 +++++++------- source/modules/juce_audio_devices/Makefile | 18 +++++++------- source/modules/juce_audio_processors/Makefile | 18 +++++++------- source/modules/juce_core/Makefile | 18 +++++++------- source/modules/juce_data_structures/Makefile | 18 +++++++------- source/modules/juce_events/Makefile | 18 +++++++------- source/modules/juce_graphics/Makefile | 18 +++++++------- source/modules/juce_gui_basics/Makefile | 18 +++++++------- source/modules/juce_gui_extra/Makefile | 18 +++++++------- source/modules/lilv/Makefile | 24 +++++++++---------- source/modules/rtaudio/Makefile | 14 +++++------ source/modules/rtmidi/Makefile | 14 +++++------ source/modules/sfzero/Makefile | 14 +++++------ source/modules/water/Makefile | 18 +++++++------- 23 files changed, 183 insertions(+), 183 deletions(-) diff --git a/source/discovery/Makefile b/source/discovery/Makefile index 8568f4ba0..7f83bf108 100644 --- a/source/discovery/Makefile +++ b/source/discovery/Makefile @@ -14,7 +14,7 @@ CWD=.. MODULENAME=carla-discovery include $(CWD)/Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BINDIR := $(CWD)/../bin @@ -26,7 +26,7 @@ OBJDIR := $(CWD)/../build/discovery/Release MODULEDIR := $(CWD)/../build/modules/Release endif -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_CXX_FLAGS += -I$(CWD)/backend -I$(CWD)/includes -I$(CWD)/modules -I$(CWD)/utils @@ -42,7 +42,7 @@ endif 64BIT_FLAGS += -DBUILD_BRIDGE -DBUILD_BRIDGE_ALTERNATIVE_ARCH ARM32_FLAGS += -DBUILD_BRIDGE -DBUILD_BRIDGE_ALTERNATIVE_ARCH -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- NATIVE_BUILD_FLAGS = NATIVE_LINK_FLAGS = @@ -52,7 +52,7 @@ NATIVE_BUILD_FLAGS += $(FLUIDSYNTH_FLAGS) NATIVE_LINK_FLAGS += $(FLUIDSYNTH_LIBS) endif -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- LIBS_native = $(MODULEDIR)/lilv.a LIBS_arm32 = $(MODULEDIR)/lilv.arm32.a @@ -125,7 +125,7 @@ LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS) endif # MACOS endif # USING_JUCE -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- OBJS_native = $(OBJDIR)/$(MODULENAME).cpp.o OBJS_arm32 = $(OBJDIR)/$(MODULENAME).cpp.arm32.o @@ -134,11 +134,11 @@ OBJS_posix64 = $(OBJDIR)/$(MODULENAME).cpp.posix64.o OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: native -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJDIR)/*.o $(BINDIR)/$(MODULENAME)-* @@ -146,7 +146,7 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- native: $(BINDIR)/$(MODULENAME)-native$(APP_EXT) arm32: $(BINDIR)/$(MODULENAME)-arm32 @@ -155,7 +155,7 @@ posix64: $(BINDIR)/$(MODULENAME)-posix64 win32: $(BINDIR)/$(MODULENAME)-win32.exe win64: $(BINDIR)/$(MODULENAME)-win64.exe -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(BINDIR)/$(MODULENAME)-native: $(OBJS_native) $(LIBS_native) -@mkdir -p $(BINDIR) @@ -195,7 +195,7 @@ $(BINDIR)/$(MODULENAME)-win64.exe: $(OBJS_win64) $(LIBS_win64) @echo "Linking $(MODULENAME)-win64.exe" @$(CXX) $< $(LIBS_START) $(LIBS_win64) $(LIBS_END) $(LINK_FLAGS) $(64BIT_FLAGS) -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp -@mkdir -p $(OBJDIR) @@ -217,7 +217,7 @@ $(OBJDIR)/$(MODULENAME).cpp.arm32.o: $(MODULENAME).cpp @echo "Compiling $< (ARM32)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(ARM32_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- -include $(OBJS_native:%.o=%.d) -include $(OBJS_arm32:%.o=%.d) @@ -226,4 +226,4 @@ $(OBJDIR)/$(MODULENAME).cpp.arm32.o: $(MODULENAME).cpp -include $(OBJS_win32:%.o=%.d) -include $(OBJS_win64:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/frontend/Makefile b/source/frontend/Makefile index 437a63282..3499c8006 100644 --- a/source/frontend/Makefile +++ b/source/frontend/Makefile @@ -7,7 +7,7 @@ CWD=.. include $(CWD)/Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BINDIR := $(CWD)/../bin RESDIR := $(CWD)/../resources @@ -80,11 +80,11 @@ RES = \ $(BINDIR)/resources/ui_inputdialog_value.py \ $(BINDIR)/resources/ui_midipattern.py -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(UIs) $(RES) -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- ui_%.py: $(RESDIR)/ui/%.ui $(PYUIC) $< -o $@ @@ -95,7 +95,7 @@ resources_rc.py: $(RESDIR)/resources.qrc $(RESDIR)/*/*.png $(RESDIR)/*/*.svg $(BINDIR)/resources/%: % $(LINK) $(CURDIR)/$* $(BINDIR)/resources/ -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -rf $(UIs) $(RES) __pycache__ *.pyc @@ -103,4 +103,4 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/frontend/widgets/Makefile b/source/frontend/widgets/Makefile index 4aac4e55b..0a6255396 100644 --- a/source/frontend/widgets/Makefile +++ b/source/frontend/widgets/Makefile @@ -7,7 +7,7 @@ CWD=.. include $(CWD)/Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BINDIR := $(CWD)/../bin @@ -19,7 +19,7 @@ OBJDIR := $(CWD)/../build/widgets/Release MODULEDIR := $(CWD)/../build/modules/Release endif -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_CXX_FLAGS += -I. -I$(CWD)/includes -I$(CWD)/modules -I$(CWD)/utils @@ -31,7 +31,7 @@ BUILD_CXX_FLAGS += $(shell pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets) LINK_FLAGS += $(shell pkg-config --libs Qt5Core Qt5Gui Qt5Widgets) endif -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- # FILES = \ # moc_paramspinbox.cpp \ @@ -51,11 +51,11 @@ OBJS = \ TARGET = $(MODULEDIR)/widgets.a -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(TARGET) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJDIR)/*.o $(TARGET) @@ -63,13 +63,13 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(MODULEDIR)/widgets.a: $(FILES) $(OBJS) $(RM) $@ $(AR) crs $@ $(OBJS) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/%.cpp.o: %.cpp -@mkdir -p $(OBJDIR) @@ -84,4 +84,4 @@ $(OBJDIR)/%.cpp.o: %.cpp # moc_%.cpp: %.hpp # $(MOC) $< -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/interposer/Makefile b/source/interposer/Makefile index 3d9237931..ae53e1cfe 100644 --- a/source/interposer/Makefile +++ b/source/interposer/Makefile @@ -7,7 +7,7 @@ CWD=.. include $(CWD)/Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BINDIR := $(CWD)/../bin @@ -19,14 +19,14 @@ OBJDIR := $(CWD)/../build/interposer/Release MODULEDIR := $(CWD)/../build/modules/Release endif -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_CXX_FLAGS += -I$(CWD) -I$(CWD)/backend -I$(CWD)/includes -I$(CWD)/modules -I$(CWD)/utils INTERPOSER_SAFE_LIBS = $(LIBDL_LIBS) INTERPOSER_X11_LIBS = $(X11_LIBS) $(LIBDL_LIBS) -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- OBJS = TARGETS = @@ -43,11 +43,11 @@ TARGETS += $(BINDIR)/libcarla_interposer-jack-x11.so endif endif -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(TARGETS) -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJDIR)/*.o $(TARGETS) @@ -55,7 +55,7 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(BINDIR)/libcarla_interposer-safe.so: $(OBJDIR)/interposer-safe.cpp.o -@mkdir -p $(BINDIR) @@ -72,7 +72,7 @@ $(BINDIR)/libcarla_interposer-jack-x11.so: $(OBJDIR)/interposer-jack-x11.cpp.o @echo "Linking libcarla_interposer-jack-x11.so" @$(CXX) $< $(SHARED) $(LINK_FLAGS) $(INTERPOSER_X11_LIBS) -o $@ -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/interposer-safe.cpp.o: interposer-safe.cpp -@mkdir -p $(OBJDIR) @@ -89,8 +89,8 @@ $(OBJDIR)/interposer-jack-x11.cpp.o: interposer-jack-x11.cpp @echo "Compiling $<" @$(CXX) $< $(BUILD_CXX_FLAGS) $(X11_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- -include $(OBJS:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/modules/Makefile b/source/modules/Makefile index 77fa95b63..f89554642 100644 --- a/source/modules/Makefile +++ b/source/modules/Makefile @@ -4,7 +4,7 @@ # Created by falkTX # -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: @@ -28,4 +28,4 @@ clean: $(MAKE) clean -C juce_gui_basics $(MAKE) clean -C juce_gui_extra -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/modules/Makefile.mk b/source/modules/Makefile.mk index 62d5245cf..26a8e14fd 100644 --- a/source/modules/Makefile.mk +++ b/source/modules/Makefile.mk @@ -13,7 +13,7 @@ endif include $(CWD)/Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BINDIR := $(CWD)/../bin @@ -25,9 +25,9 @@ OBJDIR := $(CWD)/../build/$(MODULENAME)/Release MODULEDIR := $(CWD)/../build/modules/Release endif -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_C_FLAGS += -I. -I$(CWD)/includes BUILD_CXX_FLAGS += -I. -I$(CWD)/includes -I$(CWD)/utils -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/modules/audio_decoder/Makefile b/source/modules/audio_decoder/Makefile index e4712d86a..ae2bd2f39 100644 --- a/source/modules/audio_decoder/Makefile +++ b/source/modules/audio_decoder/Makefile @@ -8,22 +8,22 @@ CWD=../.. MODULENAME=audio_decoder include ../Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- # BUILD_C_FLAGS += -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- OBJS = \ $(OBJDIR)/ad_ffmpeg.c.o \ $(OBJDIR)/ad_plugin.c.o \ $(OBJDIR)/ad_soundfile.c.o -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(MODULEDIR)/$(MODULENAME).a -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a @@ -31,7 +31,7 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(MODULEDIR)/$(MODULENAME).a: $(OBJS) -@mkdir -p $(MODULEDIR) @@ -39,7 +39,7 @@ $(MODULEDIR)/$(MODULENAME).a: $(OBJS) @rm -f $@ @$(AR) crs $@ $^ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/ad_ffmpeg.c.o: ad_ffmpeg.c -@mkdir -p $(OBJDIR) @@ -58,4 +58,4 @@ $(OBJDIR)/ad_soundfile.c.o: ad_soundfile.c -include $(OBJS:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/modules/dgl/Makefile b/source/modules/dgl/Makefile index 4e9431599..d59c7db31 100644 --- a/source/modules/dgl/Makefile +++ b/source/modules/dgl/Makefile @@ -8,11 +8,11 @@ CWD=../.. MODULENAME=dgl include ../Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_CXX_FLAGS += $(DGL_FLAGS) -Isrc -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- OBJS = \ $(OBJDIR)/Application.cpp.o \ @@ -38,12 +38,12 @@ OBJS_wine = \ $(OBJDIR)/Widget.cpp-wine.o \ $(OBJDIR)/Window.cpp-wine.o -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(MODULEDIR)/$(MODULENAME).a wine: $(MODULEDIR)/$(MODULENAME).wine.a -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a $(MODULEDIR)/$(MODULENAME).wine.a @@ -51,7 +51,7 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(MODULEDIR)/$(MODULENAME).a: $(OBJS) -@mkdir -p $(MODULEDIR) @@ -65,7 +65,7 @@ $(MODULEDIR)/$(MODULENAME).wine.a: $(OBJS_wine) @rm -f $@ @$(AR) crs $@ $^ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/%.cpp.o: src/%.cpp -@mkdir -p $(OBJDIR) @@ -85,4 +85,4 @@ $(OBJDIR)/Window.mm.o: src/Window.cpp -include $(OBJS:%.o=%.d) -include $(OBJS_wine:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/modules/hylia/Makefile b/source/modules/hylia/Makefile index 61bdcea0e..cf10eab76 100644 --- a/source/modules/hylia/Makefile +++ b/source/modules/hylia/Makefile @@ -8,21 +8,21 @@ CWD=../.. MODULENAME=hylia include ../Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_CXX_FLAGS += $(HYLIA_FLAGS) -I$(CWD) -Ilink BUILD_CXX_FLAGS += -Wno-multichar -Wno-unused-parameter -Wno-unused-variable -Wno-uninitialized BUILD_CXX_FLAGS += -Wno-missing-field-initializers -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- OBJS = $(OBJDIR)/hylia.cpp.o -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(MODULEDIR)/$(MODULENAME).a -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a @@ -30,7 +30,7 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(MODULEDIR)/$(MODULENAME).a: $(OBJS) -@mkdir -p $(MODULEDIR) @@ -38,7 +38,7 @@ $(MODULEDIR)/$(MODULENAME).a: $(OBJS) @rm -f $@ @$(AR) crs $@ $^ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/%.cpp.o: %.cpp -@mkdir -p $(OBJDIR) @@ -47,4 +47,4 @@ $(OBJDIR)/%.cpp.o: %.cpp -include $(OBJS:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/modules/juce_audio_basics/Makefile b/source/modules/juce_audio_basics/Makefile index 471c5245e..a1e35c03a 100644 --- a/source/modules/juce_audio_basics/Makefile +++ b/source/modules/juce_audio_basics/Makefile @@ -8,11 +8,11 @@ CWD=../.. MODULENAME=juce_audio_basics include ../Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_CXX_FLAGS += $(JUCE_AUDIO_BASICS_FLAGS) -I.. -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- ifeq ($(MACOS),true) OBJS = $(OBJDIR)/$(MODULENAME).mm.o @@ -26,7 +26,7 @@ endif OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(MODULEDIR)/$(MODULENAME).a posix32: $(MODULEDIR)/$(MODULENAME).posix32.a @@ -34,7 +34,7 @@ posix64: $(MODULEDIR)/$(MODULENAME).posix64.a win32: $(MODULEDIR)/$(MODULENAME).win32.a win64: $(MODULEDIR)/$(MODULENAME).win64.a -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a @@ -42,7 +42,7 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(MODULEDIR)/$(MODULENAME).a: $(OBJS) -@mkdir -p $(MODULEDIR) @@ -74,7 +74,7 @@ $(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64) @rm -f $@ @$(AR) crs $@ $^ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp -@mkdir -p $(OBJDIR) @@ -91,7 +91,7 @@ $(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp @echo "Compiling $< (64bit)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp -@mkdir -p $(OBJDIR) @@ -108,7 +108,7 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp @echo "Compiling $< (64bit)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- -include $(OBJS:%.o=%.d) -include $(OBJS_posix32:%.o=%.d) @@ -116,4 +116,4 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp -include $(OBJS_win32:%.o=%.d) -include $(OBJS_win64:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/modules/juce_audio_devices/Makefile b/source/modules/juce_audio_devices/Makefile index 4910fd058..3ecb2a015 100644 --- a/source/modules/juce_audio_devices/Makefile +++ b/source/modules/juce_audio_devices/Makefile @@ -8,7 +8,7 @@ CWD=../.. MODULENAME=juce_audio_devices include ../Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_CXX_FLAGS += $(JUCE_AUDIO_DEVICES_FLAGS) -I.. @@ -18,7 +18,7 @@ BUILD_CXX_FLAGS += -Wno-missing-field-initializers BUILD_CXX_FLAGS += -I$(CWD)/modules/rtaudio/include endif -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- ifeq ($(MACOS),true) OBJS = $(OBJDIR)/$(MODULENAME).mm.o @@ -32,7 +32,7 @@ endif OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(MODULEDIR)/$(MODULENAME).a posix32: $(MODULEDIR)/$(MODULENAME).posix32.a @@ -40,7 +40,7 @@ posix64: $(MODULEDIR)/$(MODULENAME).posix64.a win32: $(MODULEDIR)/$(MODULENAME).win32.a win64: $(MODULEDIR)/$(MODULENAME).win64.a -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a @@ -48,7 +48,7 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(MODULEDIR)/$(MODULENAME).a: $(OBJS) -@mkdir -p $(MODULEDIR) @@ -80,7 +80,7 @@ $(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64) @rm -f $@ @$(AR) crs $@ $^ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp -@mkdir -p $(OBJDIR) @@ -97,7 +97,7 @@ $(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp @echo "Compiling $< (64bit)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp -@mkdir -p $(OBJDIR) @@ -114,7 +114,7 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp @echo "Compiling $< (64bit)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- -include $(OBJS:%.o=%.d) -include $(OBJS_posix32:%.o=%.d) @@ -122,4 +122,4 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp -include $(OBJS_win32:%.o=%.d) -include $(OBJS_win64:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/modules/juce_audio_processors/Makefile b/source/modules/juce_audio_processors/Makefile index f4c1d5639..5eb328e47 100644 --- a/source/modules/juce_audio_processors/Makefile +++ b/source/modules/juce_audio_processors/Makefile @@ -8,7 +8,7 @@ CWD=../.. MODULENAME=juce_audio_processors include ../Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_CXX_FLAGS += $(JUCE_AUDIO_PROCESSORS_FLAGS) -I$(CWD)/includes/vst3sdk -I.. @@ -28,7 +28,7 @@ BUILD_CXX_FLAGS += -D_NATIVE_WCHAR_T_DEFINED -D__wchar_t=wchar_t -fpermissive endif endif -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- ifeq ($(MACOS),true) OBJS = $(OBJDIR)/$(MODULENAME).mm.o @@ -42,7 +42,7 @@ endif OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(MODULEDIR)/$(MODULENAME).a posix32: $(MODULEDIR)/$(MODULENAME).posix32.a @@ -50,7 +50,7 @@ posix64: $(MODULEDIR)/$(MODULENAME).posix64.a win32: $(MODULEDIR)/$(MODULENAME).win32.a win64: $(MODULEDIR)/$(MODULENAME).win64.a -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a @@ -58,7 +58,7 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(MODULEDIR)/$(MODULENAME).a: $(OBJS) -@mkdir -p $(MODULEDIR) @@ -90,7 +90,7 @@ $(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64) @rm -f $@ @$(AR) crs $@ $^ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp -@mkdir -p $(OBJDIR) @@ -107,7 +107,7 @@ $(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp @echo "Compiling $< (64bit)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp -@mkdir -p $(OBJDIR) @@ -124,7 +124,7 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp @echo "Compiling $< (64bit)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- -include $(OBJS:%.o=%.d) -include $(OBJS_posix32:%.o=%.d) @@ -132,4 +132,4 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp -include $(OBJS_win32:%.o=%.d) -include $(OBJS_win64:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/modules/juce_core/Makefile b/source/modules/juce_core/Makefile index 73099a520..849c5d06a 100644 --- a/source/modules/juce_core/Makefile +++ b/source/modules/juce_core/Makefile @@ -8,7 +8,7 @@ CWD=../.. MODULENAME=juce_core include ../Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_CXX_FLAGS += $(JUCE_CORE_FLAGS) -I.. @@ -16,7 +16,7 @@ ifeq ($(WIN32),true) BUILD_CXX_FLAGS += -w endif -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- ifeq ($(MACOS),true) OBJS = $(OBJDIR)/$(MODULENAME).mm.o @@ -30,7 +30,7 @@ endif OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(MODULEDIR)/$(MODULENAME).a posix32: $(MODULEDIR)/$(MODULENAME).posix32.a @@ -38,7 +38,7 @@ posix64: $(MODULEDIR)/$(MODULENAME).posix64.a win32: $(MODULEDIR)/$(MODULENAME).win32.a win64: $(MODULEDIR)/$(MODULENAME).win64.a -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a @@ -46,7 +46,7 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(MODULEDIR)/$(MODULENAME).a: $(OBJS) -@mkdir -p $(MODULEDIR) @@ -78,7 +78,7 @@ $(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64) @rm -f $@ @$(AR) crs $@ $^ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp -@mkdir -p $(OBJDIR) @@ -95,7 +95,7 @@ $(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp @echo "Compiling $< (64bit)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp -@mkdir -p $(OBJDIR) @@ -112,7 +112,7 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp @echo "Compiling $< (64bit)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- -include $(OBJS:%.o=%.d) -include $(OBJS_posix32:%.o=%.d) @@ -120,4 +120,4 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp -include $(OBJS_win32:%.o=%.d) -include $(OBJS_win64:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/modules/juce_data_structures/Makefile b/source/modules/juce_data_structures/Makefile index 999b49d1b..4681fa497 100644 --- a/source/modules/juce_data_structures/Makefile +++ b/source/modules/juce_data_structures/Makefile @@ -8,11 +8,11 @@ CWD=../.. MODULENAME=juce_data_structures include ../Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_CXX_FLAGS += $(JUCE_DATA_STRUCTURES_FLAGS) -I.. -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- ifeq ($(MACOS),true) OBJS = $(OBJDIR)/$(MODULENAME).mm.o @@ -26,7 +26,7 @@ endif OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(MODULEDIR)/$(MODULENAME).a posix32: $(MODULEDIR)/$(MODULENAME).posix32.a @@ -34,7 +34,7 @@ posix64: $(MODULEDIR)/$(MODULENAME).posix64.a win32: $(MODULEDIR)/$(MODULENAME).win32.a win64: $(MODULEDIR)/$(MODULENAME).win64.a -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a @@ -42,7 +42,7 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(MODULEDIR)/$(MODULENAME).a: $(OBJS) -@mkdir -p $(MODULEDIR) @@ -74,7 +74,7 @@ $(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64) @rm -f $@ @$(AR) crs $@ $^ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp -@mkdir -p $(OBJDIR) @@ -91,7 +91,7 @@ $(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp @echo "Compiling $< (64bit)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp -@mkdir -p $(OBJDIR) @@ -108,7 +108,7 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp @echo "Compiling $< (64bit)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- -include $(OBJS:%.o=%.d) -include $(OBJS_posix32:%.o=%.d) @@ -116,4 +116,4 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp -include $(OBJS_win32:%.o=%.d) -include $(OBJS_win64:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/modules/juce_events/Makefile b/source/modules/juce_events/Makefile index 8a77d309d..377f2ee89 100644 --- a/source/modules/juce_events/Makefile +++ b/source/modules/juce_events/Makefile @@ -8,7 +8,7 @@ CWD=../.. MODULENAME=juce_events include ../Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_CXX_FLAGS += $(JUCE_EVENTS_FLAGS) -I.. @@ -16,7 +16,7 @@ ifeq ($(WIN32),true) BUILD_CXX_FLAGS += -Wno-missing-field-initializers endif -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- ifeq ($(MACOS),true) OBJS = $(OBJDIR)/$(MODULENAME).mm.o @@ -30,7 +30,7 @@ endif OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(MODULEDIR)/$(MODULENAME).a posix32: $(MODULEDIR)/$(MODULENAME).posix32.a @@ -38,7 +38,7 @@ posix64: $(MODULEDIR)/$(MODULENAME).posix64.a win32: $(MODULEDIR)/$(MODULENAME).win32.a win64: $(MODULEDIR)/$(MODULENAME).win64.a -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a @@ -46,7 +46,7 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(MODULEDIR)/$(MODULENAME).a: $(OBJS) -@mkdir -p $(MODULEDIR) @@ -78,7 +78,7 @@ $(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64) @rm -f $@ @$(AR) crs $@ $^ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp -@mkdir -p $(OBJDIR) @@ -95,7 +95,7 @@ $(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp @echo "Compiling $< (64bit)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp -@mkdir -p $(OBJDIR) @@ -112,7 +112,7 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp @echo "Compiling $< (64bit)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- -include $(OBJS:%.o=%.d) -include $(OBJS_posix32:%.o=%.d) @@ -120,4 +120,4 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp -include $(OBJS_win32:%.o=%.d) -include $(OBJS_win64:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/modules/juce_graphics/Makefile b/source/modules/juce_graphics/Makefile index 97501f659..3584a407e 100644 --- a/source/modules/juce_graphics/Makefile +++ b/source/modules/juce_graphics/Makefile @@ -8,7 +8,7 @@ CWD=../.. MODULENAME=juce_graphics include ../Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_CXX_FLAGS += $(JUCE_GRAPHICS_FLAGS) -I.. @@ -19,7 +19,7 @@ ifeq ($(WIN32),true) BUILD_CXX_FLAGS += -Wno-missing-field-initializers -Wno-strict-overflow endif -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- ifeq ($(MACOS),true) OBJS = $(OBJDIR)/$(MODULENAME).mm.o @@ -33,7 +33,7 @@ endif OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(MODULEDIR)/$(MODULENAME).a posix32: $(MODULEDIR)/$(MODULENAME).posix32.a @@ -41,7 +41,7 @@ posix64: $(MODULEDIR)/$(MODULENAME).posix64.a win32: $(MODULEDIR)/$(MODULENAME).win32.a win64: $(MODULEDIR)/$(MODULENAME).win64.a -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a @@ -49,7 +49,7 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(MODULEDIR)/$(MODULENAME).a: $(OBJS) -@mkdir -p $(MODULEDIR) @@ -81,7 +81,7 @@ $(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64) @rm -f $@ @$(AR) crs $@ $^ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp -@mkdir -p $(OBJDIR) @@ -98,7 +98,7 @@ $(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp @echo "Compiling $< (64bit)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp -@mkdir -p $(OBJDIR) @@ -115,7 +115,7 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp @echo "Compiling $< (64bit)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- -include $(OBJS:%.o=%.d) -include $(OBJS_posix32:%.o=%.d) @@ -123,4 +123,4 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp -include $(OBJS_win32:%.o=%.d) -include $(OBJS_win64:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/modules/juce_gui_basics/Makefile b/source/modules/juce_gui_basics/Makefile index 3af84b2b7..cbe6ada72 100644 --- a/source/modules/juce_gui_basics/Makefile +++ b/source/modules/juce_gui_basics/Makefile @@ -8,7 +8,7 @@ CWD=../.. MODULENAME=juce_gui_basics include ../Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_CXX_FLAGS += $(JUCE_GUI_BASICS_FLAGS) -I.. @@ -16,7 +16,7 @@ ifeq ($(WIN32),true) BUILD_CXX_FLAGS += -Wno-missing-field-initializers -Wno-strict-aliasing -Wno-strict-overflow endif -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- ifeq ($(MACOS),true) OBJS = $(OBJDIR)/$(MODULENAME).mm.o @@ -30,7 +30,7 @@ endif OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(MODULEDIR)/$(MODULENAME).a posix32: $(MODULEDIR)/$(MODULENAME).posix32.a @@ -38,7 +38,7 @@ posix64: $(MODULEDIR)/$(MODULENAME).posix64.a win32: $(MODULEDIR)/$(MODULENAME).win32.a win64: $(MODULEDIR)/$(MODULENAME).win64.a -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a @@ -46,7 +46,7 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(MODULEDIR)/$(MODULENAME).a: $(OBJS) -@mkdir -p $(MODULEDIR) @@ -78,7 +78,7 @@ $(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64) @rm -f $@ @$(AR) crs $@ $^ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp -@mkdir -p $(OBJDIR) @@ -95,7 +95,7 @@ $(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp @echo "Compiling $< (64bit)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp -@mkdir -p $(OBJDIR) @@ -112,7 +112,7 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp @echo "Compiling $< (64bit)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- -include $(OBJS:%.o=%.d) -include $(OBJS_posix32:%.o=%.d) @@ -120,4 +120,4 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp -include $(OBJS_win32:%.o=%.d) -include $(OBJS_win64:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/modules/juce_gui_extra/Makefile b/source/modules/juce_gui_extra/Makefile index e2a793702..21b7105f7 100644 --- a/source/modules/juce_gui_extra/Makefile +++ b/source/modules/juce_gui_extra/Makefile @@ -8,11 +8,11 @@ CWD=../.. MODULENAME=juce_gui_extra include ../Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_CXX_FLAGS += $(JUCE_GUI_EXTRA_FLAGS) -I.. -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- ifeq ($(MACOS),true) OBJS = $(OBJDIR)/$(MODULENAME).mm.o @@ -26,7 +26,7 @@ endif OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(MODULEDIR)/$(MODULENAME).a posix32: $(MODULEDIR)/$(MODULENAME).posix32.a @@ -34,7 +34,7 @@ posix64: $(MODULEDIR)/$(MODULENAME).posix64.a win32: $(MODULEDIR)/$(MODULENAME).win32.a win64: $(MODULEDIR)/$(MODULENAME).win64.a -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a @@ -42,7 +42,7 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(MODULEDIR)/$(MODULENAME).a: $(OBJS) -@mkdir -p $(MODULEDIR) @@ -74,7 +74,7 @@ $(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64) @rm -f $@ @$(AR) crs $@ $^ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp -@mkdir -p $(OBJDIR) @@ -91,7 +91,7 @@ $(OBJDIR)/$(MODULENAME).cpp.%64.o: $(MODULENAME).cpp @echo "Compiling $< (64bit)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).cpp -@mkdir -p $(OBJDIR) @@ -108,7 +108,7 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp @echo "Compiling $< (64bit)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- -include $(OBJS:%.o=%.d) -include $(OBJS_posix32:%.o=%.d) @@ -116,4 +116,4 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp -include $(OBJS_win32:%.o=%.d) -include $(OBJS_win64:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/modules/lilv/Makefile b/source/modules/lilv/Makefile index 2afd1d42e..413d634dc 100644 --- a/source/modules/lilv/Makefile +++ b/source/modules/lilv/Makefile @@ -8,18 +8,18 @@ CWD=../.. MODULENAME=lilv include ../Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- SERD_VERSION = 0.24.0 SORD_VERSION = 0.16.0 SRATOM_VERSION = 0.6.0 LILV_VERSION = 0.24.0 -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_C_FLAGS += $(LILV_FLAGS) -Iconfig -w -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- OBJS = $(OBJDIR)/serd.c.o $(OBJDIR)/sord.c.o $(OBJDIR)/sratom.c.o $(OBJDIR)/lilv.c.o OBJS_arm32 = $(OBJDIR)/serd.c.arm32.o $(OBJDIR)/sord.c.arm32.o $(OBJDIR)/sratom.c.arm32.o $(OBJDIR)/lilv.c.arm32.o @@ -28,7 +28,7 @@ OBJS_posix64 = $(OBJDIR)/serd.c.posix64.o $(OBJDIR)/sord.c.posix64.o $(OBJDIR)/s 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: $(MODULEDIR)/$(MODULENAME).a arm32: $(MODULEDIR)/$(MODULENAME).arm32.a @@ -37,7 +37,7 @@ posix64: $(MODULEDIR)/$(MODULENAME).posix64.a win32: $(MODULEDIR)/$(MODULENAME).win32.a win64: $(MODULEDIR)/$(MODULENAME).win64.a -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a @@ -45,7 +45,7 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(MODULEDIR)/$(MODULENAME).a: $(OBJS) -@mkdir -p $(MODULEDIR) @@ -83,7 +83,7 @@ $(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64) @rm -f $@ @$(AR) crs $@ $^ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/serd.c.o: serd.c -@mkdir -p $(OBJDIR) @@ -105,7 +105,7 @@ $(OBJDIR)/serd.c.arm32.o: serd.c @echo "Compiling $< (ARM32)" @$(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) $(ARM32_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/sord.c.o: sord.c -@mkdir -p $(OBJDIR) @@ -127,7 +127,7 @@ $(OBJDIR)/sord.c.arm32.o: sord.c @echo "Compiling $< (ARM32)" @$(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(ARM32_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/sratom.c.o: sratom.c -@mkdir -p $(OBJDIR) @@ -149,7 +149,7 @@ $(OBJDIR)/sratom.c.arm32.o: sratom.c @echo "Compiling $< (ARM32)" @$(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) $(ARM32_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/lilv.c.o: lilv.c -@mkdir -p $(OBJDIR) @@ -171,7 +171,7 @@ $(OBJDIR)/lilv.c.arm32.o: lilv.c @echo "Compiling $< (ARM32)" @$(CC) $< $(BUILD_C_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src $(ARM32_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- -include $(OBJS:%.o=%.d) -include $(OBJS_arm32:%.o=%.d) @@ -180,4 +180,4 @@ $(OBJDIR)/lilv.c.arm32.o: lilv.c -include $(OBJS_win32:%.o=%.d) -include $(OBJS_win64:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/modules/rtaudio/Makefile b/source/modules/rtaudio/Makefile index 9ea4603be..c7e3eeeee 100644 --- a/source/modules/rtaudio/Makefile +++ b/source/modules/rtaudio/Makefile @@ -8,7 +8,7 @@ CWD=../.. MODULENAME=rtaudio include ../Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_CXX_FLAGS += $(RTAUDIO_FLAGS) -I$(CWD) -Iinclude @@ -16,15 +16,15 @@ ifeq ($(WIN32),true) BUILD_CXX_FLAGS += -Wno-unused-function -Wno-unused-but-set-variable endif -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- OBJS = $(OBJDIR)/RtAudio.cpp.o -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(MODULEDIR)/$(MODULENAME).a -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a @@ -32,7 +32,7 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(MODULEDIR)/$(MODULENAME).a: $(OBJS) -@mkdir -p $(MODULEDIR) @@ -40,7 +40,7 @@ $(MODULEDIR)/$(MODULENAME).a: $(OBJS) @rm -f $@ @$(AR) crs $@ $^ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/%.cpp.o: %.cpp -@mkdir -p $(OBJDIR) @@ -49,4 +49,4 @@ $(OBJDIR)/%.cpp.o: %.cpp -include $(OBJS:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/modules/rtmidi/Makefile b/source/modules/rtmidi/Makefile index a4ba4db45..451c1c609 100644 --- a/source/modules/rtmidi/Makefile +++ b/source/modules/rtmidi/Makefile @@ -8,19 +8,19 @@ CWD=../.. MODULENAME=rtmidi include ../Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_CXX_FLAGS += $(RTMIDI_FLAGS) -w -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- OBJS = $(OBJDIR)/RtMidi.cpp.o -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(MODULEDIR)/$(MODULENAME).a -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a @@ -28,7 +28,7 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(MODULEDIR)/$(MODULENAME).a: $(OBJS) -@mkdir -p $(MODULEDIR) @@ -36,7 +36,7 @@ $(MODULEDIR)/$(MODULENAME).a: $(OBJS) @rm -f $@ @$(AR) crs $@ $^ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/%.cpp.o: %.cpp -@mkdir -p $(OBJDIR) @@ -45,4 +45,4 @@ $(OBJDIR)/%.cpp.o: %.cpp -include $(OBJS:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/modules/sfzero/Makefile b/source/modules/sfzero/Makefile index f8e4db054..d307a7c9c 100644 --- a/source/modules/sfzero/Makefile +++ b/source/modules/sfzero/Makefile @@ -8,19 +8,19 @@ CWD=../.. MODULENAME=sfzero include ../Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_CXX_FLAGS += -I$(CWD)/modules -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- OBJS = $(OBJDIR)/SFZero.cpp.o -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(MODULEDIR)/$(MODULENAME).a -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a @@ -28,7 +28,7 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(MODULEDIR)/$(MODULENAME).a: $(OBJS) -@mkdir -p $(MODULEDIR) @@ -36,7 +36,7 @@ $(MODULEDIR)/$(MODULENAME).a: $(OBJS) @rm -f $@ @$(AR) crs $@ $^ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/%.cpp.o: %.cpp -@mkdir -p $(OBJDIR) @@ -45,4 +45,4 @@ $(OBJDIR)/%.cpp.o: %.cpp -include $(OBJS:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- diff --git a/source/modules/water/Makefile b/source/modules/water/Makefile index 07907e736..7631bf993 100644 --- a/source/modules/water/Makefile +++ b/source/modules/water/Makefile @@ -8,11 +8,11 @@ CWD=../.. MODULENAME=water include ../Makefile.mk -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- BUILD_CXX_FLAGS += -I.. -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- ifeq ($(MACOS),true) OBJS = $(OBJDIR)/$(MODULENAME).mm.o @@ -29,7 +29,7 @@ endif OBJS_win32 = $(OBJDIR)/$(MODULENAME).cpp.win32.o OBJS_win64 = $(OBJDIR)/$(MODULENAME).cpp.win64.o -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- all: $(MODULEDIR)/$(MODULENAME).a $(MODULEDIR)/$(MODULENAME).files.a arm32: $(MODULEDIR)/$(MODULENAME).arm32.a @@ -38,7 +38,7 @@ posix64: $(MODULEDIR)/$(MODULENAME).posix64.a win32: $(MODULEDIR)/$(MODULENAME).win32.a win64: $(MODULEDIR)/$(MODULENAME).win64.a -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- clean: rm -f $(OBJDIR)/*.o $(MODULEDIR)/$(MODULENAME)*.a @@ -46,7 +46,7 @@ clean: debug: $(MAKE) DEBUG=true -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(MODULEDIR)/$(MODULENAME).a: $(OBJS) -@mkdir -p $(MODULEDIR) @@ -90,7 +90,7 @@ $(MODULEDIR)/$(MODULENAME).win64.a: $(OBJS_win64) @rm -f $@ @$(AR) crs $@ $^ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/$(MODULENAME).cpp.o: $(MODULENAME).cpp -@mkdir -p $(OBJDIR) @@ -117,7 +117,7 @@ $(OBJDIR)/$(MODULENAME).cpp.arm32.o: $(MODULENAME).cpp @echo "Compiling $< (ARM32)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(ARM32_FLAGS) -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- $(OBJDIR)/$(MODULENAME).mm.o: $(MODULENAME).mm $(MODULENAME).cpp -@mkdir -p $(OBJDIR) @@ -139,7 +139,7 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp @echo "Compiling $< (64bit)" @$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -ObjC++ -c -o $@ -# ---------------------------------------------------------------------------------------------------------------------------- +# --------------------------------------------------------------------------------------------------------------------- -include $(OBJS:%.o=%.d) -include $(OBJS_files:%.o=%.d) @@ -149,4 +149,4 @@ $(OBJDIR)/$(MODULENAME).mm.%64.o: $(MODULENAME).cpp -include $(OBJS_win32:%.o=%.d) -include $(OBJS_win64:%.o=%.d) -# ---------------------------------------------------------------------------------------------------------------------------- +# ---------------------------------------------------------------------------------------------------------------------