Browse Source

Fix build fixes

Signed-off-by: falkTX <falktx@falktx.com>
tags/22.02
falkTX 3 years ago
parent
commit
37c84fb961
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 13 additions and 1 deletions
  1. +12
    -0
      plugins/Makefile
  2. +1
    -1
      src/Makefile

+ 12
- 0
plugins/Makefile View File

@@ -792,6 +792,17 @@ $(BUILD_DIR)/Befaco/%.cpp.o: Befaco/%.cpp
-DpluginInstance=pluginInstance__Befaco -DpluginInstance=pluginInstance__Befaco


$(BUILD_DIR)/Bidoo/%.cpp.o: Bidoo/%.cpp $(BUILD_DIR)/Bidoo/%.cpp.o: Bidoo/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
$(foreach m,$(BIDOO_CUSTOM),$(call custom_module_names,$(m),Bidoo)) \
$(foreach m,$(BIDOO_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),Bidoo_$(shell basename $*))) \
-DpluginInstance=pluginInstance__Bidoo \
-IBidoo/src/dep/gverb/include \
-Wno-sign-compare

# FIXME -DPRIVATE= shouldn't be here
$(BUILD_DIR)/Bidoo/src/dep/%.cpp.o: Bidoo/src/dep/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<" @echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
@@ -864,6 +875,7 @@ $(BUILD_DIR)/GrandeModular/%.cpp.o: GrandeModular/%.cpp
-Wno-missing-braces \ -Wno-missing-braces \
-Wno-self-assign -Wno-self-assign


# FIXME -DsetNextCableColor=isComplete shouldn't be here
$(BUILD_DIR)/ImpromptuModular/%.cpp.o: ImpromptuModular/%.cpp $(BUILD_DIR)/ImpromptuModular/%.cpp.o: ImpromptuModular/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<" @echo "Compiling $<"


+ 1
- 1
src/Makefile View File

@@ -178,7 +178,7 @@ $(BUILD_DIR)/%.cpp.o: %.cpp
@echo "Compiling $<" @echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@


$(BUILD_DIR)/Core/%.cpp.o: Core/%.cpp
$(BUILD_DIR)/Rack/src/core/%.cpp.o: Rack/src/core/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<" @echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -UPRIVATE -c -o $@ $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -UPRIVATE -c -o $@


Loading…
Cancel
Save