From 709d111c43a4c4c710378fc65209011bc8dbc0d0 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Thu, 11 Jul 2013 00:58:42 +0100
Subject: [PATCH] Fixes for win32 bridges

---
 Makefile                              |  6 +++---
 source/backend/plugin/CarlaPlugin.cpp | 18 ++++++++++++++++++
 source/bridges/Makefile               |  9 +++++++++
 source/libs/jackbridge/JackBridge.hpp |  3 +++
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index da0f83cb0..c50b66790 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,7 @@ posix64:
 	$(MAKE) -C source/discovery posix64
 
 win32:
-# 	$(MAKE) -C source/bridges win32
+	$(MAKE) -C source/bridges win32
 	$(MAKE) -C source/discovery win32
 
 win64:
@@ -64,11 +64,11 @@ win64:
 	$(MAKE) -C source/discovery win64
 
 wine32:
-	$(MAKE) -C source/libs jackbridge-win32.dll.so
+	$(MAKE) -C source/libs jackbridge-wine32
 	$(LINK) ../libs/jackbridge-win32.dll.so source/bridges/jackbridge-win32.dll
 
 wine64:
-	$(MAKE) -C source/libs jackbridge-win64.dll.so
+	$(MAKE) -C source/libs jackbridge-wine64
 	$(LINK) ../libs/jackbridge-win64.dll.so source/bridges/jackbridge-win64.dll
 
 # --------------------------------------------------------------
diff --git a/source/backend/plugin/CarlaPlugin.cpp b/source/backend/plugin/CarlaPlugin.cpp
index 104f8035e..8d6cfda49 100644
--- a/source/backend/plugin/CarlaPlugin.cpp
+++ b/source/backend/plugin/CarlaPlugin.cpp
@@ -2253,6 +2253,24 @@ CarlaPlugin::ScopedSingleProcessLocker::~ScopedSingleProcessLocker()
     }
 }
 
+// #ifdef BUILD_BRIDGE
+// CarlaPlugin* newFailAsBridge(const CarlaPlugin::Initializer& init)
+// {
+//     init.engine->setLastError("Can't use this in plugin bridges");
+//     return nullptr;
+// }
+//
+// CarlaPlugin* CarlaPlugin::newNative(const Initializer& init)          { return newFailAsBridge(init); }
+// CarlaPlugin* CarlaPlugin::newGIG(const Initializer& init, const bool) { return newFailAsBridge(init); }
+// CarlaPlugin* CarlaPlugin::newSF2(const Initializer& init, const bool) { return newFailAsBridge(init); }
+// CarlaPlugin* CarlaPlugin::newSFZ(const Initializer& init, const bool) { return newFailAsBridge(init); }
+//
+// # ifdef WANT_NATIVE
+// size_t                  CarlaPlugin::getNativePluginCount()                  { return 0;       }
+// const PluginDescriptor* CarlaPlugin::getNativePluginDescriptor(const size_t) { return nullptr; }
+// # endif
+// #endif
+
 // -------------------------------------------------------------------
 
 CARLA_BACKEND_END_NAMESPACE
diff --git a/source/bridges/Makefile b/source/bridges/Makefile
index 7a5956dd2..579372b30 100644
--- a/source/bridges/Makefile
+++ b/source/bridges/Makefile
@@ -608,9 +608,18 @@ carla-bridge-win64.exe: $(FILES) $(OBJS_WIN64) ../libs/jackbridge-win64.dll
 ../backend/libcarla_native.a: .FORCE
 	$(MAKE) -C ../backend/native
 
+../libs/lilv.%.a: .FORCE
+	$(MAKE) -C ../libs lilv_$*
+
+../libs/rtmempool.%.a: .FORCE
+	$(MAKE) -C ../libs rtmempool_$*
+
 ../libs/%.a: .FORCE
 	$(MAKE) -C ../libs $*
 
+../libs/%.dll:
+	$(MAKE) -C ../libs $*
+
 # --------------------------------------------------------------
 
 doxygen: carla_bridge.doxygen
diff --git a/source/libs/jackbridge/JackBridge.hpp b/source/libs/jackbridge/JackBridge.hpp
index 0d0135bb4..b2f543577 100644
--- a/source/libs/jackbridge/JackBridge.hpp
+++ b/source/libs/jackbridge/JackBridge.hpp
@@ -28,6 +28,7 @@
 # include <jack/jack.h>
 # include <jack/midiport.h>
 # include <jack/transport.h>
+# include <jack/custom.h>
 #else
 
 #include <cstddef>
@@ -274,7 +275,9 @@ CARLA_EXPORT bool jackbridge_set_freewheel_callback(jack_client_t* client, JackF
 CARLA_EXPORT bool jackbridge_set_buffer_size_callback(jack_client_t* client, JackBufferSizeCallback bufsize_callback, void* arg);
 CARLA_EXPORT bool jackbridge_set_sample_rate_callback(jack_client_t* client, JackSampleRateCallback srate_callback, void* arg);
 CARLA_EXPORT bool jackbridge_set_client_registration_callback(jack_client_t* client, JackClientRegistrationCallback registration_callback, void* arg);
+#ifndef JACKBRIDGE_DIRECT
 CARLA_EXPORT bool jackbridge_set_client_rename_callback(jack_client_t* client, JackClientRenameCallback registration_callback, void* arg);
+#endif
 CARLA_EXPORT bool jackbridge_set_port_registration_callback(jack_client_t* client, JackPortRegistrationCallback registration_callback, void* arg);
 CARLA_EXPORT bool jackbridge_set_port_connect_callback(jack_client_t* client, JackPortConnectCallback connect_callback, void* arg);
 CARLA_EXPORT bool jackbridge_set_port_rename_callback(jack_client_t* client, JackPortRenameCallback rename_callback, void* arg);