]> gitweb.factorcode.org Git - factor.git/commitdiff
build-from-source.windows: use dll names as the libraries themselves
authorDoug Coleman <doug.coleman@gmail.com>
Wed, 25 Jan 2023 20:58:06 +0000 (14:58 -0600)
committerDoug Coleman <doug.coleman@gmail.com>
Thu, 26 Jan 2023 00:41:25 +0000 (18:41 -0600)
build them

extra/build-from-source/windows/windows.factor
extra/zeromq/ffi/ffi.factor

index 8ef3034b9a6896f9fa29ecf40b7c3e9c24a92863..64331aaba493701195fa69ae6b59d0bdc0e3a185 100644 (file)
@@ -62,6 +62,8 @@ IN: build-from-source.windows
         { "perl" "Configure" "-DOPENSSL_PIC" "VC-WIN64A" } try-process ! "VC-WIN32"
         { "nmake" } try-process
         { "apps/libssl-3-x64.dll" "apps/libcrypto-3-x64.dll" } copy-output-files
+        "apps/libssl-3-x64.dll" "libssl-38.dll" copy-output-file-as
+        "apps/libcrypto-3-x64.dll" "libcrypto-37.dll" copy-output-file-as
     ] with-updated-git-repo ;
 
 : build-cairo-dll ( -- )
@@ -217,7 +219,7 @@ IN: build-from-source.windows
         "builddir" prepend-current-path
         [
             { "ninja" } try-process
-            "lib/zstd-1.dll" "libzstd.dll" copy-output-file-as
+            "lib/zstd-1.dll" copy-output-file
         ] with-directory
     ] with-updated-git-repo ;
 
index 7a42f8b6cec3f3624ef1e79eb0245a1498ab8d9f..ed61dd07fabea802061148dfa59ee58e01e5245d 100644 (file)
@@ -8,7 +8,7 @@ combinators kernel literals math system ;
 IN: zeromq.ffi
 
 << "zmq" {
-    { [ os windows? ] [ "zmq.dll" ] }
+    { [ os windows? ] [ "libzmq.dll" ] }
     { [ os macosx? ] [ "libzmq.dylib" ] }
     { [ os unix? ] [ "libzmq.so" ] }
 } cond cdecl add-library >>