Browse Source

Prepare makefile for reorganize changes

pull/1689/head
falkTX 2 years ago
parent
commit
d459252956
2 changed files with 8 additions and 2 deletions
  1. +4
    -0
      Makefile
  2. +4
    -2
      source/frontend/Makefile

+ 4
- 0
Makefile View File

@@ -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/


+ 4
- 2
source/frontend/Makefile View File

@@ -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


Loading…
Cancel
Save