Link self-build zlib

simdsoft · Oct 23, 2024 · d558883 · d558883
1 parent 718a64c
commit d558883
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/build.ps1 b/build.ps1
@@ -233,6 +233,7 @@ Foreach ($lib_name in $libs) {
     Push-Location $lib_src
     $install_dir = Join-Path $install_root $lib_name
     mkdirs $install_dir
+    Set-Variable -Name "${lib_name}_install_dir" -Value $install_dir -Scope Global
     if ($build_conf.cb_tool -ne 'custom') {
         $_config_options = $build_conf.options
         if ($build_conf.cb_tool -eq 'cmake') {

diff --git a/src/curl/build.yml b/src/curl/build.yml
@@ -3,7 +3,7 @@ ver: 8.10.1
 tag_prefix: curl-
 tag_dot2ul: true
 cb_tool: cmake
-options: -DUSE_NGHTTP2=OFF -DCURL_DISABLE_LDAP=TRUE -DUSE_LIBIDN2=FALSE -DCURL_USE_LIBSSH2=FALSE -DBUILD_CURL_EXE=FALSE -DCURL_DISABLE_TESTS=TRUE -DCURL_USE_OPENSSL=TRUE -DOPENSSL_ROOT_DIR=$openssl_dir
-options_cross: -DCMAKE_FIND_ROOT_PATH=$openssl_dir
+options: -DZLIB_ROOT=$zlib_install_dir -DUSE_NGHTTP2=OFF -DCURL_DISABLE_LDAP=TRUE -DUSE_LIBIDN2=FALSE -DCURL_USE_LIBSSH2=FALSE -DBUILD_CURL_EXE=FALSE -DCURL_DISABLE_TESTS=TRUE -DCURL_USE_OPENSSL=TRUE -DOPENSSL_ROOT_DIR=$openssl_install_dir
+options_cross: -DCMAKE_FIND_ROOT_PATH=$openssl_install_dir
 options_unix: -DBUILD_SHARED_LIBS=OFF
 options_msw: -DBUILD_SHARED_LIBS=ON
diff --git a/src/openssl/build1.ps1 b/src/openssl/build1.ps1
@@ -129,4 +129,3 @@ else {
     }
 }
 
-$Global:openssl_dir = $install_dir