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

Keep going

tags/1.9.6
falkTX 10 years ago
parent
f4e6829c68
commit
147980a653
6 changed files with 287 additions and 245 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -0
      .gitignore
  2. +2
    -2
      Makefile
  3. +5
    -1
      source/backend/engine/CarlaEngineNative.cpp
  4. +272
    -238
      source/bridges-plugin/Makefile
  5. +1
    -3
      source/discovery/Makefile
  6. +5
    -1
      source/modules/CarlaNativeExtUI.hpp

+ 2
- 0
.gitignore View File

@@ -161,6 +161,8 @@ source/modules/native-plugins/zynaddsubfx/UI/VirKeyboard.cpp
source/modules/native-plugins/zynaddsubfx/UI/VirKeyboard.h

# Other
bin/styles/

source/includes/asio/
source/includes/rewire/
source/includes/vst/


+ 2
- 2
Makefile View File

@@ -40,8 +40,8 @@ all: BIN RES UI WIDGETS
# ----------------------------------------------------------------------------------------------------------------------------
# Binaries (native)

BIN: backend theme
# backend bridges-plugin bridges-ui discovery interposer plugin
BIN: backend bridges-plugin theme
# bridges-ui discovery interposer plugin

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



+ 5
- 1
source/backend/engine/CarlaEngineNative.cpp View File

@@ -536,7 +536,7 @@ protected:
}
else
{
carla_stderr("msgReceived : %s", msg);
carla_stderr("CarlaEngineNativeUI::msgReceived : %s", msg);
return false;
}

@@ -1410,7 +1410,11 @@ protected:
if (show)
{
if (fUiServer.isRunning())
{
fUiServer.writeMsg("focus\n", 6);
fUiServer.flush();
return;
}

CarlaString path(pHost->resourceDir);



+ 272
- 238
source/bridges-plugin/Makefile View File

@@ -4,52 +4,59 @@
# Created by falkTX
#

CWD=..
include ../Makefile.mk

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

BUILD_CXX_FLAGS += -DBUILD_BRIDGE
BUILD_CXX_FLAGS += -I. -I../backend -I../includes -I../utils -isystem ../modules
BUILD_CXX_FLAGS += $(LIBLO_FLAGS)
LINK_FLAGS += $(LIBLO_LIBS)
BINDIR := $(CWD)/../bin

# --------------------------------------------------------------
# Plugin bridges
ifeq ($(DEBUG),true)
OBJDIR := $(CWD)/../build/bridges-plugin/Debug
MODULEDIR := $(CWD)/../build/modules/Debug
else
OBJDIR := $(CWD)/../build/bridges-plugin/Release
MODULEDIR := $(CWD)/../build/modules/Release
endif

BUILD_PLUGIN_FLAGS = $(BUILD_CXX_FLAGS)
BUILD_PLUGIN_FLAGS += -I../backend/engine -I../backend/plugin
# ----------------------------------------------------------------------------------------------------------------------------
# Plugin bridges (Common)

LINK_PLUGIN_FLAGS = $(LINK_FLAGS)
LINK_PLUGIN_FLAGS += $(JUCE_AUDIO_BASICS_LIBS)
LINK_PLUGIN_FLAGS += $(JUCE_AUDIO_FORMATS_LIBS)
LINK_PLUGIN_FLAGS += $(JUCE_CORE_LIBS)
BUILD_CXX_FLAGS += -DBUILD_BRIDGE -I. -I../backend -I../backend/engine -I../backend/plugin -I../includes -I../utils -isystem ../modules
BUILD_CXX_FLAGS += $(LIBLO_FLAGS)

ifeq ($(CARLA_VESTIGE_HEADER),true)
BUILD_PLUGIN_FLAGS += -DVESTIGE_HEADER
BUILD_CXX_FLAGS += -DVESTIGE_HEADER
endif

LINK_FLAGS += $(JUCE_AUDIO_BASICS_LIBS)
LINK_FLAGS += $(JUCE_AUDIO_FORMATS_LIBS)
LINK_FLAGS += $(JUCE_CORE_LIBS)

ifeq ($(MACOS_OR_WIN32),true)
LINK_PLUGIN_FLAGS += $(JUCE_AUDIO_PROCESSORS_LIBS)
LINK_PLUGIN_FLAGS += $(JUCE_DATA_STRUCTURES_LIBS)
LINK_PLUGIN_FLAGS += $(JUCE_EVENTS_LIBS)
LINK_PLUGIN_FLAGS += $(JUCE_GRAPHICS_LIBS)
LINK_PLUGIN_FLAGS += $(JUCE_GUI_BASICS_LIBS)
LINK_FLAGS += $(JUCE_AUDIO_PROCESSORS_LIBS)
LINK_FLAGS += $(JUCE_DATA_STRUCTURES_LIBS)
LINK_FLAGS += $(JUCE_EVENTS_LIBS)
LINK_FLAGS += $(JUCE_GRAPHICS_LIBS)
LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS)
ifeq ($(MACOS),true)
LINK_PLUGIN_FLAGS += $(JUCE_GUI_EXTRA_LIBS)
LINK_FLAGS += $(JUCE_GUI_EXTRA_LIBS)
endif
endif

LINK_FLAGS += $(LIBLO_LIBS)

ifeq ($(HAVE_X11),true)
LINK_PLUGIN_FLAGS += $(X11_LIBS)
LINK_FLAGS += $(X11_LIBS)
endif

# --------------------------------------------------------------
# ----------------------------------------------------------------------------------------------------------------------------
# Plugin bridges (POSIX)

POSIX_BUILD_FLAGS = $(BUILD_PLUGIN_FLAGS)
POSIX_BUILD_FLAGS = $(BUILD_CXX_FLAGS)
POSIX_32BIT_FLAGS = $(32BIT_FLAGS)
POSIX_64BIT_FLAGS = $(64BIT_FLAGS)
POSIX_LINK_FLAGS = $(LINK_PLUGIN_FLAGS)
POSIX_LINK_FLAGS = $(LINK_FLAGS)

ifneq ($(HAIKU),true)
POSIX_LINK_FLAGS += -ldl -lpthread
@@ -60,15 +67,15 @@ POSIX_32BIT_FLAGS += -L/usr/lib32 -L/usr/lib/i386-linux-gnu
POSIX_64BIT_FLAGS += -L/usr/lib64 -L/usr/lib/x86_64-linux-gnu
endif

# --------------------------------------------------------------
# ----------------------------------------------------------------------------------------------------------------------------
# Plugin bridges (Windows)

WIN_BUILD_FLAGS = $(BUILD_PLUGIN_FLAGS)
WIN_BUILD_FLAGS = $(BUILD_CXX_FLAGS)
WIN_32BIT_FLAGS = $(32BIT_FLAGS)
WIN_64BIT_FLAGS = $(64BIT_FLAGS)
WIN_LINK_FLAGS = $(LINK_PLUGIN_FLAGS)
WIN_LINK_FLAGS = $(LINK_FLAGS)

# --------------------------------------------------------------
# ----------------------------------------------------------------------------------------------------------------------------
# Plugin bridges (Native)

ifeq ($(WIN32),true)
@@ -92,334 +99,361 @@ endif
ifeq ($(HAVE_ZYN_DEPS),true)
NATIVE_BUILD_FLAGS += -DWANT_ZYNADDSUBFX
ifeq ($(HAVE_ZYN_UI_DEPS),true)
NATIVE_LINK_FLAGS += -DWANT_ZYNADDSUBFX_UI
NATIVE_BUILD_FLAGS += -DWANT_ZYNADDSUBFX_UI
endif
endif

NATIVE_LINK_FLAGS += $(NATIVE_PLUGINS_LIBS)

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

all: native

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

clean:
rm -f $(OBJDIR)/CarlaBridgePlugin*.o $(BINDIR)/carla-bridge-*
rm -f $(OBJS_NATIVE)
rm -f $(OBJS_POSIX32)
rm -f $(OBJS_POSIX64)
rm -f $(OBJS_WIN32)
rm -f $(OBJS_WIN64)

debug:
$(MAKE) DEBUG=true

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

native: ../../bin/carla-bridge-native$(APP_EXT)
posix32: ../../bin/carla-bridge-posix32
posix64: ../../bin/carla-bridge-posix64
win32: ../../bin/carla-bridge-win32.exe
win64: ../../bin/carla-bridge-win64.exe
native: $(BINDIR)/carla-bridge-native$(APP_EXT)
posix32: $(BINDIR)/carla-bridge-posix32
posix64: $(BINDIR)/carla-bridge-posix64
win32: $(BINDIR)/carla-bridge-win32.exe
win64: $(BINDIR)/carla-bridge-win64.exe

# --------------------------------------------------------------
# ----------------------------------------------------------------------------------------------------------------------------
# native

OBJS_NATIVE = CarlaBridgePlugin__native.o
OBJS_NATIVE = $(OBJDIR)/CarlaBridgePlugin.cpp.o

# carla-engine
OBJS_NATIVE += \
../backend/engine/CarlaEngine__native.o \
../backend/engine/CarlaEngineClient__native.o \
../backend/engine/CarlaEngineData__native.o \
../backend/engine/CarlaEngineInternal__native.o \
../backend/engine/CarlaEngineOsc__native.o \
../backend/engine/CarlaEngineOscSend__native.o \
../backend/engine/CarlaEnginePorts__native.o \
../backend/engine/CarlaEngineThread__native.o \
../backend/engine/CarlaEngineJack__native.o \
../backend/engine/CarlaEngineBridge__native.o
$(OBJDIR)/CarlaEngine.cpp.o \
$(OBJDIR)/CarlaEngineClient.cpp.o \
$(OBJDIR)/CarlaEngineData.cpp.o \
$(OBJDIR)/CarlaEngineInternal.cpp.o \
$(OBJDIR)/CarlaEngineOsc.cpp.o \
$(OBJDIR)/CarlaEngineOscSend.cpp.o \
$(OBJDIR)/CarlaEnginePorts.cpp.o \
$(OBJDIR)/CarlaEngineThread.cpp.o \
$(OBJDIR)/CarlaEngineJack.cpp.o \
$(OBJDIR)/CarlaEngineBridge.cpp.o

# carla-plugin
OBJS_NATIVE += \
../backend/plugin/CarlaPlugin__native.o \
../backend/plugin/CarlaPluginInternal__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/Vst3Plugin__native.o \
../backend/plugin/AuPlugin__native.o \
../backend/plugin/JucePlugin__native.o \
../backend/plugin/FluidSynthPlugin__native.o \
../backend/plugin/LinuxSamplerPlugin__native.o
$(OBJDIR)/CarlaPlugin.cpp.o \
$(OBJDIR)/CarlaPluginInternal.cpp.o \
$(OBJDIR)/CarlaPluginThread.cpp.o \
$(OBJDIR)/NativePlugin.cpp.o \
$(OBJDIR)/LadspaPlugin.cpp.o \
$(OBJDIR)/DssiPlugin.cpp.o \
$(OBJDIR)/Lv2Plugin.cpp.o \
$(OBJDIR)/VstPlugin.cpp.o \
$(OBJDIR)/Vst3Plugin.cpp.o \
$(OBJDIR)/AuPlugin.cpp.o \
$(OBJDIR)/JucePlugin.cpp.o \
$(OBJDIR)/FluidSynthPlugin.cpp.o \
$(OBJDIR)/LinuxSamplerPlugin.cpp.o

# carla-standalone
OBJS_NATIVE += \
../backend/CarlaStandalone__native.o
$(OBJDIR)/CarlaStandalone.cpp.o

# libs
LIBS_NATIVE = \
../modules/native-plugins.a \
../modules/jackbridge.a \
../modules/juce_audio_basics.a \
../modules/juce_audio_formats.a \
../modules/juce_core.a \
../modules/lilv.a \
../modules/rtmempool.a
$(MODULEDIR)/jackbridge.a \
$(MODULEDIR)/juce_audio_basics.a \
$(MODULEDIR)/juce_audio_formats.a \
$(MODULEDIR)/juce_core.a \
$(MODULEDIR)/lilv.a \
$(MODULEDIR)/native-plugins.a \
$(MODULEDIR)/rtmempool.a

ifeq ($(MACOS_OR_WIN32),true)
LIBS_NATIVE += \
../modules/juce_audio_processors.a \
../modules/juce_data_structures.a \
../modules/juce_events.a \
../modules/juce_graphics.a \
../modules/juce_gui_basics.a
$(MODULEDIR)/juce_audio_processors.a \
$(MODULEDIR)/juce_data_structures.a \
$(MODULEDIR)/juce_events.a \
$(MODULEDIR)/juce_graphics.a \
$(MODULEDIR)/juce_gui_basics.a

ifeq ($(MACOS),true)
LIBS_NATIVE += \
../modules/juce_gui_extra.a
$(MODULEDIR)/juce_gui_extra.a
endif
endif

../../bin/carla-bridge-native$(APP_EXT): $(OBJS_NATIVE) $(LIBS_NATIVE)
$(CXX) $(OBJS_NATIVE) $(LIBS_START) $(LIBS_NATIVE) $(LIBS_END) $(NATIVE_LINK_FLAGS) -o $@

%__native.o: %.cpp
$(CXX) $< $(NATIVE_BUILD_FLAGS) -c -o $@

# --------------------------------------------------------------
$(BINDIR)/carla-bridge-native$(APP_EXT): $(OBJS_NATIVE) $(LIBS_NATIVE)
-@mkdir -p $(BINDIR)
@echo "Linking carla-bridge-native$(APP_EXT)"
@$(CXX) $(OBJS_NATIVE) $(LIBS_START) $(LIBS_NATIVE) $(LIBS_END) $(NATIVE_LINK_FLAGS) -o $@

$(OBJDIR)/CarlaBridgePlugin.cpp.o: CarlaBridgePlugin.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling $< (bridge)"
@$(CXX) $< $(NATIVE_BUILD_FLAGS) -MMD -c -o $@

$(OBJDIR)/CarlaEng%.cpp.o: ../backend/engine/CarlaEng%.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling CarlaEng$*.cpp (bridge)"
@$(CXX) $< $(NATIVE_BUILD_FLAGS) -MMD -c -o $@

$(OBJDIR)/CarlaPlug%.cpp.o: ../backend/plugin/CarlaPlug%.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling CarlaPlug$*.cpp (bridge)"
@$(CXX) $< $(NATIVE_BUILD_FLAGS) -MMD -c -o $@

$(OBJDIR)/%Plugin.cpp.o: ../backend/plugin/%Plugin.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling $*Plugin.cpp (bridge)"
@$(CXX) $< $(NATIVE_BUILD_FLAGS) -MMD -c -o $@

$(OBJDIR)/CarlaStandalone.cpp.o: ../backend/CarlaStandalone.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling CarlaStandalone.cpp (bridge)"
@$(CXX) $< $(NATIVE_BUILD_FLAGS) -MMD -c -o $@

# ----------------------------------------------------------------------------------------------------------------------------
# posix32

OBJS_POSIX32 = CarlaBridgePlugin__posix32.o
OBJS_POSIX32 = CarlaBridgePlugin.cpp.posix32.o

# carla-engine
OBJS_POSIX32 += \
../backend/engine/CarlaEngine__posix32.o \
../backend/engine/CarlaEngineClient__posix32.o \
../backend/engine/CarlaEngineData__posix32.o \
../backend/engine/CarlaEngineInternal__posix32.o \
../backend/engine/CarlaEngineOsc__posix32.o \
../backend/engine/CarlaEngineOscSend__posix32.o \
../backend/engine/CarlaEnginePorts__posix32.o \
../backend/engine/CarlaEngineThread__posix32.o \
../backend/engine/CarlaEngineJack__posix32.o \
../backend/engine/CarlaEngineBridge__posix32.o
$(OBJDIR)/CarlaEngine.cpp.posix32.o \
$(OBJDIR)/CarlaEngineClient.cpp.posix32.o \
$(OBJDIR)/CarlaEngineData.cpp.posix32.o \
$(OBJDIR)/CarlaEngineInternal.cpp.posix32.o \
$(OBJDIR)/CarlaEngineOsc.cpp.posix32.o \
$(OBJDIR)/CarlaEngineOscSend.cpp.posix32.o \
$(OBJDIR)/CarlaEnginePorts.cpp.posix32.o \
$(OBJDIR)/CarlaEngineThread.cpp.posix32.o \
$(OBJDIR)/CarlaEngineJack.cpp.posix32.o \
$(OBJDIR)/CarlaEngineBridge.cpp.posix32.o

# carla-plugin
OBJS_POSIX32 += \
../backend/plugin/CarlaPlugin__posix32.o \
../backend/plugin/CarlaPluginInternal__posix32.o \
../backend/plugin/CarlaPluginThread__posix32.o \
../backend/plugin/LadspaPlugin__posix32.o \
../backend/plugin/DssiPlugin__posix32.o \
../backend/plugin/Lv2Plugin__posix32.o \
../backend/plugin/VstPlugin__posix32.o \
../backend/plugin/Vst3Plugin__posix32.o \
../backend/plugin/AuPlugin__posix32.o \
../backend/plugin/JucePlugin__posix32.o
$(OBJDIR)/CarlaPlugin.cpp.posix32.o \
$(OBJDIR)/CarlaPluginInternal.cpp.posix32.o \
$(OBJDIR)/CarlaPluginThread.cpp.posix32.o \
$(OBJDIR)/LadspaPlugin.cpp.posix32.o \
$(OBJDIR)/DssiPlugin.cpp.posix32.o \
$(OBJDIR)/Lv2Plugin.cpp.posix32.o \
$(OBJDIR)/VstPlugin.cpp.posix32.o \
$(OBJDIR)/Vst3Plugin.cpp.posix32.o \
$(OBJDIR)/AuPlugin.cpp.posix32.o \
$(OBJDIR)/JucePlugin.cpp.posix32.o

# carla-standalone
OBJS_POSIX32 += \
../backend/CarlaStandalone__posix32.o
$(OBJDIR)/CarlaStandalone.cpp.posix32.o

# libs
LIBS_POSIX32 = \
../modules/jackbridge.posix32.a \
../modules/juce_audio_basics.posix32.a \
../modules/juce_core.posix32.a \
../modules/lilv.posix32.a \
../modules/rtmempool.posix32.a
$(MODULEDIR)/jackbridge.posix32.a \
$(MODULEDIR)/juce_audio_basics.posix32.a \
$(MODULEDIR)/juce_core.posix32.a \
$(MODULEDIR)/lilv.posix32.a \
$(MODULEDIR)/rtmempool.posix32.a

ifeq ($(MACOS),true)
LIBS_POSIX32 += \
../modules/juce_audio_processors.posix32.a \
../modules/juce_data_structures.posix32.a \
../modules/juce_events.posix32.a \
../modules/juce_graphics.posix32.a \
../modules/juce_gui_basics.posix32.a \
../modules/juce_gui_extra.posix32.a
$(MODULEDIR)/juce_audio_processors.posix32.a \
$(MODULEDIR)/juce_data_structures.posix32.a \
$(MODULEDIR)/juce_events.posix32.a \
$(MODULEDIR)/juce_graphics.posix32.a \
$(MODULEDIR)/juce_gui_basics.posix32.a \
$(MODULEDIR)/juce_gui_extra.posix32.a
endif

../../bin/carla-bridge-posix32: $(OBJS_POSIX32) $(LIBS_POSIX32)
$(BINDIR)/carla-bridge-posix32: $(OBJS_POSIX32) $(LIBS_POSIX32)
$(CXX) $(OBJS_POSIX32) $(LIBS_START) $(LIBS_POSIX32) $(LIBS_END) $(POSIX_LINK_FLAGS) $(POSIX_32BIT_FLAGS) -o $@

%__posix32.o: %.cpp
$(OBJDIR)/%.cpp.posix32.o: %.cpp
$(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) -DBRIDGE_PLUGIN -c -o $@

# --------------------------------------------------------------
# ----------------------------------------------------------------------------------------------------------------------------
# posix64

OBJS_POSIX64 = CarlaBridgePlugin__posix64.o
OBJS_POSIX64 = CarlaBridgePlugin.cpp.posix64.o

# carla-engine
OBJS_POSIX64 += \
../backend/engine/CarlaEngine__posix64.o \
../backend/engine/CarlaEngineClient__posix64.o \
../backend/engine/CarlaEngineData__posix64.o \
../backend/engine/CarlaEngineInternal__posix64.o \
../backend/engine/CarlaEngineOsc__posix64.o \
../backend/engine/CarlaEngineOscSend__posix64.o \
../backend/engine/CarlaEnginePorts__posix64.o \
../backend/engine/CarlaEngineThread__posix64.o \
../backend/engine/CarlaEngineJack__posix64.o \
../backend/engine/CarlaEngineBridge__posix64.o
$(OBJDIR)/CarlaEngine.cpp.posix64.o \
$(OBJDIR)/CarlaEngineClient.cpp.posix64.o \
$(OBJDIR)/CarlaEngineData.cpp.posix64.o \
$(OBJDIR)/CarlaEngineInternal.cpp.posix64.o \
$(OBJDIR)/CarlaEngineOsc.cpp.posix64.o \
$(OBJDIR)/CarlaEngineOscSend.cpp.posix64.o \
$(OBJDIR)/CarlaEnginePorts.cpp.posix64.o \
$(OBJDIR)/CarlaEngineThread.cpp.posix64.o \
$(OBJDIR)/CarlaEngineJack.cpp.posix64.o \
$(OBJDIR)/CarlaEngineBridge.cpp.posix64.o

# carla-plugin
OBJS_POSIX64 += \
../backend/plugin/CarlaPlugin__posix64.o \
../backend/plugin/CarlaPluginInternal__posix64.o \
../backend/plugin/CarlaPluginThread__posix64.o \
../backend/plugin/LadspaPlugin__posix64.o \
../backend/plugin/DssiPlugin__posix64.o \
../backend/plugin/Lv2Plugin__posix64.o \
../backend/plugin/VstPlugin__posix64.o \
../backend/plugin/Vst3Plugin__posix64.o \
../backend/plugin/AuPlugin__posix64.o \
../backend/plugin/JucePlugin__posix64.o
$(OBJDIR)/CarlaPlugin.cpp.posix64.o \
$(OBJDIR)/CarlaPluginInternal.cpp.posix64.o \
$(OBJDIR)/CarlaPluginThread.cpp.posix64.o \
$(OBJDIR)/LadspaPlugin.cpp.posix64.o \
$(OBJDIR)/DssiPlugin.cpp.posix64.o \
$(OBJDIR)/Lv2Plugin.cpp.posix64.o \
$(OBJDIR)/VstPlugin.cpp.posix64.o \
$(OBJDIR)/Vst3Plugin.cpp.posix64.o \
$(OBJDIR)/AuPlugin.cpp.posix64.o \
$(OBJDIR)/JucePlugin.cpp.posix64.o

# carla-standalone
OBJS_POSIX64 += \
../backend/CarlaStandalone__posix64.o
$(OBJDIR)/CarlaStandalone.cpp.posix64.o

# libs
LIBS_POSIX64 = \
../modules/jackbridge.posix64.a \
../modules/juce_audio_basics.posix64.a \
../modules/juce_core.posix64.a \
../modules/lilv.posix64.a \
../modules/rtmempool.posix64.a
$(MODULEDIR)/jackbridge.posix64.a \
$(MODULEDIR)/juce_audio_basics.posix64.a \
$(MODULEDIR)/juce_core.posix64.a \
$(MODULEDIR)/lilv.posix64.a \
$(MODULEDIR)/rtmempool.posix64.a

ifeq ($(MACOS),true)
LIBS_POSIX64 += \
../modules/juce_audio_processors.posix64.a \
../modules/juce_data_structures.posix64.a \
../modules/juce_events.posix64.a \
../modules/juce_graphics.posix64.a \
../modules/juce_gui_basics.posix64.a \
../modules/juce_gui_extra.posix64.a
$(MODULEDIR)/juce_audio_processors.posix64.a \
$(MODULEDIR)/juce_data_structures.posix64.a \
$(MODULEDIR)/juce_events.posix64.a \
$(MODULEDIR)/juce_graphics.posix64.a \
$(MODULEDIR)/juce_gui_basics.posix64.a \
$(MODULEDIR)/juce_gui_extra.posix64.a
endif

../../bin/carla-bridge-posix64: $(OBJS_POSIX64) $(LIBS_POSIX64)
$(BINDIR)/carla-bridge-posix64: $(OBJS_POSIX64) $(LIBS_POSIX64)
$(CXX) $(OBJS_POSIX64) $(LIBS_START) $(LIBS_POSIX64) $(LIBS_END) $(POSIX_LINK_FLAGS) $(POSIX_64BIT_FLAGS) -o $@

%__posix64.o: %.cpp
$(OBJDIR)/%.cpp.posix64.o: %.cpp
$(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) -DBRIDGE_PLUGIN -c -o $@

# --------------------------------------------------------------
# ----------------------------------------------------------------------------------------------------------------------------
# win32

OBJS_WIN32 = CarlaBridgePlugin__win32.o
OBJS_WIN32 = CarlaBridgePlugin.cpp.win32.o

# carla-engine
OBJS_WIN32 += \
../backend/engine/CarlaEngine__win32.o \
../backend/engine/CarlaEngineClient__win32.o \
../backend/engine/CarlaEngineData__win32.o \
../backend/engine/CarlaEngineInternal__win32.o \
../backend/engine/CarlaEngineOsc__win32.o \
../backend/engine/CarlaEngineOscSend__win32.o \
../backend/engine/CarlaEnginePorts__win32.o \
../backend/engine/CarlaEngineThread__win32.o \
../backend/engine/CarlaEngineBridge__win32.o \
../backend/engine/CarlaEngineJack__win32.o
$(OBJDIR)/CarlaEngine.cpp.win32.o \
$(OBJDIR)/CarlaEngineClient.cpp.win32.o \
$(OBJDIR)/CarlaEngineData.cpp.win32.o \
$(OBJDIR)/CarlaEngineInternal.cpp.win32.o \
$(OBJDIR)/CarlaEngineOsc.cpp.win32.o \
$(OBJDIR)/CarlaEngineOscSend.cpp.win32.o \
$(OBJDIR)/CarlaEnginePorts.cpp.win32.o \
$(OBJDIR)/CarlaEngineThread.cpp.win32.o \
$(OBJDIR)/CarlaEngineBridge.cpp.win32.o \
$(OBJDIR)/CarlaEngineJack.cpp.win32.o

# carla-plugin
OBJS_WIN32 += \
../backend/plugin/CarlaPlugin__win32.o \
../backend/plugin/CarlaPluginInternal__win32.o \
../backend/plugin/CarlaPluginThread__win32.o \
../backend/plugin/LadspaPlugin__win32.o \
../backend/plugin/DssiPlugin__win32.o \
../backend/plugin/Lv2Plugin__win32.o \
../backend/plugin/VstPlugin__win32.o \
../backend/plugin/Vst3Plugin__win32.o \
../backend/plugin/AuPlugin__win32.o \
../backend/plugin/JucePlugin__win32.o
$(OBJDIR)/CarlaPlugin.cpp.win32.o \
$(OBJDIR)/CarlaPluginInternal.cpp.win32.o \
$(OBJDIR)/CarlaPluginThread.cpp.win32.o \
$(OBJDIR)/LadspaPlugin.cpp.win32.o \
$(OBJDIR)/DssiPlugin.cpp.win32.o \
$(OBJDIR)/Lv2Plugin.cpp.win32.o \
$(OBJDIR)/VstPlugin.cpp.win32.o \
$(OBJDIR)/Vst3Plugin.cpp.win32.o \
$(OBJDIR)/AuPlugin.cpp.win32.o \
$(OBJDIR)/JucePlugin.cpp.win32.o

# carla-standalone
OBJS_WIN32 += \
../backend/CarlaStandalone__win32.o
$(OBJDIR)/CarlaStandalone.cpp.win32.o

# libs
LIBS_WIN32 = \
../modules/jackbridge.win32e.a \
../modules/lilv.win32.a \
../modules/rtmempool.win32.a
$(MODULEDIR)/jackbridge.win32e.a \
$(MODULEDIR)/lilv.win32.a \
$(MODULEDIR)/rtmempool.win32.a

LIBS_WIN32 += \
../modules/juce_audio_basics.win32.a \
../modules/juce_audio_processors.win32.a \
../modules/juce_core.win32.a \
../modules/juce_data_structures.win32.a \
../modules/juce_events.win32.a \
../modules/juce_graphics.win32.a \
../modules/juce_gui_basics.win32.a
../../bin/carla-bridge-win32.exe: $(OBJS_WIN32) $(LIBS_WIN32)
$(MODULEDIR)/juce_audio_basics.win32.a \
$(MODULEDIR)/juce_audio_processors.win32.a \
$(MODULEDIR)/juce_core.win32.a \
$(MODULEDIR)/juce_data_structures.win32.a \
$(MODULEDIR)/juce_events.win32.a \
$(MODULEDIR)/juce_graphics.win32.a \
$(MODULEDIR)/juce_gui_basics.win32.a
$(BINDIR)/carla-bridge-win32.exe: $(OBJS_WIN32) $(LIBS_WIN32)
$(CXX) $(OBJS_WIN32) $(LIBS_START) $(LIBS_WIN32) $(LIBS_END) $(WIN_LINK_FLAGS) $(WIN_32BIT_FLAGS) -o $@

%__win32.o: %.cpp
$(OBJDIR)/%.cpp.win32.o: %.cpp
$(CXX) $< $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) -DBRIDGE_PLUGIN -c -o $@

# --------------------------------------------------------------
# ----------------------------------------------------------------------------------------------------------------------------
# win64

OBJS_WIN64 = CarlaBridgePlugin__win64.o
OBJS_WIN64 = CarlaBridgePlugin.cpp.win64.o

# carla-engine
OBJS_WIN64 += \
../backend/engine/CarlaEngine__win64.o \
../backend/engine/CarlaEngineClient__win64.o \
../backend/engine/CarlaEngineData__win64.o \
../backend/engine/CarlaEngineInternal__win64.o \
../backend/engine/CarlaEngineOsc__win64.o \
../backend/engine/CarlaEngineOscSend__win64.o \
../backend/engine/CarlaEnginePorts__win64.o \
../backend/engine/CarlaEngineThread__win64.o \
../backend/engine/CarlaEngineBridge__win64.o \
../backend/engine/CarlaEngineJack__win64.o
$(OBJDIR)/CarlaEngine.cpp.win64.o \
$(OBJDIR)/CarlaEngineClient.cpp.win64.o \
$(OBJDIR)/CarlaEngineData.cpp.win64.o \
$(OBJDIR)/CarlaEngineInternal.cpp.win64.o \
$(OBJDIR)/CarlaEngineOsc.cpp.win64.o \
$(OBJDIR)/CarlaEngineOscSend.cpp.win64.o \
$(OBJDIR)/CarlaEnginePorts.cpp.win64.o \
$(OBJDIR)/CarlaEngineThread.cpp.win64.o \
$(OBJDIR)/CarlaEngineBridge.cpp.win64.o \
$(OBJDIR)/CarlaEngineJack.cpp.win64.o

# carla-plugin
OBJS_WIN64 += \
../backend/plugin/CarlaPlugin__win64.o \
../backend/plugin/CarlaPluginInternal__win64.o \
../backend/plugin/CarlaPluginThread__win64.o \
../backend/plugin/LadspaPlugin__win64.o \
../backend/plugin/DssiPlugin__win64.o \
../backend/plugin/Lv2Plugin__win64.o \
../backend/plugin/VstPlugin__win64.o \
../backend/plugin/Vst3Plugin__win64.o \
../backend/plugin/AuPlugin__win64.o \
../backend/plugin/JucePlugin__win64.o
$(OBJDIR)/CarlaPlugin.cpp.win64.o \
$(OBJDIR)/CarlaPluginInternal.cpp.win64.o \
$(OBJDIR)/CarlaPluginThread.cpp.win64.o \
$(OBJDIR)/LadspaPlugin.cpp.win64.o \
$(OBJDIR)/DssiPlugin.cpp.win64.o \
$(OBJDIR)/Lv2Plugin.cpp.win64.o \
$(OBJDIR)/VstPlugin.cpp.win64.o \
$(OBJDIR)/Vst3Plugin.cpp.win64.o \
$(OBJDIR)/AuPlugin.cpp.win64.o \
$(OBJDIR)/JucePlugin.cpp.win64.o

# carla-standalone
OBJS_WIN64 += \
../backend/CarlaStandalone__win64.o
$(OBJDIR)/CarlaStandalone.cpp.win64.o

# libs
LIBS_WIN64 = \
../modules/jackbridge.win64e.a \
../modules/lilv.win64.a \
../modules/rtmempool.win64.a
$(MODULEDIR)/jackbridge.win64e.a \
$(MODULEDIR)/lilv.win64.a \
$(MODULEDIR)/rtmempool.win64.a

LIBS_WIN64 += \
../modules/juce_audio_basics.win64.a \
../modules/juce_audio_processors.win64.a \
../modules/juce_core.win64.a \
../modules/juce_data_structures.win64.a \
../modules/juce_events.win64.a \
../modules/juce_graphics.win64.a \
../modules/juce_gui_basics.win64.a
../../bin/carla-bridge-win64.exe: $(OBJS_WIN64) $(LIBS_WIN64)
$(MODULEDIR)/juce_audio_basics.win64.a \
$(MODULEDIR)/juce_audio_processors.win64.a \
$(MODULEDIR)/juce_core.win64.a \
$(MODULEDIR)/juce_data_structures.win64.a \
$(MODULEDIR)/juce_events.win64.a \
$(MODULEDIR)/juce_graphics.win64.a \
$(MODULEDIR)/juce_gui_basics.win64.a
$(BINDIR)/carla-bridge-win64.exe: $(OBJS_WIN64) $(LIBS_WIN64)
$(CXX) $(OBJS_WIN64) $(LIBS_START) $(LIBS_WIN64) $(LIBS_END) $(WIN_LINK_FLAGS) $(WIN_64BIT_FLAGS) -o $@

%__win64.o: %.cpp
$(OBJDIR)/%.cpp.win64.o: %.cpp
$(CXX) $< $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) -DBRIDGE_PLUGIN -c -o $@

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

clean:
$(RM) *.o
$(RM) ../../bin/carla-bridge-*
$(RM) $(OBJS_NATIVE)
$(RM) $(OBJS_POSIX32)
$(RM) $(OBJS_POSIX64)
$(RM) $(OBJS_WIN32)
$(RM) $(OBJS_WIN64)

debug:
$(MAKE) DEBUG=true
-include $(OBJS:%.o=%.d)

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

+ 1
- 3
source/discovery/Makefile View File

@@ -4,9 +4,7 @@
# Created by falkTX
#

CWD=..
include $(CWD)/Makefile.deps
include $(CWD)/Makefile.mk
include ../Makefile.mk

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



+ 5
- 1
source/modules/CarlaNativeExtUI.hpp View File

@@ -48,7 +48,11 @@ protected:
if (show)
{
if (isRunning())
{
writeMsg("focus\n", 6);
flush();
return;
}

CarlaString path(getResourceDir() + fExtUiPath);
carla_stdout("Trying to start UI using \"%s\"", path.buffer());
@@ -185,7 +189,7 @@ protected:
return true;
}

carla_stderr("msgReceived : %s", msg);
carla_stderr("NativePluginAndUiClass::msgReceived : %s", msg);
return false;
}



Write Preview
Loading…
Cancel
Save