[win32] Various fixes

ossia · May 15, 2024 · 7bef967 · 7bef967
1 parent 8c04bfa
commit 7bef967
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/src/ossia-max/CMakeLists.txt b/src/ossia-max/CMakeLists.txt
@@ -103,7 +103,7 @@ use_gold(${PROJECT_NAME})
 add_linker_warnings_external(${PROJECT_NAME})
 
 target_link_libraries(${PROJECT_NAME} PRIVATE ossia
-# ${MAXSDK_API_LIBRARY}
+ $<LINK_ONLY:$<$<BOOL:${WIN32}>:${MAXSDK_API_LIBRARY}>>
  $<LINK_ONLY:re2::re2>
  $<LINK_ONLY:websocketpp::websocketpp>
 )

diff --git a/src/ossia-max/src/ossia-max.hpp b/src/ossia-max/src/ossia-max.hpp
@@ -13,7 +13,7 @@
 #include "assert.hpp"
 #include "attribute.hpp"
 #include "client.hpp"
-// #include "ocue.hpp"
+#include "ocue.hpp"
 #include "device.hpp"
 #include "explorer.hpp"
 #include "fuzzysearch.hpp"

diff --git a/src/ossia/detail/dylib_loader.hpp b/src/ossia/detail/dylib_loader.hpp
@@ -1,10 +1,12 @@
 #pragma once
-
-#if __has_include(<dlfcn.h>)
+#include <ossia/detail/config.hpp>
 #include <ossia/detail/fmt.hpp>
 
+#ifdef _WIN32
+#include <windows.h>
+#else
 #include <dlfcn.h>
-
+#endif
 #include <stdexcept>
 
 namespace ossia
@@ -14,7 +16,11 @@ class dylib_loader
 public:
  explicit dylib_loader(const char* const so)
  {
+#ifdef _WIN32
+ impl = (void*)LoadLibraryA(so);
+#else
  impl = dlopen(so, RTLD_LAZY | RTLD_LOCAL | RTLD_NODELETE);
+#endif
  if(!impl)
  {
  throw std::runtime_error(fmt::format("{}: not found. ", so));
@@ -28,7 +34,11 @@ class dylib_loader
 
  for(const auto so : sos)
  {
+#ifdef _WIN32
+ impl = (void*)LoadLibraryA(so.data());
+#else
  impl = dlopen(so.data(), RTLD_LAZY | RTLD_LOCAL | RTLD_NODELETE);
+#endif
  if(impl)
  return;
  }
@@ -55,14 +65,22 @@ class dylib_loader
  {
  if(impl)
  {
+#ifdef _WIN32
+ FreeLibrary((HMODULE)impl);
+#else
  dlclose(impl);
+#endif
  }
  }
 
  template <typename T>
  T symbol(const char* const sym) const noexcept
  {
+#ifdef _WIN32
+ return (T)GetProcAddress((HMODULE)impl, sym);
+#else
  return (T)dlsym(impl, sym);
+#endif
  }
 
  operator bool() const { return bool(impl); }
@@ -71,4 +89,3 @@ class dylib_loader
  void* impl{};
 };
 }
-#endif