Update xmake.lua

packages/d/dxil-spirv/xmake.lua

@@ -3,27 +3,36 @@ package("dxil-spirv")
     set_description("DXIL conversion to SPIR-V for D3D12 translation libraries")
     set_license("LGPL-2.1")
 
-    add_urls("https://github.com/HansKristian-Work/dxil-spirv.git")
+    add_urls("https://github.com/HansKristian-Work/dxil-spirv.git", {submodules = false})
 
-    add_versions("2025.07.14", "7f9e648ac31e185d398f543e832c12d599e1f92b")
+    add_versions("2025.07.28", "bdb1bd679a0fa14f53585060c08e9dc2fd423da2")
 
-    add_configs("shared", {description = "Build shared library.", default = true, type = "boolean", readonly = true})
+    add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})
     add_configs("pic", {description = "Enable the position independent code.", default = true, type = "boolean", readonly = true})
     add_configs("tools", {description = "Build tools", default = false, type = "boolean", readonly = true})
 
     add_deps("cmake")
-    -- TODO: unbundle spirv-headers
+    add_deps("spirv-headers 3b9447dc98371e96b59a6225bd062a9867e1d203")
+
+    if is_plat("android") then
+        add_syslinks("log")
+    end
 
     on_install(function (package)
-        if package:is_plat("windows") and package:config("shared") then
-            package:add("defines", "DXIL_SPV_PUBLIC_API=__declspec(dllimport)")
-        end
+        io.replace("third_party/CMakeLists.txt", "add_subdirectory(spirv-headers EXCLUDE_FROM_ALL)", "find_package(SPIRV-Headers REQUIRED)", {plain = true})
+        io.replace("third_party/CMakeLists.txt", "target_link_libraries(glslang-spirv-builder PUBLIC dxil-spirv-headers)", "target_link_libraries(glslang-spirv-builder PUBLIC SPIRV-Headers::SPIRV-Headers)", {plain = true})
 
         local configs = {}
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release"))
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
         table.insert(configs, "-DDXIL_SPIRV_CLI=" .. (package:config("tools") and "ON" or "OFF"))
-        import("package.tools.cmake").install(package, configs)
+
+        local opt = {}
+        local spirv_headers = package:dep("spirv-headers")
+        if not spirv_headers:is_system() then
+            opt.cxflags = "-I" .. spirv_headers:installdir("include/spirv/unified1")
+        end
+        import("package.tools.cmake").install(package, configs, opt)
 
         io.replace(package:installdir("include/dxil-spirv/dxil_spirv_c.h"), "\tbool supported;", "\tdxil_spv_bool supported;", {plain = true})
     end)