remove python dep

xmake-io · Mar 4, 2025 · 1861a0f · 1861a0f
1 parent a1133aa
commit 1861a0f
Showing 1 changed file with 12 additions and 22 deletions.
diff --git a/packages/s/sokol-tools/xmake.lua b/packages/s/sokol-tools/xmake.lua
@@ -7,33 +7,23 @@ package("sokol-tools")
     add_urls("https://github.com/floooh/sokol-tools.git")
     add_versions("2025.02.10", "227e74250e853c0e02e8c77accbe8b31111410be")
 
-    add_deps("cmake", "python 3.x")
+    add_resources(">=2025.02", "fips", "https://github.com/floooh/fips.git", "3fb2f75b8735552c4aae96d4c83d9aa18e6a2800")
 
-    on_install("@macosx", "@linux", "@windows|x64", function (package)
-        if os.isdir("fips-build") then
-            os.tryrm("./fips-deploy")
-            os.tryrm("./fips-build")
-            os.tryrm("./fips")
+    add_deps("cmake")
+
+    on_install("@macosx", "@linux", "@windows", function (package)
+        local configs = {}
+        table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
+        local fipsdir = package:resourcefile("fips")
+        print(fipsdir)
+        if os.isdir("sokol-tools") then
             os.cd("sokol-tools")
             package:set("sourcedir", "sokol-tools")
         end
-        if package:is_plat("macosx") then
-            os.vrunv("./fips", {"set", "config", "osx-xcode-release"}, {shell = true})
-            os.vrunv("./fips", {"build"}, {shell = true})
-            os.cp("../fips-deploy/sokol-tools/osx-xcode-release/*", package:installdir("bin"))
-        elseif package:is_plat("linux") then
-            io.replace("src/shdc/CMakeLists.txt", "-static", "", {plain = true})
-            os.vrunv("./fips", {"set", "config", "linux-make-release"}, {shell = true})
-            os.vrunv("./fips", {"build"}, {shell = true})
-            os.cp("../fips-deploy/sokol-tools/linux-make-release/*", package:installdir("bin"))
-        elseif package:is_plat("windows") then
-            os.vrunv("fips.cmd", {"set", "config", "win64-vstudio-release"})
-            os.vrunv("fips.cmd", {"build"})
-            os.cp("../fips-deploy/sokol-tools/win64-vstudio-release/*", package:installdir("bin"))
+        if fipsdir then
+            os.cp(fipsdir, "../fips")
         end
-        os.tryrm("../fips-deploy")
-        os.tryrm("../fips-build")
-        os.tryrm("../fips")
+        import("package.tools.cmake").install(package, configs)
     end)
 
     on_test(function (package)