use externally compiled secp256k1 on windows

neodix42 · Nov 30, 2024 · f699035 · f699035
1 parent 25b4c67
commit f699035
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 15 deletions.
diff --git a/CMake/BuildSECP256K1.cmake b/CMake/BuildSECP256K1.cmake
@@ -6,19 +6,7 @@ if (NOT SECP256K1_LIBRARY)
 
     file(MAKE_DIRECTORY ${SECP256K1_BINARY_DIR})
 
-    if (MSVC)
-      set(SECP256K1_BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third-party/secp256k1)
-      set(SECP256K1_LIBRARY ${SECP256K1_SOURCE_DIR}/build/src/Release/libsecp256k1.lib)
-      set(SECP256K1_INCLUDE_DIR ${SECP256K1_BINARY_DIR}/include)
-      add_custom_command(
-        WORKING_DIRECTORY ${SECP256K1_SOURCE_DIR}
-        COMMAND cmake -E env CFLAGS="/WX" cmake -A x64 -B build -DSECP256K1_ENABLE_MODULE_RECOVERY=ON -DSECP256K1_ENABLE_MODULE_EXTRAKEYS=ON -DSECP256K1_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF
-        COMMAND cmake --build build --config Release
-        COMMENT "Build Secp256k1"
-        DEPENDS ${SECP256K1_SOURCE_DIR}
-        OUTPUT ${SECP256K1_LIBRARY}
-      )
-    elseif (EMSCRIPTEN)
+    if (EMSCRIPTEN)
       set(SECP256K1_BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third-party/secp256k1)
       set(SECP256K1_LIBRARY ${SECP256K1_BINARY_DIR}/.libs/libsecp256k1.a)
       set(SECP256K1_INCLUDE_DIR ${SECP256K1_SOURCE_DIR}/include)
@@ -32,6 +20,18 @@ if (NOT SECP256K1_LIBRARY)
           DEPENDS ${SECP256K1_SOURCE_DIR}
           OUTPUT ${SECP256K1_LIBRARY}
       )
+    elseif (MINGW)
+        set(SECP256K1_LIBRARY ${SECP256K1_BINARY_DIR}/lib/libsecp256k1.a)
+        add_custom_command(
+            WORKING_DIRECTORY ${SECP256K1_SOURCE_DIR}
+            COMMAND bash autogen.sh
+            COMMAND bash configure -q --disable-option-checking --enable-module-recovery --enable-module-extrakeys --prefix ${SECP256K1_BINARY_DIR} --with-pic --disable-shared --enable-static --disable-tests --disable-benchmark
+            COMMAND make -j16
+            COMMAND make install
+            COMMENT "Build secp256k1"
+            DEPENDS ${SECP256K1_SOURCE_DIR}
+            OUTPUT ${SECP256K1_LIBRARY}
+        )
     else()
       if (NOT NIX)
         set(SECP256K1_LIBRARY ${SECP256K1_BINARY_DIR}/lib/libsecp256k1.a)

diff --git a/assembly/native/build-windows-2019.bat b/assembly/native/build-windows-2019.bat
@@ -58,6 +58,25 @@ cd ..\..\..\..
 echo Using lz4...
 )
 
+if not exist "secp256k1" (
+git clone https://github.com/bitcoin-core/secp256k1.git
+cd secp256k1
+git checkout v0.3.2
+cmake -G "Visual Studio 16 2019" -A x64 -S . -B build -DSECP256K1_ENABLE_MODULE_RECOVERY=ON -DBUILD_SHARED_LIBS=OFF
+IF %errorlevel% NEQ 0 (
+  echo Can't configure secp256k1
+  exit /b %errorlevel%
+)
+cmake --build build --config Release
+IF %errorlevel% NEQ 0 (
+  echo Can't install secp256k1
+  exit /b %errorlevel%
+)
+cd ..
+) else (
+echo Using secp256k1...
+)
+
 curl --retry 5 --retry-delay 10 -Lo libsodium-1.0.18-stable-msvc.zip https://download.libsodium.org/libsodium/releases/libsodium-1.0.18-stable-msvc.zip
 IF %errorlevel% NEQ 0 (
   echo Can't download libsodium
@@ -111,6 +130,9 @@ cd build
 cmake -GNinja  -DCMAKE_BUILD_TYPE=Release ^
 -DPORTABLE=1 ^
 -DSODIUM_USE_STATIC_LIBS=1 ^
+-DSECP256K1_FOUND=1 ^
+-DSECP256K1_INCLUDE_DIR=%root%\secp256k1\include ^
+-DSECP256K1_LIBRARY=%root%\secp256k1\build\src\Release\libsecp256k1.lib ^
 -DLZ4_FOUND=1 ^
 -DLZ4_INCLUDE_DIRS=%root%\lz4\lib ^
 -DLZ4_LIBRARIES=%root%\lz4\build\VS2017\liblz4\bin\x64_Release\liblz4_static.lib ^

diff --git a/assembly/native/build-windows.bat b/assembly/native/build-windows.bat
@@ -26,8 +26,6 @@ IF %errorlevel% NEQ 0 (
   exit /b %errorlevel%
 )
 
-rd /s /q ".\third-party\secp256k1\build"
-
 if not exist "zlib" (
 git clone https://github.com/madler/zlib.git
 cd zlib
@@ -60,6 +58,25 @@ cd ..\..\..\..
 echo Using lz4...
 )
 
+if not exist "secp256k1" (
+git clone https://github.com/bitcoin-core/secp256k1.git
+cd secp256k1
+git checkout v0.3.2
+cmake -G "Visual Studio 17 2022" -A x64 -S . -B build -DSECP256K1_ENABLE_MODULE_RECOVERY=ON -DBUILD_SHARED_LIBS=OFF
+IF %errorlevel% NEQ 0 (
+  echo Can't configure secp256k1
+  exit /b %errorlevel%
+)
+cmake --build build --config Release
+IF %errorlevel% NEQ 0 (
+  echo Can't install secp256k1
+  exit /b %errorlevel%
+)
+cd ..
+) else (
+echo Using secp256k1...
+)
+
 if not exist "libsodium" (
 curl  -Lo libsodium-1.0.18-stable-msvc.zip https://download.libsodium.org/libsodium/releases/libsodium-1.0.18-stable-msvc.zip
 IF %errorlevel% NEQ 0 (