Fix build scripts

tindy2013 · Dec 11, 2023 · 18fea93 · 18fea93
1 parent a4a273d
commit 18fea93
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/scripts/Dockerfile b/scripts/Dockerfile
@@ -46,6 +46,7 @@ RUN set -xe && \
     source "$HOME/.xmake/profile" && \
     xmake f --root --static=false -m release -y -v && \
     xmake --root -v subconverter && \
+    cp "$(find build -type f -name subconverter)" . && \
     python3 -m ensurepip && \
     python3 -m pip install gitpython && \
     python3 scripts/update_rules.py -c scripts/rules_config.conf

diff --git a/scripts/build.windows.release.sh b/scripts/build.windows.release.sh
@@ -53,7 +53,7 @@ set -xe
 
 xmake f --root --static=true -m release -y -v
 xmake --root -v subconverter
-cp "$(find build -name subconverter -type f)" base/subconverter
+cp "$(find build -name subconverter.exe -type f)" base/subconverter.exe
 
 python -m ensurepip
 python -m pip install gitpython

diff --git a/xmake/curl-static.lua b/xmake/curl-static.lua
@@ -9,9 +9,9 @@ package("curl-static")
         add_deps("mbedtls")
         add_syslinks("pthread")
     elseif is_plat("windows", "mingw") then
-        add_deps("zlib")
         add_syslinks("advapi32", "crypt32", "wldap32", "winmm", "ws2_32", "user32", "bcrypt")
     end
+    add_deps("zlib")
 
     on_install(function (package)
                 local configs = {}