From e4b8981b8f6566dbb124ce1e8a9da9a67813930e Mon Sep 17 00:00:00 2001 From: falkTX Date: Mon, 20 Jul 2020 02:02:32 +0100 Subject: [PATCH] Dont try to build C++ frontend code, we will not use it after all Signed-off-by: falkTX --- source/frontend/Makefile | 212 +-------------------------------------- 1 file changed, 3 insertions(+), 209 deletions(-) diff --git a/source/frontend/Makefile b/source/frontend/Makefile index 73da112f9..a3a24077e 100644 --- a/source/frontend/Makefile +++ b/source/frontend/Makefile @@ -9,33 +9,12 @@ include $(CWD)/Makefile.mk # --------------------------------------------------------------------------------------------------------------------- -BINDIR := $(CWD)/../bin -RESDIR := $(CWD)/../resources - -ifeq ($(DEBUG),true) -OBJDIR := $(CWD)/../build/frontend/Debug -MODULEDIR := $(CWD)/../build/modules/Debug -else -OBJDIR := $(CWD)/../build/frontend/Release -MODULEDIR := $(CWD)/../build/modules/Release -endif - -# --------------------------------------------------------------------------------------------------------------------- - -BUILD_CXX_FLAGS += -I. -I$(CWD) -I$(CWD)/backend -I$(CWD)/includes -I$(CWD)/modules -I$(CWD)/utils -BUILD_CXX_FLAGS += -DCARLA_SKIP_HOST_COMMON -BUILD_CXX_FLAGS += -Wno-unused-parameter -BUILD_CXX_FLAGS += -Wno-unused-variable -BUILD_CXX_FLAGS += $(FLUIDSYNTH_FLAGS) -BUILD_CXX_FLAGS += $(QT5_FLAGS) +BINDIR := $(CWD)/../bin +RESDIR := $(CWD)/../resources # --------------------------------------------------------------------------------------------------------------------- # Resources -ifeq ($(CPPMODE),true) -RES = \ - resources_rc.cpp -else RES = \ resources_rc.py \ $(BINDIR)/resources/modgui \ @@ -78,7 +57,6 @@ RES = \ $(BINDIR)/resources/ui_carla_settings_driver.py \ $(BINDIR)/resources/ui_inputdialog_value.py \ $(BINDIR)/resources/ui_midipattern.py -endif ifneq ($(SKIP_ZYN_SYNTH),true) ifeq ($(HAVE_ZYN_UI_DEPS),true) @@ -91,27 +69,6 @@ endif # --------------------------------------------------------------------------------------------------------------------- # UI code -ifeq ($(CPPMODE),true) -UIs = \ - ui_carla_about.hpp \ - ui_carla_about_juce.hpp \ - ui_carla_add_jack.hpp \ - ui_carla_database.hpp \ - ui_carla_edit.hpp \ - ui_carla_host.hpp \ - ui_carla_osc_connect.hpp \ - ui_carla_parameter.hpp \ - ui_carla_plugin_calf.hpp \ - ui_carla_plugin_classic.hpp \ - ui_carla_plugin_compact.hpp \ - ui_carla_plugin_default.hpp \ - ui_carla_plugin_presets.hpp \ - ui_carla_refresh.hpp \ - ui_carla_settings.hpp \ - ui_carla_settings_driver.hpp \ - ui_inputdialog_value.hpp \ - ui_midipattern.hpp -else UIs = \ ui_carla_about.py \ ui_carla_about_juce.py \ @@ -131,150 +88,16 @@ UIs = \ ui_carla_settings_driver.py \ ui_inputdialog_value.py \ ui_midipattern.py -endif # --------------------------------------------------------------------------------------------------------------------- -LIBS = $(MODULEDIR)/carla_engine.a -LIBS += $(MODULEDIR)/carla_plugin.a -LIBS += $(MODULEDIR)/jackbridge.a - -LIBS += $(MODULEDIR)/audio_decoder.a -LIBS += $(MODULEDIR)/lilv.a -LIBS += $(MODULEDIR)/native-plugins.a -LIBS += $(MODULEDIR)/rtmempool.a -LIBS += $(MODULEDIR)/sfzero.a -LIBS += $(MODULEDIR)/water.a - -ifeq ($(HAVE_DGL),true) -LIBS += $(MODULEDIR)/dgl.a -endif - -ifeq ($(HAVE_HYLIA),true) -LIBS += $(MODULEDIR)/hylia.a -endif - -ifeq ($(USING_JUCE),true) -LIBS += $(MODULEDIR)/juce_audio_basics.a -ifeq ($(USING_JUCE_AUDIO_DEVICES),true) -LIBS += $(MODULEDIR)/juce_audio_devices.a -endif -LIBS += $(MODULEDIR)/juce_audio_processors.a -LIBS += $(MODULEDIR)/juce_core.a -LIBS += $(MODULEDIR)/juce_data_structures.a -LIBS += $(MODULEDIR)/juce_events.a -LIBS += $(MODULEDIR)/juce_graphics.a -LIBS += $(MODULEDIR)/juce_gui_basics.a -ifeq ($(USING_JUCE_GUI_EXTRA),true) -LIBS += $(MODULEDIR)/juce_gui_extra.a -endif -endif - -ifneq ($(USING_JUCE_AUDIO_DEVICES),true) -LIBS += $(MODULEDIR)/rtaudio.a -LIBS += $(MODULEDIR)/rtmidi.a -endif +all: $(RES) $(UIs) # --------------------------------------------------------------------------------------------------------------------- -LINK_FLAGS += $(QT5_LIBS) -LINK_FLAGS += $(HYLIA_LIBS) -LINK_FLAGS += $(JACKBRIDGE_LIBS) -LINK_FLAGS += $(LILV_LIBS) -LINK_FLAGS += $(NATIVE_PLUGINS_LIBS) -LINK_FLAGS += $(RTMEMPOOL_LIBS) -LINK_FLAGS += $(WATER_LIBS) - -LINK_FLAGS += $(LIBLO_LIBS) -LINK_FLAGS += $(MAGIC_LIBS) -LINK_FLAGS += $(FLUIDSYNTH_LIBS) -LINK_FLAGS += $(X11_LIBS) - -ifeq ($(USING_JUCE),true) -LINK_FLAGS += $(JUCE_AUDIO_BASICS_LIBS) -ifeq ($(USING_JUCE_AUDIO_DEVICES),true) -LINK_FLAGS += $(JUCE_AUDIO_DEVICES_LIBS) -endif -LINK_FLAGS += $(JUCE_AUDIO_PROCESSORS_LIBS) -LINK_FLAGS += $(JUCE_CORE_LIBS) -LINK_FLAGS += $(JUCE_DATA_STRUCTURES_LIBS) -LINK_FLAGS += $(JUCE_EVENTS_LIBS) -LINK_FLAGS += $(JUCE_GRAPHICS_LIBS) -LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS) -ifeq ($(USING_JUCE_GUI_EXTRA),true) -LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS) -endif -endif - -ifneq ($(USING_JUCE_AUDIO_DEVICES),true) -LINK_FLAGS += $(RTAUDIO_LIBS) -LINK_FLAGS += $(RTMIDI_LIBS) -endif - -ifeq ($(JACKBRIDGE_DIRECT),true) -LINK_FLAGS += $(JACK_LIBS) -endif - -# --------------------------------------------------------------------------------------------------------------------- - -OBJS = \ - $(OBJDIR)/carla_app.cpp.o \ - $(OBJDIR)/carla_database.cpp.o \ - $(OBJDIR)/carla_host.cpp.o \ - $(OBJDIR)/carla_settings.cpp.o \ - $(OBJDIR)/carla_skin.cpp.o \ - $(OBJDIR)/carla_shared.cpp.o \ - $(OBJDIR)/carla_widgets.cpp.o \ - $(OBJDIR)/patchcanvas/theme.cpp.o \ - $(OBJDIR)/moc_carla_database.cpp.o \ - $(OBJDIR)/moc_carla_host.cpp.o \ - $(OBJDIR)/moc_carla_settings.cpp.o \ - $(OBJDIR)/moc_carla_widgets.cpp.o \ - $(OBJDIR)/resources_rc.cpp.o \ - $(OBJDIR)/CarlaStandalone.cpp.o \ - $(OBJDIR)/CarlaStandaloneNSM.cpp.o \ - $(OBJDIR)/Information.cpp.o - -# --------------------------------------------------------------------------------------------------------------------- - -TARGETS = $(RES) $(UIs) - -ifeq ($(CPPMODE),true) -TARGETS += $(BINDIR)/carla -TARGETS += $(BINDIR)/carla-database -TARGETS += $(BINDIR)/carla-settings -endif - -# --------------------------------------------------------------------------------------------------------------------- - -all: $(TARGETS) - -# --------------------------------------------------------------------------------------------------------------------- - -$(BINDIR)/carla: $(OBJS) $(OBJDIR)/carla.cpp.o - -@mkdir -p $(BINDIR) - @echo "Linking carla" - $(CXX) $^ $(LIBS_START) $(LIBS) $(LIBS_END) $(LINK_FLAGS) -o $@ - -$(BINDIR)/carla-%: $(OBJS) $(OBJDIR)/carla_%_app.cpp.o - -@mkdir -p $(BINDIR) - @echo "Linking carla_$*" - $(CXX) $^ $(LIBS_START) $(LIBS) $(LIBS_END) $(LINK_FLAGS) -o $@ - -# --------------------------------------------------------------------------------------------------------------------- - -moc_%.cpp: %.hpp - $(MOC_QT5) $< -o $@ - -ui_%.hpp: $(RESDIR)/ui/%.ui - $(UIC_QT5) $< -o $@ - ui_%.py: $(RESDIR)/ui/%.ui $(PYUIC) $< -o $@ -resources_rc.cpp: $(RESDIR)/resources.qrc $(RESDIR)/*/*.png $(RESDIR)/*/*.svg $(RESDIR)/*/*.svgz - $(RCC_QT5) $< -o $@ - resources_rc.py: $(RESDIR)/resources.qrc $(RESDIR)/*/*.png $(RESDIR)/*/*.svg $(RESDIR)/*/*.svgz $(PYRCC) $< -o $@ @@ -292,28 +115,6 @@ $(BINDIR)/resources/zynaddsubfx-ui: ../native-plugins/resources/zynaddsubfx-ui # --------------------------------------------------------------------------------------------------------------------- -$(OBJDIR)/%.cpp.o: %.cpp $(UIs) - -@mkdir -p $(OBJDIR)/patchcanvas - @echo "Compiling $<" - $(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ - -$(OBJDIR)/Information.cpp.o: $(CWD)/backend/utils/Information.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling $<" - $(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ - -$(OBJDIR)/CarlaStandalone.cpp.o: $(CWD)/backend/CarlaStandalone.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling $<" - $(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ - -$(OBJDIR)/CarlaStandaloneNSM.cpp.o: $(CWD)/backend/CarlaStandaloneNSM.cpp - -@mkdir -p $(OBJDIR) - @echo "Compiling $<" - $(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ - -# --------------------------------------------------------------------------------------------------------------------- - clean: rm -rf $(UIs) $(RES) __pycache__ *.pyc @@ -321,10 +122,3 @@ debug: $(MAKE) DEBUG=true # --------------------------------------------------------------------------------------------------------------------- - --include $(OBJS:%.o=%.d) --include $(OBJDIR)/carla.cpp.d --include $(OBJDIR)/carla_database_app.cpp.d --include $(OBJDIR)/carla_settings_app.cpp.d - -# ---------------------------------------------------------------------------------------------------------------------