diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index f5ab767..1feca25 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -21,7 +21,7 @@ jobs: id: vcpkg with: pkgs: folly hyperscan - triplet: x64-windows + triplet: x64-windows-static token: ${{ github.token }} github-binarycache: true - uses: xmake-io/github-action-setup-xmake@master diff --git a/xmake.lua b/xmake.lua index a2b6320..2f1207c 100644 --- a/xmake.lua +++ b/xmake.lua @@ -195,15 +195,21 @@ target("pal-plugin-loader-static") add_ldflags("-fPIC", "-static", "-pie", "-Wl,--no-as-needed -ldl") end + add_includedirs(path.join(os.scriptdir(), "include/sdk/SDK")) add_includedirs(path.join(os.scriptdir(), "include/sdk/SDK")) add_includedirs(path.join(os.scriptdir(), "include/dotnet")) add_includedirs(path.join(os.scriptdir(), "include/sdk")) add_includedirs(path.join(os.scriptdir(), "include")) + + + if is_os("windows") then add_includedirs(path.join(os.scriptdir(), "include/os/windows/sdk")) add_includedirs(path.join(os.scriptdir(), "include/os/windows")) + add_includedirs("$(env VCPKG_ROOT)/installed/x64-windows-static/include") + add_files("src/os/windows/*.cpp") else add_includedirs(path.join(os.scriptdir(), "include/os/linux/sdk"))