Initialize win32 stuff on discovery tools too

source/discovery/Makefile

@@ -35,7 +35,7 @@ BUILD_CXX_FLAGS += -ObjC++
 endif
 
 ifeq ($(WIN32),true)
-LINK_FLAGS += -mwindows
+LINK_FLAGS += -lole32 -mwindows
 endif
 
 32BIT_FLAGS += -DBUILD_BRIDGE -DBUILD_BRIDGE_ALTERNATIVE_ARCH

source/discovery/carla-discovery.cpp

@@ -33,6 +33,11 @@
 # import <Foundation/Foundation.h>
 #endif
 
+#ifdef CARLA_OS_WIN
+# include <pthread.h>
+# include <objbase.h>
+#endif
+
 #ifdef HAVE_FLUIDSYNTH
 # include <fluidsynth.h>
 #endif
@@ -1411,6 +1416,21 @@ int main(int argc, char* argv[])
         openLib = false;
 #endif
 
+    // ---------------------------------------------------------------------
+    // Initialize OS features
+
+#ifdef CARLA_OS_WIN
+    OleInitialize(nullptr);
+    CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED);
+# ifndef __WINPTHREADS_VERSION
+    // (non-portable) initialization of statically linked pthread library
+    pthread_win32_process_attach_np();
+    pthread_win32_thread_attach_np();
+# endif
+#endif
+
+    // ---------------------------------------------------------------------
+
     if (openLib)
     {
         handle = lib_open(filename);
@@ -1428,6 +1448,8 @@ int main(int argc, char* argv[])
     if (doInit && getenv("CARLA_DISCOVERY_NO_PROCESSING_CHECKS") != nullptr)
         doInit = false;
 
+    // ---------------------------------------------------------------------
+
     if (doInit && openLib && handle != nullptr)
     {
         // test fast loading & unloading DLL without initializing the plugin(s)
@@ -1480,6 +1502,17 @@ int main(int argc, char* argv[])
     if (openLib && handle != nullptr)
         lib_close(handle);
 
+    // ---------------------------------------------------------------------
+
+#ifdef CARLA_OS_WIN
+#ifndef __WINPTHREADS_VERSION
+    pthread_win32_thread_detach_np();
+    pthread_win32_process_detach_np();
+#endif
+    CoUninitialize();
+    OleUninitialize();
+#endif
+
     return 0;
 }