Browse Source

Fix STATIC_PLUGIN_TARGET build

Signed-off-by: falkTX <falktx@falktx.com>
pull/1975/merge
falkTX 2 months ago
parent
commit
034d0c4242
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 14 additions and 0 deletions
  1. +12
    -0
      source/frontend/Makefile
  2. +2
    -0
      source/frontend/dialogs/aboutdialog.cpp

+ 12
- 0
source/frontend/Makefile View File

@@ -34,12 +34,24 @@ else
NON_STATIC_LINK_FLAGS = $(LINK_FLAGS) NON_STATIC_LINK_FLAGS = $(LINK_FLAGS)
endif endif


ifeq ($(STATIC_PLUGIN_TARGET),true)

ifeq ($(WINDOWS),true)
QT_LINK_FLAGS += -L$(BINDIR) $(BINDIR)/libcarla_utils.dll
else
QT_LINK_FLAGS += -L$(BINDIR) -lcarla_utils
endif

else

ifeq ($(WINDOWS),true) ifeq ($(WINDOWS),true)
QT_LINK_FLAGS += -L$(BINDIR) $(BINDIR)/libcarla_standalone2.dll $(BINDIR)/libcarla_utils.dll QT_LINK_FLAGS += -L$(BINDIR) $(BINDIR)/libcarla_standalone2.dll $(BINDIR)/libcarla_utils.dll
else else
QT_LINK_FLAGS += -L$(BINDIR) -lcarla_standalone2 -lcarla_utils QT_LINK_FLAGS += -L$(BINDIR) -lcarla_standalone2 -lcarla_utils
endif endif


endif

ifeq ($(MACOS),true) ifeq ($(MACOS),true)
QT_LINK_FLAGS += -install_name @rpath/libcarla_frontend.dylib QT_LINK_FLAGS += -install_name @rpath/libcarla_frontend.dylib
# FIXME this does not work: -Wl,-rpath,@loader_path # FIXME this does not work: -Wl,-rpath,@loader_path


+ 2
- 0
source/frontend/dialogs/aboutdialog.cpp View File

@@ -42,11 +42,13 @@ AboutDialog::AboutDialog(QWidget* const parent,
ui.tabWidget->removeTab(3); ui.tabWidget->removeTab(3);
ui.tabWidget->removeTab(2); ui.tabWidget->removeTab(2);
} }
#ifndef STATIC_PLUGIN_TARGET
else if (carla_is_engine_running(hostHandle)) else if (carla_is_engine_running(hostHandle))
{ {
ui.le_osc_url_tcp->setText(carla_get_host_osc_url_tcp(hostHandle)); ui.le_osc_url_tcp->setText(carla_get_host_osc_url_tcp(hostHandle));
ui.le_osc_url_udp->setText(carla_get_host_osc_url_udp(hostHandle)); ui.le_osc_url_udp->setText(carla_get_host_osc_url_udp(hostHandle));
} }
#endif
else else
{ {
ui.le_osc_url_tcp->setText(tr("(Engine not running)")); ui.le_osc_url_tcp->setText(tr("(Engine not running)"));


Loading…
Cancel
Save