enable uplink in MinGW 32-bit

Fsu0413 · Jan 3, 2024 · 418ab94 · 418ab94
1 parent 1c250b8
commit 418ab94
Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -428,8 +428,7 @@ foreach (_CIPHER IN ITEMS
     elseif (_CIPHER STREQUAL "default-thread-pool")
         cmake_dependent_option("${_CIPHER_STR}" "${_CIPHER_HELP}" "${_CIPHER_DEFAULT}" "OPENSSL_THREAD_POOL" OFF)
     elseif (_CIPHER STREQUAL "uplink")
-        # cmake_dependent_option("${_CIPHER_STR}" "${_CIPHER_HELP}" "${_CIPHER_DEFAULT}" "WIN32;MSVC OR ( OPENSSL_TARGET_ARCH STREQUAL \"x86\" );NOT OPENSSL_386;BUILD_SHARED_LIBS" OFF)
-        cmake_dependent_option("${_CIPHER_STR}" "${_CIPHER_HELP}" "${_CIPHER_DEFAULT}" "MSVC;NOT OPENSSL_386;BUILD_SHARED_LIBS" OFF)
+        cmake_dependent_option("${_CIPHER_STR}" "${_CIPHER_HELP}" "${_CIPHER_DEFAULT}" "WIN32;MSVC OR ( OPENSSL_TARGET_ARCH STREQUAL \"x86\" );NOT OPENSSL_386;BUILD_SHARED_LIBS" OFF)
     else()
         option("${_CIPHER_STR}" "${_CIPHER_HELP}" "${_CIPHER_DEFAULT}")
     endif()

diff --git a/crypto/uplink/objects.cmake b/crypto/uplink/objects.cmake
@@ -46,8 +46,13 @@ elseif ( OPENSSL_TARGET_ARCH STREQUAL "x86" )
         set(LIBCRYPTO_CURRENTDIR_ASM_SOURCES
             ${CMAKE_SOURCE_DIR}/openssl/ms/uplink.c
             ${CMAKE_SOURCE_DIR}/openssl/ms/uplink.h
-            # uplink-x86.S${OPENSSL_ASM_PREPROCESSED_X86} # ACTUALLY unused!
         )
+        if (NOT MSVC)
+            set(LIBCRYPTO_CURRENTDIR_ASM_SOURCES
+                ${LIBCRYPTO_CURRENTDIR_ASM_SOURCES}
+                uplink-x86.S${OPENSSL_ASM_PREPROCESSED_X86}
+            )
+        endif()
     endif()
 elseif ( OPENSSL_TARGET_ARCH STREQUAL "arm32" )
     # no-asm