From 694ac13bd691de5ca9a8e960f16c2c4da6be7797 Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 16 Nov 2021 13:30:19 +0000 Subject: [PATCH] Reorder make rules to fix build on macOS --- .gitignore | 1 + plugins/Makefile | 38 +++++++++++++++++++------------------- src/Makefile | 8 ++++---- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 4f327d8..e078da1 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ *.so *.zip +.DS_Store .kdev_include_paths .kdev4/ diff --git a/plugins/Makefile b/plugins/Makefile index 2fe8355..44d5b60 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -804,24 +804,24 @@ $(BUILD_DIR)/Bidoo/%.cpp.o: Bidoo/%.cpp -Wno-sign-compare \ -Wno-unused-function -$(BUILD_DIR)/BogaudioModules/%.cpp.o: BogaudioModules/%.cpp +$(BUILD_DIR)/BogaudioModules/src/follower_base.cpp.o: BogaudioModules/src/follower_base.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ $(foreach m,$(BOGAUDIO_CUSTOM),$(call custom_module_names,$(m),Bogaudio)) \ - $(foreach m,$(BOGAUDIO_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),Bogaudio_$(shell basename $*))) \ -DpluginInstance=pluginInstance__BogaudioModules \ + -DefGainMaxDecibels=efGainMaxDecibelsDebug \ -DRACK_SIMD=1 \ -IBogaudioModules/lib \ -IBogaudioModules/src/dsp -$(BUILD_DIR)/BogaudioModules/src/follower_base.cpp.o: BogaudioModules/src/follower_base.cpp +$(BUILD_DIR)/BogaudioModules/%.cpp.o: BogaudioModules/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ $(foreach m,$(BOGAUDIO_CUSTOM),$(call custom_module_names,$(m),Bogaudio)) \ + $(foreach m,$(BOGAUDIO_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),Bogaudio_$(shell basename $*))) \ -DpluginInstance=pluginInstance__BogaudioModules \ - -DefGainMaxDecibels=efGainMaxDecibelsDebug \ -DRACK_SIMD=1 \ -IBogaudioModules/lib \ -IBogaudioModules/src/dsp @@ -866,33 +866,33 @@ $(BUILD_DIR)/GrandeModular/%.cpp.o: GrandeModular/%.cpp -Wno-missing-braces \ -Wno-self-assign -# FIXME -DsetNextCableColor=isComplete shouldn't be here -$(BUILD_DIR)/ImpromptuModular/%.cpp.o: ImpromptuModular/%.cpp +$(BUILD_DIR)/ImpromptuModular/src/Foundr%.cpp.o: ImpromptuModular/src/Foundr%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ $(foreach m,$(IMPROMPTUMODULAR_CUSTOM),$(call custom_module_names,$(m),ImpromptuModular)) \ - $(foreach m,$(IMPROMPTUMODULAR_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),ImpromptuModular_$(shell basename $*))) \ -DpluginInstance=pluginInstance__ImpromptuModular \ - -DsetNextCableColor=isComplete \ - -Dinit=init__ImpromptuModular + -DStepAttributes=StepAttributesKernel -$(BUILD_DIR)/ImpromptuModular/src/Foundr%.cpp.o: ImpromptuModular/src/Foundr%.cpp +$(BUILD_DIR)/ImpromptuModular/src/comp/Components.cpp.o: ImpromptuModular/src/comp/Components.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ $(foreach m,$(IMPROMPTUMODULAR_CUSTOM),$(call custom_module_names,$(m),ImpromptuModular)) \ -DpluginInstance=pluginInstance__ImpromptuModular \ - -DStepAttributes=StepAttributesKernel + -DsaveDarkAsDefault=ImpromptuModularIgnore1 \ + -DloadDarkAsDefault=ImpromptuModularIgonre2 -$(BUILD_DIR)/ImpromptuModular/src/comp/Components.cpp.o: ImpromptuModular/src/comp/Components.cpp +# FIXME -DsetNextCableColor=isComplete shouldn't be here +$(BUILD_DIR)/ImpromptuModular/%.cpp.o: ImpromptuModular/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ $(foreach m,$(IMPROMPTUMODULAR_CUSTOM),$(call custom_module_names,$(m),ImpromptuModular)) \ + $(foreach m,$(IMPROMPTUMODULAR_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),ImpromptuModular_$(shell basename $*))) \ -DpluginInstance=pluginInstance__ImpromptuModular \ - -DsaveDarkAsDefault=ImpromptuModularIgnore1 \ - -DloadDarkAsDefault=ImpromptuModularIgonre2 + -DsetNextCableColor=isComplete \ + -Dinit=init__ImpromptuModular $(BUILD_DIR)/JW-Modules/%.cpp.o: JW-Modules/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @@ -906,20 +906,20 @@ $(BUILD_DIR)/JW-Modules/%.cpp.o: JW-Modules/%.cpp -Wno-unused-but-set-variable \ -Wno-unused-result -$(BUILD_DIR)/MindMeldModular/%.cpp.o: MindMeldModular/%.cpp +$(BUILD_DIR)/MindMeldModular/MindMeldModular.cpp.o: MindMeldModular/src/MindMeldModular.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ $(foreach m,$(MINDMELD_CUSTOM),$(call custom_module_names,$(m),JW)) \ - -DpluginInstance=pluginInstance__MindMeld + -DpluginInstance=pluginInstance__MindMeld \ + -Dinit=init__MindMeld -$(BUILD_DIR)/MindMeldModular/MindMeldModular.cpp.o: MindMeldModular/src/MindMeldModular.cpp +$(BUILD_DIR)/MindMeldModular/%.cpp.o: MindMeldModular/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ $(foreach m,$(MINDMELD_CUSTOM),$(call custom_module_names,$(m),JW)) \ - -DpluginInstance=pluginInstance__MindMeld \ - -Dinit=init__MindMeld + -DpluginInstance=pluginInstance__MindMeld $(BUILD_DIR)/mscHack/%.cpp.o: mscHack/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" diff --git a/src/Makefile b/src/Makefile index 97104f6..29949d9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -173,15 +173,15 @@ $(BUILD_DIR)/%.c.o: %.c @echo "Compiling $<" $(SILENT)$(CC) $< $(BUILD_C_FLAGS) -c -o $@ -$(BUILD_DIR)/%.cpp.o: %.cpp +$(BUILD_DIR)/Rack/src/core/%.cpp.o: Rack/src/core/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" - $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -UPRIVATE -c -o $@ -$(BUILD_DIR)/Rack/src/core/%.cpp.o: Rack/src/core/%.cpp +$(BUILD_DIR)/%.cpp.o: %.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" - $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -UPRIVATE -c -o $@ + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ # --------------------------------------------------------------