Fix some details for macOS

Signed-off-by: falkTX <falktx@falktx.com>

Author: falkTX

.github/workflows/build.yml

@@ -14,7 +14,6 @@ env:
   PAWPAW_VERSION: 70160711d2efec286d417b63a073a8f2012346f6
 
 jobs:
-  # macOS native universal build
   macos_universal:
     runs-on: macos-11
     steps:

CMakeLists.txt

@@ -113,6 +113,11 @@ if(APPLE)
   add_custom_command(TARGET Chibi POST_BUILD
     COMMAND cp "${QtPluginsDir}/styles/libqmacstyle.dylib" "$<TARGET_BUNDLE_DIR:Chibi>/Contents/PlugIns/styles/"
   )
+  add_custom_command(TARGET Chibi POST_BUILD
+    COMMAND cp "${CMAKE_CURRENT_BINARY_DIR}/carla/lib/carla-bridge-native"
+               "${CMAKE_CURRENT_BINARY_DIR}/carla/lib/carla-discovery-native"
+               "$<TARGET_BUNDLE_DIR:Chibi>/Contents/MacOS/"
+  )
   add_custom_command(TARGET Chibi POST_BUILD
     COMMAND macdeployqt $<TARGET_BUNDLE_DIR:Chibi> -dmg
   )

carla

@@ -20,6 +20,29 @@
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QMessageBox>
 
+#ifdef CARLA_OS_MAC
+# include <dlfcn.h>
+// override for custom location
+const char* carla_get_library_folder()
+{
+    struct _ {
+        static std::string getExecutableDir()
+        {
+            Dl_info dlinfo = {};
+            dladdr(reinterpret_cast<const void*>(::carla_get_library_folder), &dlinfo);
+
+            if (const char* const lastsep = std::strrchr(dlinfo.dli_fname, '/'))
+                return std::string(dlinfo.dli_fname, lastsep - dlinfo.dli_fname);
+
+            return {};
+        }
+    };
+
+    static std::string path(_::getExecutableDir());
+    return path.c_str();
+}
+#endif
+
 CARLA_BACKEND_USE_NAMESPACE;
 
 int main(int argc, char *argv[])