@@ -514,25 +514,25 @@ $(DGL_BUILD_DIR)/libdgl-vulkan.a: $(DGL_POSSIBLE_DEPS)
514514
515515# ---------------------------------------------------------------------------------------------------------------------
516516
517- $(BUILD_DIR ) /DistrhoPluginMain_% .cpp.o : $(DPF_PATH ) /distrho/DistrhoPluginMain.cpp $(EXTRA_DEPENDENCIES ) $(EXTRA_DSP_DEPENDENCIES )
517+ $(BUILD_DIR ) /DistrhoPluginMain_% _single_obj .cpp.o : $(DPF_PATH ) /distrho/DistrhoPluginMain.cpp $(EXTRA_DEPENDENCIES ) $(EXTRA_DSP_DEPENDENCIES )
518518 -@mkdir -p $(BUILD_DIR )
519519 @echo " Compiling DistrhoPluginMain.cpp ($* )"
520- $(SILENT )$(CXX ) $< $(BUILD_CXX_FLAGS ) -DDISTRHO_PLUGIN_TARGET_$* -c -o $@
520+ $(SILENT )$(CXX ) $< $(BUILD_CXX_FLAGS ) -DDISTRHO_PLUGIN_TARGET_$* -DDISTRHO_PLUGIN_AND_UI_IN_SINGLE_OBJECT=1 - c -o $@
521521
522- $(BUILD_DIR ) /DistrhoUIMain_ % .cpp.o : $(DPF_PATH ) /distrho/DistrhoUIMain .cpp $(EXTRA_DEPENDENCIES ) $(EXTRA_UI_DEPENDENCIES )
522+ $(BUILD_DIR ) /DistrhoPluginMain_ % .cpp.o : $(DPF_PATH ) /distrho/DistrhoPluginMain .cpp $(EXTRA_DEPENDENCIES ) $(EXTRA_DSP_DEPENDENCIES )
523523 -@mkdir -p $(BUILD_DIR )
524- @echo " Compiling DistrhoUIMain .cpp ($* )"
524+ @echo " Compiling DistrhoPluginMain .cpp ($* )"
525525 $(SILENT )$(CXX ) $< $(BUILD_CXX_FLAGS ) -DDISTRHO_PLUGIN_TARGET_$* -c -o $@
526526
527- $(BUILD_DIR ) /DistrhoPluginMain_ % _single_obj.cpp.o : $(DPF_PATH ) /distrho/DistrhoPluginMain .cpp $(EXTRA_DEPENDENCIES ) $(EXTRA_DSP_DEPENDENCIES )
527+ $(BUILD_DIR ) /DistrhoUIMain_ % _single_obj.cpp.o : $(DPF_PATH ) /distrho/DistrhoUIMain .cpp $(EXTRA_DEPENDENCIES ) $(EXTRA_UI_DEPENDENCIES )
528528 -@mkdir -p $(BUILD_DIR )
529- @echo " Compiling DistrhoPluginMain .cpp ($* )"
529+ @echo " Compiling DistrhoUIMain .cpp ($* )"
530530 $(SILENT )$(CXX ) $< $(BUILD_CXX_FLAGS ) -DDISTRHO_PLUGIN_TARGET_$* -DDISTRHO_PLUGIN_AND_UI_IN_SINGLE_OBJECT=1 -c -o $@
531531
532- $(BUILD_DIR ) /DistrhoUIMain_% _single_obj .cpp.o : $(DPF_PATH ) /distrho/DistrhoUIMain.cpp $(EXTRA_DEPENDENCIES ) $(EXTRA_UI_DEPENDENCIES )
532+ $(BUILD_DIR ) /DistrhoUIMain_% .cpp.o : $(DPF_PATH ) /distrho/DistrhoUIMain.cpp $(EXTRA_DEPENDENCIES ) $(EXTRA_UI_DEPENDENCIES )
533533 -@mkdir -p $(BUILD_DIR )
534534 @echo " Compiling DistrhoUIMain.cpp ($* )"
535- $(SILENT )$(CXX ) $< $(BUILD_CXX_FLAGS ) -DDISTRHO_PLUGIN_TARGET_$* -DDISTRHO_PLUGIN_AND_UI_IN_SINGLE_OBJECT=1 - c -o $@
535+ $(SILENT )$(CXX ) $< $(BUILD_CXX_FLAGS ) -DDISTRHO_PLUGIN_TARGET_$* -c -o $@
536536
537537$(BUILD_DIR ) /DistrhoUI_macOS_% .mm.o : $(DPF_PATH ) /distrho/DistrhoUI_macOS.mm $(EXTRA_DEPENDENCIES ) $(EXTRA_UI_DEPENDENCIES )
538538 -@mkdir -p $(BUILD_DIR )
@@ -544,10 +544,10 @@ $(BUILD_DIR)/DistrhoUI_win32.cpp.o: $(DPF_PATH)/distrho/DistrhoUI_win32.cpp $(EX
544544 @echo " Compiling DistrhoUI_win32.cpp ($* )"
545545 $(SILENT )$(CXX ) $< $(BUILD_CXX_FLAGS ) -std=gnu++17 -c -o $@
546546
547- $(BUILD_DIR ) /DistrhoPluginMain_JACK.cpp.o : BUILD_CXX_FLAGS += $(JACK_FLAGS )
548-
549547$(BUILD_DIR ) /DistrhoPluginMain_AU.cpp.o : BUILD_CXX_FLAGS += -ObjC++
550548
549+ $(BUILD_DIR ) /DistrhoPluginMain_JACK.cpp.o : BUILD_CXX_FLAGS += $(JACK_FLAGS )
550+
551551$(BUILD_DIR ) /DistrhoUIMain_AU.cpp.o : BUILD_CXX_FLAGS += -ObjC++
552552
553553$(BUILD_DIR ) /DistrhoUIMain_DSSI.cpp.o : BUILD_CXX_FLAGS += $(LIBLO_FLAGS )
0 commit comments