force include vcpkg include dir for windows build

VeroFess · Feb 13, 2024 · 6d435d9 · 6d435d9
1 parent f104cbb
commit 6d435d9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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"))