Skip to content

Commit 9aac63a

Browse files
committed
-
1 parent 5d0a3e8 commit 9aac63a

2 files changed

Lines changed: 12 additions & 8 deletions

File tree

.github/workflows/windows.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ jobs:
4646
if: steps.cache-xmake.outputs.cache-hit != 'true'
4747
run: |
4848
# xmake g --pkg_installdir=./cache/.xmake/packages
49-
xmake f -vD -y -F --openssl_no_sys=y
49+
xmake f -vD -y
5050
5151
- name: Build
5252
run: |
53-
xmake -vrDw -y -F
53+
xmake -vrDw -y
5454
5555
- name: Package
5656
run: |
57-
xmake pack -y -o ./ -F
57+
xmake pack -y -o ./
5858
5959
- name: Upload Artifact
6060
uses: actions/upload-artifact@v4

xmake.lua

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,20 @@ if is_os("windows") then
3131
-- add_defines("HCPP_XMAKE_WINDOWS")
3232

3333
add_requires("asio 1.28.0",{verify = false})
34-
add_requires("openssl3",{verify = false})
34+
add_requires("openssl3",{verify = false},{system = false})
3535
add_requires("lsf")
3636
openssl_package_name = "openssl3"
3737
platform_cpp_file="src/os/windows.cpp"
3838

39-
option("openssl_no_sys")
40-
set_default(false)
41-
add_requireconfs(openssl_package_name,{system = false})
39+
-- option("openssl_no_sys")
40+
-- set_default(false)
41+
-- after_check(function (option)
42+
-- if option:enabled() then
43+
-- add_requireconfs(openssl_package_name,{system = false})
44+
-- end
45+
-- end)
4246

43-
add_options("openssl_no_sys")
47+
-- add_options("openssl_no_sys")
4448
else
4549
set_allowedmodes("debug")
4650
set_defaultmode("debug")

0 commit comments

Comments
 (0)