Browse Source

Auto-update moltenvk to v1.2.8 (#3540)

* Update moltenvk to v1.2.8

* Update macos_x86_64.yml

* Update xmake.lua

* Update macos_x86_64.yml

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

* Update xmake.lua

---------

Co-authored-by: Jérôme Leclercq <[email protected]>
ruki 1 year ago
parent
commit
0f1667c69e
1 changed files with 18 additions and 1 deletions
  1. 18 1
      packages/m/moltenvk/xmake.lua

+ 18 - 1
packages/m/moltenvk/xmake.lua

@@ -5,6 +5,7 @@ package("moltenvk")
 
     add_urls("https://github.com/KhronosGroup/MoltenVK/archive/refs/tags/$(version).tar.gz",
              "https://github.com/KhronosGroup/MoltenVK.git")
+    add_versions("v1.2.8", "85beaf8abfcc54d9da0ff0257ae311abd9e7aa96e53da37e1c37d6bc04ac83cd")
     add_versions("v1.2.7", "3166edcfdca886b4be1a24a3c140f11f9a9e8e49878ea999e3580dfbf9fe4bec")
     add_versions("v1.2.0", "6e7af2dad0530b2b404480dbe437ca4670c6615cc2ec6cf6a20ed04d9d75e0bd")
     add_versions("v1.1.5", "2cdcb8dbf2acdcd8cbe70b109dadc05a901038c84970afbe4863e5e23f33deae")
@@ -13,7 +14,18 @@ package("moltenvk")
 
     if is_plat("macosx") then
         add_extsources("brew::molten-vk")
-    end   
+    end
+
+    add_links("MoltenVKShaderConverter", "MoltenVK")
+
+    if is_plat("macosx", "iphoneos") then
+        add_frameworks("Metal", "Foundation", "QuartzCore", "CoreGraphics", "IOSurface")
+        if is_plat("macosx") then
+            add_frameworks("IOKit", "AppKit")
+        else
+            add_frameworks("UIKit")
+        end
+    end
 
     on_fetch("macosx", function (package, opt)
         if opt.system then
@@ -37,6 +49,11 @@ package("moltenvk")
         os.mv("Package/" .. conf .. "/MoltenVK/include", package:installdir())
         os.mv("Package/" .. conf .. "/MoltenVK/dylib/" ..plat .. "/*", package:installdir("lib"))
         os.mv("Package/" .. conf .. "/MoltenVK/MoltenVK.xcframework/" .. plat:lower() .. "-*/*.a", package:installdir("lib"))
+        if package:config("shared") then
+            os.mv("Package/" .. conf .. "/MoltenVK/dynamic/dylib/" .. plat .. "/*.dylib", package:installdir("lib"))
+        else
+            os.mv("Package/" .. conf .. "/MoltenVK/static/MoltenVK.xcframework/" .. plat:lower() .. "-*/*.a", package:installdir("lib"))
+        end
         os.mv("Package/" .. conf .. "/MoltenVKShaderConverter/Tools/*", package:installdir("bin"))
         os.mv("Package/" .. conf .. "/MoltenVKShaderConverter/MoltenVKShaderConverter.xcframework/" .. plat:lower() .. "-*/*.a", package:installdir("lib"))
         os.mv("Package/" .. conf .. "/MoltenVKShaderConverter/include/*.h", package:installdir("include"))