Drop lib prefix on win32 + unencap

quil-lang · Dec 12, 2024 · ee3e06b · ee3e06b
1 parent 65bb08b
commit ee3e06b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -10,6 +10,10 @@ add_library(sbcl_librarian SHARED sbcl_librarian.c sbcl_librarian.h sbcl_librari
 target_link_directories(sbcl_librarian PRIVATE $ENV{BUILD_PREFIX}/lib)
 target_link_libraries(sbcl_librarian PUBLIC sbcl)
 
+if(WIN32)
+  set_target_properties(sbcl_librarian PROPERTIES PREFIX "")
+endif(WIN32)
+
 add_custom_command(
   OUTPUT sbcl_librarian.c sbcl_librarian.h
   COMMAND ${CMAKE_COMMAND} -E env CL_SOURCE_REGISTRY=${CMAKE_CURRENT_SOURCE_DIR}/..// sh $ENV{SBCL_SRC}/run-sbcl.sh --script ${CMAKE_CURRENT_SOURCE_DIR}/generate-bindings.lisp

diff --git a/lib/generate-bindings.lisp b/lib/generate-bindings.lisp
@@ -89,10 +89,14 @@
 #+win32
 (sb-int:encapsulate
  'sb-alien::find-dynamic-foreign-symbol-address
- 'find-libsbcl-librarian
+ 'load-libsbcl-librarian
  (lambda (orig-find symbol)
    (load-shared-object "libsbcl_librarian.dll")
-   (funcall orig-find symbol)))
+   (unwind-protect
+        (funcall orig-find symbol)
+     (sb-int:unencapsulate
+      'sb-alien::find-dynamic-foreign-symbol-address
+      'load-libsbcl-librarian))))
 
 (build-bindings sbcl-librarian "." :omit-init-function t)
 (build-python-bindings sbcl-librarian "." :omit-init-call t :write-python-header-fn #'write-python-header)