clap

commit 8382b2070b90dabfd833c61567d197942c2923d5
parent 2c4e33a691bbc1e435f1962e9be8614bd43b75dd
Author: Alexandre Bique <bique.alexandre@gmail.com>
Date:   Sun, 18 Jul 2021 04:19:54 +0200

Merge pull request #15 from baconpaul/subm-and-mac-tweaks

Tweaks for SubModule usage and Mac Debugging
Diffstat:
M
CMakeLists.txt
 | 
9
+++++++++
M
examples/host/application.cc
 | 
10
++++++++++
M
examples/host/plugin-host.cc
 | 
3
++-

3 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,4 +15,13 @@ add_custom_target(clap-compile-tests DEPENDS clap-compile-test-c clap-compile-te
 
 add_subdirectory(examples)
 
+# If you use clap as a submodule of your plugin you need some interface projects
+# to allow you to link. clap-core gives you the include directory and clap-plugin-core
+# gives you the core + plugin-glue.
+add_library(clap-core INTERFACE)
+target_include_directories(clap-core INTERFACE include)
+
+add_library(clap-plugin-core INTERFACE)
+target_link_libraries(clap-plugin-core INTERFACE clap-core clap-plugin-glue)
+
 install(DIRECTORY include DESTINATION "${CMAKE_INSTALL_PREFIX}")
 \ No newline at end of file
diff --git a/examples/host/application.cc b/examples/host/application.cc
@@ -38,6 +38,16 @@ Application::Application(int argc, char **argv)
 
    engine_->setParentWindow(mainWindow_->getEmbedWindowId());
 
+   /*
+    * This is here JUST because macOS and QT don't process command lines properly
+    * and I'm not sure why yet.
+    */
+   if (getenv("CLAP_HOST_FORCE_PLUGIN")) {
+      qWarning() << "Warning: Loading plugin from ENV, not command line";
+      pluginPath_ = getenv("CLAP_HOST_FORCE_PLUGIN");
+      pluginIndex_ = 0;
+   }
+
    if (engine_->loadPlugin(pluginPath_, pluginIndex_))
       engine_->start();
 }
diff --git a/examples/host/plugin-host.cc b/examples/host/plugin-host.cc
@@ -110,13 +110,14 @@ bool PluginHost::load(const QString &path, int pluginIndex) {
    library_.setLoadHints(QLibrary::ResolveAllSymbolsHint | QLibrary::DeepBindHint);
    if (!library_.load()) {
       QString err = library_.errorString();
-      qWarning() << "failed to load " << path << ": " << err;
+      qWarning() << "Failed to load plugin '" << path << "': " << err;
       return false;
    }
 
    pluginEntry_ =
       reinterpret_cast<const struct clap_plugin_entry *>(library_.resolve("clap_plugin_entry"));
    if (!pluginEntry_) {
+      qWarning() << "Unable to resolve entry point 'clap_plugin_entry' in '" << path << "'";
       library_.unload();
       return false;
    }