From d459252956b36ae8c44b5f5619917fcdfd95753b Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 9 Oct 2022 14:40:40 +0100 Subject: [PATCH] Prepare makefile for reorganize changes --- Makefile | 4 ++++ source/frontend/Makefile | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e1b96c0e9..8a3c501d5 100644 --- a/Makefile +++ b/Makefile @@ -622,6 +622,10 @@ endif source/frontend/modgui/*.py \ $(DESTDIR)$(DATADIR)/carla/modgui/ + install -m 644 \ + source/frontend/pluginlist/*.py \ + $(DESTDIR)$(DATADIR)/carla/pluginlist/ + install -m 644 \ source/frontend/patchcanvas/*.py \ $(DESTDIR)$(DATADIR)/carla/patchcanvas/ diff --git a/source/frontend/Makefile b/source/frontend/Makefile index 543a663bd..5a67cdc26 100644 --- a/source/frontend/Makefile +++ b/source/frontend/Makefile @@ -15,7 +15,7 @@ RESDIR := $(CWD)/../resources # --------------------------------------------------------------------------------------------------------------------- ifeq ($(WINDOWS),true) -QT5_LINK_FLAGS = $(shell echo $(LINK_FLAGS) | awk 'sub(" -static","")') -static-libgcc +QT5_LINK_FLAGS = $(shell echo $(LINK_FLAGS) | awk 'sub(" -static","")') else QT5_LINK_FLAGS = $(LINK_FLAGS) endif @@ -28,6 +28,8 @@ else ifeq ($(HAVE_QT5PKG),true) QT5_PREFIX = $(shell pkg-config --variable=prefix Qt5OpenGLExtensions) BUILD_CXX_FLAGS += -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB -I $(QT5_PREFIX)/include/qt5 QT5_LINK_FLAGS += -Wl,-rpath,$(QT5_PREFIX)/lib -F $(QT5_PREFIX)/lib -framework QtCore -framework QtGui -framework QtWidgets +else +$(error Trying to build frontend without Qt5, cannot continue) endif # --------------------------------------------------------------------------------------------------------------------- @@ -159,7 +161,7 @@ debug: # --------------------------------------------------------------------------------------------------------------------- -tests: +tests: pluginlist/jackappdialog$(APP_EXT) # $(UI_FILES:%.ui=%$(APP_EXT)) pluginlist/jackappdialog$(APP_EXT): pluginlist/jackappdialog.cpp pluginlist/jackappdialog.ui pluginlist/jackappdialog_ui.hpp