Browse Source

Avoid libdl symbols for !HAVE_JACK and STATIC_BUILD

Signed-off-by: falkTX <falktx@falktx.com>
pull/321/head
falkTX 3 years ago
parent
commit
1cc5641ba7
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
1 changed files with 16 additions and 11 deletions
  1. +16
    -11
      distrho/src/jackbridge/JackBridge.cpp

+ 16
- 11
distrho/src/jackbridge/JackBridge.cpp View File

@@ -34,7 +34,12 @@
#endif #endif


#include <cerrno> #include <cerrno>
#include "../../extra/LibraryUtils.hpp"

#ifdef HAVE_JACK
# include "../../extra/LibraryUtils.hpp"
#else
typedef void* lib_t;
#endif


// in case JACK fails, we fallback to native bridges simulating JACK API // in case JACK fails, we fallback to native bridges simulating JACK API
#include "NativeBridge.hpp" #include "NativeBridge.hpp"
@@ -339,9 +344,9 @@ struct JackBridge {
jacksym_remove_all_properties remove_all_properties_ptr; jacksym_remove_all_properties remove_all_properties_ptr;
jacksym_set_property_change_callback set_property_change_callback_ptr; jacksym_set_property_change_callback set_property_change_callback_ptr;


#ifdef __WINE__
#ifdef __WINE__
jacksym_set_thread_creator set_thread_creator_ptr; jacksym_set_thread_creator set_thread_creator_ptr;
#endif
#endif


JackBridge() JackBridge()
: lib(nullptr), : lib(nullptr),
@@ -437,14 +442,11 @@ struct JackBridge {
remove_properties_ptr(nullptr), remove_properties_ptr(nullptr),
remove_all_properties_ptr(nullptr), remove_all_properties_ptr(nullptr),
set_property_change_callback_ptr(nullptr) set_property_change_callback_ptr(nullptr)
#ifdef __WINE__
#ifdef __WINE__
, set_thread_creator_ptr(nullptr) , set_thread_creator_ptr(nullptr)
#endif
#endif
{ {
#ifndef HAVE_JACK
return;
#endif

#ifdef HAVE_JACK
#if defined(DISTRHO_OS_MAC) #if defined(DISTRHO_OS_MAC)
const char* const filename = "libjack.dylib"; const char* const filename = "libjack.dylib";
#elif defined(DISTRHO_OS_WINDOWS) && defined(_WIN64) #elif defined(DISTRHO_OS_WINDOWS) && defined(_WIN64)
@@ -585,14 +587,16 @@ struct JackBridge {
LIB_SYMBOL(remove_all_properties) LIB_SYMBOL(remove_all_properties)
LIB_SYMBOL(set_property_change_callback) LIB_SYMBOL(set_property_change_callback)


#ifdef __WINE__
#ifdef __WINE__
LIB_SYMBOL(set_thread_creator) LIB_SYMBOL(set_thread_creator)
#endif
#endif
#endif


#undef JOIN #undef JOIN
#undef LIB_SYMBOL #undef LIB_SYMBOL
} }


#ifdef HAVE_JACK
~JackBridge() noexcept ~JackBridge() noexcept
{ {
USE_NAMESPACE_DISTRHO USE_NAMESPACE_DISTRHO
@@ -603,6 +607,7 @@ struct JackBridge {
lib = nullptr; lib = nullptr;
} }
} }
#endif


DISTRHO_DECLARE_NON_COPYABLE(JackBridge); DISTRHO_DECLARE_NON_COPYABLE(JackBridge);
}; };


Loading…
Cancel
Save