falkTX
/
Carla
mirror of https://github.com/falkTX/Carla
1
0
Fork 0
Code Releases 43 Activity
Browse Source

Fix build

tags/1.9.4
falkTX 12 years ago
parent
6d8c1b894f
commit
4c37d77524
8 changed files with 139 additions and 170 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +16
    -16
      source/bridges/CarlaBridgeClient.cpp
  2. +1
    -1
      source/bridges/CarlaBridgeClient.hpp
  3. +27
    -27
      source/bridges/CarlaBridgeToolkitGtk.cpp
  4. +20
    -20
      source/bridges/CarlaBridgeToolkitQt.cpp
  5. +13
    -17
      source/bridges/CarlaBridgeUI-LV2.cpp
  6. +10
    -14
      source/bridges/CarlaBridgeUI-VST.cpp
  7. +50
    -64
      source/bridges/Makefile
  8. +2
    -11
      source/discovery/Makefile

+ 16
- 16
source/bridges/CarlaBridgeClient.cpp View File

@@ -279,31 +279,31 @@ void CarlaBridgeClient::sendOscLv2TransferEvent(const int32_t portIndex, const c
#ifdef BUILD_BRIDGE_UI
void* CarlaBridgeClient::getContainerId()
{
return kToolkit->getContainerId();
return kUiToolkit->getContainerId();
}

bool CarlaBridgeClient::uiLibOpen(const char* const filename)
{
CARLA_ASSERT(fLib == nullptr);
CARLA_ASSERT(filename != nullptr);
CARLA_ASSERT(fUiLib == nullptr);
CARLA_ASSERT(fUiFilename != nullptr);

if (fFilename != nullptr)
delete[] fFilename;
if (fUiFilename != nullptr)
delete[] fUiFilename;

fLib = lib_open(filename);
fFilename = carla_strdup(filename ? filename : "");
fUiLib = lib_open(filename);
fUiFilename = carla_strdup(filename ? filename : "");

return (fLib != nullptr);
return (fUiLib != nullptr);
}

bool CarlaBridgeClient::uiLibClose()
{
CARLA_ASSERT(fLib != nullptr);
CARLA_ASSERT(fUiLib != nullptr);

if (fLib != nullptr)
if (fUiLib != nullptr)
{
const bool closed = lib_close(fLib);
fLib = nullptr;
const bool closed = lib_close(fUiLib);
fUiLib = nullptr;
return closed;
}

@@ -312,17 +312,17 @@ bool CarlaBridgeClient::uiLibClose()

void* CarlaBridgeClient::uiLibSymbol(const char* const symbol)
{
CARLA_ASSERT(fLib != nullptr);
CARLA_ASSERT(fUiLib != nullptr);

if (fLib != nullptr)
return lib_symbol(fLib, symbol);
if (fUiLib != nullptr)
return lib_symbol(fUiLib, symbol);

return nullptr;
}

const char* CarlaBridgeClient::uiLibError()
{
return lib_error(fFilename);
return lib_error(fUiFilename);
}
#endif



+ 1
- 1
source/bridges/CarlaBridgeClient.hpp View File

@@ -137,7 +137,7 @@ private:
#ifdef BUILD_BRIDGE_UI
CarlaBridgeToolkit* const kUiToolkit;

char* fUiFilename;
const char* fUiFilename;
void* fUiLib;
bool fUiQuit;
#endif


+ 27
- 27
source/bridges/CarlaBridgeToolkitGtk.cpp View File

@@ -15,8 +15,8 @@
* For a full copy of the GNU General Public License see the GPL.txt file
*/

#include "carla_bridge_client.hpp"
#include "carla_bridge_toolkit.hpp"
#include "CarlaBridgeClient.hpp"
#include "CarlaBridgeToolkit.hpp"

#if defined(BRIDGE_COCOA) || defined(BRIDGE_HWND) || defined(BRIDGE_X11)
# error Embed UI uses Qt
@@ -49,7 +49,7 @@ public:
: CarlaBridgeToolkit(client, uiTitle),
settings("Cadence", appName)
{
qDebug("CarlaToolkitGtk::CarlaToolkitGtk(%p, \"%s\")", client, uiTitle);
carla_debug("CarlaToolkitGtk::CarlaToolkitGtk(%p, \"%s\")", client, uiTitle);

window = nullptr;

@@ -61,7 +61,7 @@ public:

~CarlaToolkitGtk()
{
qDebug("CarlaToolkitGtk::~CarlaToolkitGtk()");
carla_debug("CarlaToolkitGtk::~CarlaToolkitGtk()");

if (window)
gtk_widget_destroy(window);
@@ -69,7 +69,7 @@ public:

void init()
{
qDebug("CarlaToolkitGtk::init()");
carla_debug("CarlaToolkitGtk::init()");
CARLA_ASSERT(! window);

gtk_init(&gargc, &gargv);
@@ -81,35 +81,35 @@ public:

void exec(const bool showGui)
{
qDebug("CarlaToolkitGtk::exec(%s)", bool2str(showGui));
carla_debug("CarlaToolkitGtk::exec(%s)", bool2str(showGui));
CARLA_ASSERT(window);
CARLA_ASSERT(client);
CARLA_ASSERT(kClient);

GtkWidget* const widget = (GtkWidget*)client->getWidget();
GtkWidget* const widget = (GtkWidget*)kClient->getWidget();

gtk_container_add(GTK_CONTAINER(window), widget);

gtk_window_set_resizable(GTK_WINDOW(window), client->isResizable());
gtk_window_set_title(GTK_WINDOW(window), uiTitle);
gtk_window_set_resizable(GTK_WINDOW(window), kClient->isResizable());
gtk_window_set_title(GTK_WINDOW(window), kUiTitle);

if (settings.contains(QString("%1/pos_x").arg(uiTitle)))
if (settings.contains(QString("%1/pos_x").arg(kUiTitle)))
{
gtk_window_get_position(GTK_WINDOW(window), &lastX, &lastY);

bool hasX, hasY;
lastX = settings.value(QString("%1/pos_x").arg(uiTitle), lastX).toInt(&hasX);
lastY = settings.value(QString("%1/pos_y").arg(uiTitle), lastY).toInt(&hasY);
lastX = settings.value(QString("%1/pos_x").arg(kUiTitle), lastX).toInt(&hasX);
lastY = settings.value(QString("%1/pos_y").arg(kUiTitle), lastY).toInt(&hasY);

if (hasX && hasY)
gtk_window_move(GTK_WINDOW(window), lastX, lastY);

if (client->isResizable())
if (kClient->isResizable())
{
gtk_window_get_size(GTK_WINDOW(window), &lastWidth, &lastHeight);

bool hasWidth, hasHeight;
lastWidth = settings.value(QString("%1/width").arg(uiTitle), lastWidth).toInt(&hasWidth);
lastHeight = settings.value(QString("%1/height").arg(uiTitle), lastHeight).toInt(&hasHeight);
lastWidth = settings.value(QString("%1/width").arg(kUiTitle), lastWidth).toInt(&hasWidth);
lastHeight = settings.value(QString("%1/height").arg(kUiTitle), lastHeight).toInt(&hasHeight);

if (hasWidth && hasHeight)
gtk_window_resize(GTK_WINDOW(window), lastWidth, lastHeight);
@@ -119,7 +119,7 @@ public:
if (showGui)
show();
else
client->sendOscUpdate();
kClient->sendOscUpdate();

// Timer
g_timeout_add(50, gtk_ui_timeout, this);
@@ -134,7 +134,7 @@ public:

void quit()
{
qDebug("CarlaToolkitGtk::quit()");
carla_debug("CarlaToolkitGtk::quit()");

if (window)
{
@@ -147,7 +147,7 @@ public:

void show()
{
qDebug("CarlaToolkitGtk::show()");
carla_debug("CarlaToolkitGtk::show()");
CARLA_ASSERT(window);

if (window)
@@ -156,7 +156,7 @@ public:

void hide()
{
qDebug("CarlaToolkitGtk::hide()");
carla_debug("CarlaToolkitGtk::hide()");
CARLA_ASSERT(window);

if (window)
@@ -171,7 +171,7 @@ public:

void resize(int width, int height)
{
qDebug("CarlaToolkitGtk::resize(%i, %i)", width, height);
carla_debug("CarlaToolkitGtk::resize(%i, %i)", width, height);
CARLA_ASSERT(window);

if (window)
@@ -188,14 +188,14 @@ protected:

void handleDestroy()
{
qDebug("CarlaToolkitGtk::handleDestroy()");
carla_debug("CarlaToolkitGtk::handleDestroy()");

window = nullptr;

settings.setValue(QString("%1/pos_x").arg(uiTitle), lastX);
settings.setValue(QString("%1/pos_y").arg(uiTitle), lastY);
settings.setValue(QString("%1/width").arg(uiTitle), lastWidth);
settings.setValue(QString("%1/height").arg(uiTitle), lastHeight);
settings.setValue(QString("%1/pos_x").arg(kUiTitle), lastX);
settings.setValue(QString("%1/pos_y").arg(kUiTitle), lastY);
settings.setValue(QString("%1/width").arg(kUiTitle), lastWidth);
settings.setValue(QString("%1/height").arg(kUiTitle), lastHeight);
settings.sync();
}

@@ -208,7 +208,7 @@ protected:
}

// FIXME?
return client->isOscControlRegistered() ? client->oscIdle() : false;
return kClient->isOscControlRegistered() ? kClient->oscIdle() : false;
}

// ---------------------------------------------------------------------


+ 20
- 20
source/bridges/CarlaBridgeToolkitQt.cpp View File

@@ -15,8 +15,8 @@
* For a full copy of the GNU General Public License see the GPL.txt file
*/

#include "carla_bridge_client.hpp"
#include "carla_bridge_toolkit.hpp"
#include "CarlaBridgeClient.hpp"
#include "CarlaBridgeToolkit.hpp"

#include <QtCore/QSettings>
#include <QtCore/QThread>
@@ -120,10 +120,10 @@ public:
qDebug("CarlaBridgeToolkitQt::exec(%s)", bool2str(showGui));
CARLA_ASSERT(app);
CARLA_ASSERT(window);
CARLA_ASSERT(client);
CARLA_ASSERT(kClient);

#if defined(BRIDGE_QT4) || defined(BRIDGE_QT5)
QWidget* const widget = (QWidget*)client->getWidget();
QWidget* const widget = (QWidget*)kClient->getWidget();

window->setCentralWidget(widget);
window->adjustSize();
@@ -132,7 +132,7 @@ public:
widget->show();
#endif

if (! client->isResizable())
if (! kClient->isResizable())
{
window->setFixedSize(window->width(), window->height());
#ifdef Q_OS_WIN
@@ -140,22 +140,22 @@ public:
#endif
}

window->setWindowTitle(uiTitle);
window->setWindowTitle(kUiTitle);

if (settings.contains(QString("%1/pos_x").arg(uiTitle)))
if (settings.contains(QString("%1/pos_x").arg(kUiTitle)))
{
bool hasX, hasY;
int posX = settings.value(QString("%1/pos_x").arg(uiTitle), window->x()).toInt(&hasX);
int posY = settings.value(QString("%1/pos_y").arg(uiTitle), window->y()).toInt(&hasY);
int posX = settings.value(QString("%1/pos_x").arg(kUiTitle), window->x()).toInt(&hasX);
int posY = settings.value(QString("%1/pos_y").arg(kUiTitle), window->y()).toInt(&hasY);

if (hasX && hasY)
window->move(posX, posY);

if (client->isResizable())
if (kClient->isResizable())
{
bool hasWidth, hasHeight;
int width = settings.value(QString("%1/width").arg(uiTitle), window->width()).toInt(&hasWidth);
int height = settings.value(QString("%1/height").arg(uiTitle), window->height()).toInt(&hasHeight);
int width = settings.value(QString("%1/width").arg(kUiTitle), window->width()).toInt(&hasWidth);
int height = settings.value(QString("%1/height").arg(kUiTitle), window->height()).toInt(&hasHeight);

if (hasWidth && hasHeight)
window->resize(width, height);
@@ -165,7 +165,7 @@ public:
if (showGui)
show();
else
client->sendOscUpdate();
kClient->sendOscUpdate();

// Timer
msgTimer = startTimer(50);
@@ -190,10 +190,10 @@ public:

if (window)
{
settings.setValue(QString("%1/pos_x").arg(uiTitle), window->x());
settings.setValue(QString("%1/pos_y").arg(uiTitle), window->y());
settings.setValue(QString("%1/width").arg(uiTitle), window->width());
settings.setValue(QString("%1/height").arg(uiTitle), window->height());
settings.setValue(QString("%1/pos_x").arg(kUiTitle), window->x());
settings.setValue(QString("%1/pos_y").arg(kUiTitle), window->y());
settings.setValue(QString("%1/width").arg(kUiTitle), window->width());
settings.setValue(QString("%1/height").arg(kUiTitle), window->height());
settings.sync();

window->close();
@@ -298,16 +298,16 @@ protected:

void handleTimeout()
{
if (! client)
if (! kClient)
return;

if (needsResize)
{
client->toolkitResize(nextWidth, nextHeight);
kClient->toolkitResize(nextWidth, nextHeight);
needsResize = false;
}

if (client->isOscControlRegistered() && ! client->oscIdle())
if (kClient->isOscControlRegistered() && ! kClient->oscIdle())
{
killTimer(msgTimer);
msgTimer = 0;


+ 13
- 17
source/bridges/CarlaBridgeUI-LV2.cpp View File

@@ -17,7 +17,7 @@

#ifdef BRIDGE_LV2

#include "carla_bridge_client.hpp"
#include "CarlaBridgeClient.hpp"
#include "CarlaLv2Utils.hpp"
#include "CarlaMIDI.h"

@@ -328,12 +328,12 @@ public:
// ---------------------------------------------------------------------
// ui initialization

bool init(const char* pluginURI, const char* uiURI)
bool uiInit(const char* pluginURI, const char* uiURI)
{
// -----------------------------------------------------------------
// init

CarlaBridgeClient::init(pluginURI, uiURI);
CarlaBridgeClient::uiInit(pluginURI, uiURI);

// -----------------------------------------------------------------
// get plugin from lv2_rdf (lilv)
@@ -428,9 +428,9 @@ public:
return true;
}

void close()
void uiClose()
{
CarlaBridgeClient::close();
CarlaBridgeClient::uiClose();

if (handle && descriptor && descriptor->cleanup)
descriptor->cleanup(handle);
@@ -1017,7 +1017,7 @@ int CarlaBridgeOsc::handleMsgLv2TransferAtom(CARLA_BRIDGE_OSC_HANDLE_ARGS)
qDebug("CarlaBridgeOsc::handleMsgLv2TransferAtom()");
CARLA_BRIDGE_OSC_CHECK_OSC_TYPES(3, "iss");

if (! client)
if (! kClient)
return 1;

const int32_t portIndex = argv[0]->i;
@@ -1028,7 +1028,7 @@ int CarlaBridgeOsc::handleMsgLv2TransferAtom(CARLA_BRIDGE_OSC_HANDLE_ARGS)
chunk = QByteArray::fromBase64(atomBuf);

LV2_Atom* const atom = (LV2_Atom*)chunk.constData();
CarlaLv2Client* const lv2Client = (CarlaLv2Client*)client;
CarlaLv2Client* const lv2Client = (CarlaLv2Client*)kClient;

atom->type = lv2Client->getCustomURID(typeStr);
lv2Client->handleTransferAtom(portIndex, atom);
@@ -1041,7 +1041,7 @@ int CarlaBridgeOsc::handleMsgLv2TransferEvent(CARLA_BRIDGE_OSC_HANDLE_ARGS)
qDebug("CarlaBridgeOsc::handleMsgLv2TransferEvent()");
CARLA_BRIDGE_OSC_CHECK_OSC_TYPES(3, "iss");

if (! client)
if (! kClient)
return 1;

const int32_t portIndex = argv[0]->i;
@@ -1052,7 +1052,7 @@ int CarlaBridgeOsc::handleMsgLv2TransferEvent(CARLA_BRIDGE_OSC_HANDLE_ARGS)
chunk = QByteArray::fromBase64(atomBuf);

LV2_Atom* const atom = (LV2_Atom*)chunk.constData();
CarlaLv2Client* const lv2Client = (CarlaLv2Client*)client;
CarlaLv2Client* const lv2Client = (CarlaLv2Client*)kClient;

atom->type = lv2Client->getCustomURID(typeStr);
lv2Client->handleTransferEvent(portIndex, atom);
@@ -1089,15 +1089,13 @@ int main(int argc, char* argv[])
CarlaLv2Client client(uiTitle);

// Init OSC
if (useOsc && ! client.oscInit(oscUrl))
{
return -1;
}
if (useOsc)
client.oscInit(oscUrl);

// Load UI
int ret;

if (client.init(pluginURI, uiURI))
if (client.uiInit(pluginURI, uiURI))
{
client.toolkitExec(!useOsc);
ret = 0;
@@ -1110,12 +1108,10 @@ int main(int argc, char* argv[])

// Close OSC
if (useOsc)
{
client.oscClose();
}

// Close LV2 client
client.close();
client.uiClose();

return ret;
}


+ 10
- 14
source/bridges/CarlaBridgeUI-VST.cpp View File

@@ -17,8 +17,8 @@

#ifdef BRIDGE_VST

#include "carla_bridge_client.hpp"
#include "carla_bridge_toolkit.hpp"
#include "CarlaBridgeClient.hpp"
#include "CarlaBridgeToolkit.hpp"
#include "CarlaVstUtils.hpp"
#include "CarlaMIDI.h"

@@ -64,12 +64,12 @@ public:
// ---------------------------------------------------------------------
// ui initialization

bool init(const char* binary, const char*)
bool uiInit(const char* binary, const char*)
{
// -----------------------------------------------------------------
// init

CarlaBridgeClient::init(binary, nullptr);
CarlaBridgeClient::uiInit(binary, nullptr);

// -----------------------------------------------------------------
// open DLL
@@ -152,9 +152,9 @@ public:
return true;
}

void close()
void uiClose()
{
CarlaBridgeClient::close();
CarlaBridgeClient::uiClose();

if (effect)
{
@@ -560,15 +560,13 @@ int main(int argc, char* argv[])
CarlaVstClient client(uiTitle);

// Init OSC
if (useOsc && ! client.oscInit(oscUrl))
{
return -1;
}
if (useOsc)
client.oscInit(oscUrl);

// Load UI
int ret;

if (client.init(binary, nullptr))
if (client.uiInit(binary, nullptr))
{
client.toolkitExec(!useOsc);
ret = 0;
@@ -581,12 +579,10 @@ int main(int argc, char* argv[])

// Close OSC
if (useOsc)
{
client.oscClose();
}

// Close VST client
client.close();
client.uiClose();

return ret;
}


+ 50
- 64
source/bridges/Makefile View File

@@ -19,7 +19,8 @@ BUILD_CXX_FLAGS += $(shell pkg-config --cflags liblo QtCore QtXml)
LINK_FLAGS += $(shell pkg-config --libs liblo QtCore QtXml)

ifeq ($(CARLA_PLUGIN_SUPPORT),true)
BUILD_CXX_FLAGS += -DWANT_LADSPA -DWANT_DSSI -DWANT_LV2 -DWANT_VST
BUILD_CXX_FLAGS += -DWANT_LADSPA -DWANT_DSSI
#-DWANT_LV2 -DWANT_VST
endif

ifeq ($(HAVE_QT5),true)
@@ -34,7 +35,7 @@ endif
# Plugin bridges

BUILD_PLUGIN_FLAGS = $(BUILD_CXX_FLAGS) -DBUILD_BRIDGE_PLUGIN -DBRIDGE_PLUGIN
BUILD_PLUGIN_FLAGS += -DCARLA_ENGINE_JACK -I../carla-backend -I../carla-engine -I../carla-jackbridge -I../carla-plugin
BUILD_PLUGIN_FLAGS += -DWANT_JACK -I../backend/engine -I../backend/plugin -I../libs
BUILD_PLUGIN_FLAGS += $(shell pkg-config --cflags jack) $(QT_UI_FLAGS)

LINK_PLUGIN_FLAGS = $(LINK_FLAGS)
@@ -86,8 +87,7 @@ LINK_UI_VST_X11_FLAGS = $(LINK_UI_FLAGS) $(QT_UI_LIBS)
# --------------------------------------------------------------

ifeq ($(CARLA_PLUGIN_SUPPORT),true)
all: ui_lv2-gtk2 ui_lv2-gtk3 ui_lv2-qt4 ui_lv2-qt5 ui_lv2-x11 ui_vst-x11
# native
all: native ui_lv2-gtk2 ui_lv2-gtk3 ui_lv2-qt4 ui_lv2-qt5 ui_lv2-x11 ui_vst-x11

ifeq ($(HAVE_GTK2),true)
ui_lv2-gtk2: carla-bridge-lv2-gtk2
@@ -143,9 +143,9 @@ OBJS_UI_LV2_LIBS = \
# --------------------------------------------------------------
# ui_lv2-gtk2

OBJS_UI_LV2_GTK2 = carla_bridge_ui-lv2__lv2-gtk2.o \
carla_bridge_client__lv2.o carla_bridge_osc__lv2.o \
carla_bridge_toolkit__lv2.o carla_bridge_toolkit-gtk__lv2-gtk2.o
OBJS_UI_LV2_GTK2 = CarlaBridgeUI-LV2__lv2-gtk2.o \
CarlaBridgeClient__lv2.o CarlaBridgeOsc__lv2.o \
CarlaBridgeToolkit__lv2.o CarlaBridgeToolkitGtk__lv2-gtk2.o

carla-bridge-lv2-gtk2: $(OBJS_UI_LV2_GTK2) $(OBJS_UI_LV2_LIBS)
$(CXX) $^ $(LINK_UI_LV2_GTK2_FLAGS) -o $@ && $(STRIP) $@
@@ -156,9 +156,9 @@ carla-bridge-lv2-gtk2: $(OBJS_UI_LV2_GTK2) $(OBJS_UI_LV2_LIBS)
# --------------------------------------------------------------
# ui_lv2-gtk3

OBJS_UI_LV2_GTK3 = carla_bridge_ui-lv2__lv2-gtk3.o \
carla_bridge_client__lv2.o carla_bridge_osc__lv2.o \
carla_bridge_toolkit__lv2.o carla_bridge_toolkit-gtk__lv2-gtk3.o
OBJS_UI_LV2_GTK3 = CarlaBridgeUI-LV2__lv2-gtk3.o \
CarlaBridgeClient__lv2.o CarlaBridgeOsc__lv2.o \
CarlaBridgeToolkit__lv2.o CarlaBridgeToolkitGtk__lv2-gtk3.o

carla-bridge-lv2-gtk3: $(OBJS_UI_LV2_GTK3) $(OBJS_UI_LV2_LIBS)
$(CXX) $^ $(LINK_UI_LV2_GTK3_FLAGS) -o $@ && $(STRIP) $@
@@ -169,9 +169,9 @@ carla-bridge-lv2-gtk3: $(OBJS_UI_LV2_GTK3) $(OBJS_UI_LV2_LIBS)
# --------------------------------------------------------------
# ui_lv2-qt4

OBJS_UI_LV2_QT4 = carla_bridge_ui-lv2__lv2-qt4.o \
carla_bridge_client__lv2.o carla_bridge_osc__lv2.o \
carla_bridge_toolkit__lv2.o carla_bridge_toolkit-qt__lv2-qt4.o
OBJS_UI_LV2_QT4 = CarlaBridgeUI-LV2__lv2-qt4.o \
CarlaBridgeClient__lv2.o CarlaBridgeOsc__lv2.o \
CarlaBridgeToolkit__lv2.o CarlaBridgeToolkitQt__lv2-qt4.o

carla-bridge-lv2-qt4: $(OBJS_UI_LV2_QT4) $(OBJS_UI_LV2_LIBS)
$(CXX) $^ $(LINK_UI_LV2_QT4_FLAGS) -o $@ && $(STRIP) $@
@@ -182,9 +182,9 @@ carla-bridge-lv2-qt4: $(OBJS_UI_LV2_QT4) $(OBJS_UI_LV2_LIBS)
# --------------------------------------------------------------
# ui_lv2-qt5

OBJS_UI_LV2_QT5 = carla_bridge_ui-lv2__lv2-qt5.o \
carla_bridge_client__lv2.o carla_bridge_osc__lv2.o \
carla_bridge_toolkit__lv2.o carla_bridge_toolkit-qt__lv2-qt5.o
OBJS_UI_LV2_QT5 = CarlaBridgeUI-LV2__lv2-qt5.o \
CarlaBridgeClient__lv2.o CarlaBridgeOsc__lv2.o \
CarlaBridgeToolkit__lv2.o CarlaBridgeToolkitQt__lv2-qt5.o

carla-bridge-lv2-qt5: $(OBJS_UI_LV2_QT5) $(OBJS_UI_LV2_LIBS)
$(CXX) $^ $(LINK_UI_LV2_QT5_FLAGS) -o $@ && $(STRIP) $@
@@ -195,9 +195,9 @@ carla-bridge-lv2-qt5: $(OBJS_UI_LV2_QT5) $(OBJS_UI_LV2_LIBS)
# --------------------------------------------------------------
# ui_lv2-x11

OBJS_UI_LV2_X11 = carla_bridge_ui-lv2__lv2-x11.o \
carla_bridge_client__lv2.o carla_bridge_osc__lv2.o \
carla_bridge_toolkit__lv2.o carla_bridge_toolkit-qt__lv2-x11.o
OBJS_UI_LV2_X11 = CarlaBridgeUI-LV2__lv2-x11.o \
CarlaBridgeClient__lv2.o CarlaBridgeOsc__lv2.o \
CarlaBridgeToolkit__lv2.o CarlaBridgeToolkitQt__lv2-x11.o

carla-bridge-lv2-x11: $(OBJS_UI_LV2_X11) $(OBJS_UI_LV2_LIBS)
$(CXX) $^ $(LINK_UI_LV2_X11_FLAGS) -o $@ && $(STRIP) $@
@@ -208,9 +208,9 @@ carla-bridge-lv2-x11: $(OBJS_UI_LV2_X11) $(OBJS_UI_LV2_LIBS)
# --------------------------------------------------------------
# ui_vst-hwnd

OBJS_UI_VST_HWND = carla_bridge_ui-vst__vst-hwnd.o \
carla_bridge_client__vst.o carla_bridge_osc__vst.o \
carla_bridge_toolkit__vst.o carla_bridge_toolkit-qt__vst-hwnd.o
OBJS_UI_VST_HWND = CarlaBridgeUI-VST__vst-hwnd.o \
CarlaBridgeClient__vst.o CarlaBridgeOsc__vst.o \
CarlaBridgeToolkit__vst.o CarlaBridgeToolkitQt__vst-hwnd.o

carla-bridge-vst-hwnd.exe: $(OBJS_UI_VST_HWND)
$(CXX) $^ $(LINK_UI_VST_HWND_FLAGS) -o $@ && $(STRIP) $@
@@ -221,9 +221,9 @@ carla-bridge-vst-hwnd.exe: $(OBJS_UI_VST_HWND)
# --------------------------------------------------------------
# ui_vst-x11

OBJS_UI_VST_X11 = carla_bridge_ui-vst__vst-x11.o \
carla_bridge_client__vst.o carla_bridge_osc__vst.o \
carla_bridge_toolkit__vst.o carla_bridge_toolkit-qt__vst-x11.o
OBJS_UI_VST_X11 = CarlaBridgeUI-VST__vst-x11.o \
CarlaBridgeClient__vst.o CarlaBridgeOsc__vst.o \
CarlaBridgeToolkit__vst.o CarlaBridgeToolkitQt__vst-x11.o

carla-bridge-vst-x11: $(OBJS_UI_VST_X11)
$(CXX) $^ $(LINK_UI_VST_X11_FLAGS) -o $@ && $(STRIP) $@
@@ -242,34 +242,36 @@ NATIVE_BUILD_FLAGS += $(shell pkg-config --cflags suil-0) -DWANT_SUIL
NATIVE_LINK_FLAGS += $(shell pkg-config --libs suil-0)
endif

OBJS_NATIVE = carla_bridge_plugin__native.o \
carla_bridge_client__native.o carla_bridge_osc__native.o \
carla_bridge_toolkit__native.o

# carla
OBJS_NATIVE += \
../carla/Shared__native.o
OBJS_NATIVE = CarlaBridgePlugin__native.o \
CarlaBridgeClient__native.o CarlaBridgeOsc__native.o

# carla-engine
OBJS_NATIVE += \
../carla-engine/carla_engine__native.o \
../carla-engine/carla_engine_osc__native.o \
../carla-engine/carla_engine_thread__native.o \
../carla-engine/jack__native.o
../backend/engine/CarlaEngine__native.o \
../backend/engine/CarlaEngineOsc__native.o \
../backend/engine/CarlaEngineThread__native.o \
../backend/engine/CarlaEngineJack__native.o

# carla-plugin
OBJS_NATIVE += \
../carla-plugin/carla_plugin__native.o \
../carla-plugin/carla_plugin_thread__native.o \
../carla-plugin/ladspa__native.o \
../carla-plugin/dssi__native.o \
../carla-plugin/lv2__native.o \
../carla-plugin/vst__native.o
../backend/plugin/CarlaPlugin__native.o \
../backend/plugin/CarlaPluginThread__native.o \
../backend/plugin/NativePlugin__native.o \
../backend/plugin/LadspaPlugin__native.o \
../backend/plugin/DssiPlugin__native.o \
../backend/plugin/Lv2Plugin__native.o \
../backend/plugin/VstPlugin__native.o \
../backend/plugin/FluidSynthPlugin__native.o \
../backend/plugin/LinuxSamplerPlugin__native.o

# carla-standalone
OBJS_NATIVE += \
../backend/standalone/CarlaStandalone__native.o

# libs
OBJS_NATIVE += \
../carla-lilv/carla_lilv.a \
../carla-rtmempool/carla_rtmempool.a
../libs/lilv.a \
../libs/rtmempool.a

carla-bridge-native: $(OBJS_NATIVE)
$(CXX) $^ $(NATIVE_LINK_FLAGS) -o $@ && $(STRIP) $@
@@ -281,12 +283,7 @@ carla-bridge-native: $(OBJS_NATIVE)
# posix32

OBJS_POSIX32 = carla_bridge_plugin__posix32.o \
carla_bridge_client__posix32.o carla_bridge_osc__posix32.o \
carla_bridge_toolkit__posix32.o

# carla
OBJS_POSIX32 += \
../carla/Shared__posix32.o
carla_bridge_client__posix32.o carla_bridge_osc__posix32.o

# carla-engine
OBJS_POSIX32 += \
@@ -319,8 +316,7 @@ carla-bridge-posix32: $(OBJS_POSIX32)
# posix64

OBJS_POSIX64 = carla_bridge_plugin__posix64.o \
carla_bridge_client__posix64.o carla_bridge_osc__posix64.o \
carla_bridge_toolkit__posix64.o
carla_bridge_client__posix64.o carla_bridge_osc__posix64.o

# carla
OBJS_POSIX64 += \
@@ -357,12 +353,7 @@ carla-bridge-posix64: $(OBJS_POSIX64)
# win32

OBJS_WIN32 = carla_bridge_plugin__win32.o \
carla_bridge_client__win32.o carla_bridge_osc__win32.o \
carla_bridge_toolkit__win32.o

# carla
OBJS_WIN32 += \
../carla/Shared__win32.o
carla_bridge_client__win32.o carla_bridge_osc__win32.o

# carla-engine
OBJS_WIN32 += \
@@ -395,12 +386,7 @@ carla-bridge-win32.exe: $(OBJS_WIN32) ../carla-jackbridge/libcarla-jackbridge-wi
# win64

OBJS_WIN64 = carla_bridge_plugin__win64.o \
carla_bridge_client__win64.o carla_bridge_osc__win64.o \
carla_bridge_toolkit__win64.o

# carla
OBJS_WIN64 += \
../carla/Shared__win64.o
carla_bridge_client__win64.o carla_bridge_osc__win64.o

# carla-engine
OBJS_WIN64 += \


+ 2
- 11
source/discovery/Makefile View File

@@ -70,17 +70,8 @@ carla-discovery-win64.exe: $(OBJS) ../libs/lilv_win64.a
../libs/lilv.a:
$(MAKE) -C ../libs/lilv

../libs/lilv_posix32.a:
$(MAKE) -C ../libs/lilv posix32

../libs/lilv_posix64.a:
$(MAKE) -C ../libs/lilv posix64

../libs/lilv_win32.a:
$(MAKE) -C ../libs/lilv win32

../libs/lilv_win64.a:
$(MAKE) -C ../libs/lilv win64
../libs/lilv_%.a:
$(MAKE) -C ../libs/lilv $*

# --------------------------------------------------------------



Write Preview
Loading…
Cancel
Save