Преглед на файлове

add sokol and mikktspace (#1033)

* update pybind11

* improve leptonica

* update libigl

* update stb

* add sokol

* update miniz

* update catch2

* add mikktspace

* fix miniz
Hoildkv преди 3 години
родител
ревизия
d5ca0a99e4

+ 1 - 0
packages/c/catch2/xmake.lua

@@ -6,6 +6,7 @@ package("catch2")
     set_license("BSL-1.0")
 
     add_urls("https://github.com/catchorg/Catch2/archive/v$(version).zip")
+    add_versions("2.13.8", "de0fd1f4c51a1021ffcb33a4d42028545bf1a0665a4ab59ddb839a0cc93f03a5")
     add_versions("2.13.7", "3f3ccd90ad3a8fbb1beeb15e6db440ccdcbebe378dfd125d07a1f9a587a927e9")
     add_versions("2.13.6", "39d50f5d1819cdf2908066664d57c2cde4a4000c364ad3376ea099735c896ff4")
     add_versions("2.13.5", "728679b056dc1248cc79b3a1999ff7453f76422c68417563fc47a0ac2aaeeaef")

+ 3 - 3
packages/i/imgui/xmake.lua

@@ -24,7 +24,7 @@ package("imgui")
     add_configs("user_config", {description = "Use user config (disables test!)", default = nil, type = "string"})
     add_configs("glfw_opengl3", {description = "Use glfw+opengl3 as backend", default = false, type = "boolean"})
 
-    add_includedirs("include", "include/imgui")
+    add_includedirs("include", "include/imgui", "include/backends")
 
     if is_plat("windows", "mingw") then
         add_syslinks("Imm32")
@@ -60,10 +60,10 @@ package("imgui")
                     add_packages(%s)
                     add_includedirs(".")
                     add_headerfiles("*.h", {prefixdir = "imgui"})
-                    add_headerfiles("backends/imgui_impl_glfw.h", "backends/imgui_impl_opengl3.h")
+                    add_headerfiles("(backends/imgui_impl_glfw.h)", "(backends/imgui_impl_opengl3.h)")
             ]], pkgs, pkgs)
             if package:version():ge("1.84") then
-                xmake_lua = xmake_lua .. "add_headerfiles(\"backends/imgui_impl_opengl3_loader.h\")\n"
+                xmake_lua = xmake_lua .. "add_headerfiles(\"(backends/imgui_impl_opengl3_loader.h)\")\n"
             else
                 xmake_lua = xmake_lua .. "add_defines(\"IMGUI_IMPL_OPENGL_LOADER_GLAD\")\n"
             end

+ 1 - 1
packages/l/leptonica/xmake.lua

@@ -11,7 +11,7 @@ package("leptonica")
     add_versions("1.82.0", "40fa9ac1e815b91e0fa73f0737e60c9eec433a95fa123f95f2573dd3127dd669")
 
     add_deps("cmake")
-    add_deps("libwebp", {configs = {img2webp = true, webpmux = true}})
+    add_deps("libwebp", {configs = {libwebpmux = true}})
     add_deps("zlib", "libtiff", "libpng", "libjpeg", "giflib")
     on_load("windows", function (package)
         if package:config("shared") then

+ 2 - 0
packages/l/libigl/xmake.lua

@@ -2,11 +2,13 @@ package("libigl")
 
     set_homepage("https://libigl.github.io/")
     set_description("Simple C++ geometry processing library.")
+    set_license("MPL-2.0")
 
     add_urls("https://github.com/libigl/libigl/archive/$(version).tar.gz",
              "https://github.com/libigl/libigl.git")
     add_versions("v2.2.0", "b336e548d718536956e2d6958a0624bc76d50be99039454072ecdc5cf1b2ede5")
     add_versions("v2.3.0", "9d6de3bdb9c1cfc61a0a0616fd96d14ef8465995600328c196fa672ee4579b70")
+    add_versions("v2.4.0", "f3f53ee6f1e9a6c529378c6b0439cd2cfc0e30b2178b483fe6bea169ce6deb22")
 
     add_resources("2.x", "libigl_imgui", "https://github.com/libigl/libigl-imgui.git", "7e1053e750b0f4c129b046f4e455243cb7f804f3")
 

+ 22 - 0
packages/m/mikktspace/xmake.lua

@@ -0,0 +1,22 @@
+package("mikktspace")
+
+    set_homepage("http://www.mikktspace.com/")
+    set_description("A common standard for tangent space used in baking tools to produce normal maps.")
+
+    add_urls("https://github.com/mmikk/MikkTSpace.git")
+    add_versions("2020.03.26", "3e895b49d05ea07e4c2133156cfa94369e19e409")
+
+    on_install(function (package)
+        io.writefile("xmake.lua", [[
+            add_rules("mode.debug", "mode.release")
+            target("mikktspace")
+                set_kind("$(kind)")
+                add_files("mikktspace.c")
+                add_headerfiles("mikktspace.h")
+        ]])
+        import("package.tools.xmake").install(package)
+    end)
+
+    on_test(function (package)
+        assert(package:has_cfuncs("genTangSpace", {includes = "mikktspace.h"}))
+    end)

+ 6 - 7
packages/m/miniz/xmake.lua

@@ -4,9 +4,12 @@ package("miniz")
     set_description("miniz: Single C source file zlib-replacement library")
     set_license("MIT")
 
-    add_urls("https://github.com/richgel999/miniz/archive/refs/tags/2.1.0.tar.gz",
+    add_urls("https://github.com/richgel999/miniz/archive/refs/tags/$(version).tar.gz",
              "https://github.com/richgel999/miniz.git")
     add_versions("2.1.0", "95f9b23c92219ad2670389a23a4ed5723b7329c82c3d933b7047673ecdfc1fea")
+    add_versions("2.2.0", "bd1136d0a1554520dcb527a239655777148d90fd2d51cf02c36540afc552e6ec")
+
+    add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})
 
     on_install(function (package)
         io.writefile("miniz_export.h", "#define MINIZ_EXPORT")
@@ -15,13 +18,9 @@ package("miniz")
             target("miniz")
                 set_kind("static")
                 add_files("miniz.c", "miniz_zip.c", "miniz_tinfl.c", "miniz_tdef.c")
-                add_headerfiles("miniz.h", "miniz_common.h", "miniz_zip.h", "miniz_tinfl.h", "miniz_tdef.h")
+                add_headerfiles("miniz.h", "miniz_export.h", "miniz_common.h", "miniz_zip.h", "miniz_tinfl.h", "miniz_tdef.h")
         ]])
-        local configs = {}
-        if package:is_plat("linux") and package:config("pic") ~= false then
-            configs.cxflags = "-fPIC"
-        end
-        import("package.tools.xmake").install(package, configs)
+        import("package.tools.xmake").install(package)
     end)
 
     on_test(function (package)

+ 1 - 0
packages/p/pybind11/xmake.lua

@@ -11,6 +11,7 @@ package("pybind11")
     add_versions("v2.6.2", "0bdb5fd9616fcfa20918d043501883bf912502843d5afc5bc7329a8bceb157b3")
     add_versions("v2.7.1", "350ebf8f4c025687503a80350897c95d8271bf536d98261f0b8ed2c1a697070f")
     add_versions("v2.8.1", "90907e50b76c8e04f1b99e751958d18e72c4cffa750474b5395a93042035e4a3")
+    add_versions("v2.9.1", "ef9e63be55b3b29b4447ead511a7a898fdf36847f21cec27a13df0db051ed96b")
 
     add_deps("cmake", "python 3.x")
 

+ 18 - 0
packages/s/sokol/xmake.lua

@@ -0,0 +1,18 @@
+package("sokol")
+
+    set_kind("library", {headeronly = true})
+    set_homepage("https://github.com/floooh/sokol")
+    set_description("Simple STB-style cross-platform libraries for C and C++, written in C.")
+    set_license("zlib")
+
+    add_urls("https://github.com/floooh/sokol.git")
+    add_versions("2022.02.10", "e8931e4399a0eb4bf026120d7bdb89825815af9e")
+
+    on_install(function (package)
+        os.cp("*.h", package:installdir("include"))
+        os.cp("util/*.h", package:installdir("include", "util"))
+    end)
+
+    on_test(function (package)
+        assert(package:has_cfuncs("sargs_setup", {includes = "sokol_args.h", defines = "SOKOL_IMPL"}))
+    end)

+ 2 - 1
packages/s/stb/xmake.lua

@@ -5,7 +5,8 @@ package("stb")
     set_description("single-file public domain (or MIT licensed) libraries for C/C++")
 
     add_urls("https://github.com/nothings/stb.git")
-    add_versions("0.0", "3a1174060a7dd4eb652d4e6854bc4cd98c159200")
+    add_versions("2021.07.13", "3a1174060a7dd4eb652d4e6854bc4cd98c159200")
+    add_versions("2021.09.10", "af1a5bc352164740c1cc1354942b1c6b72eacb8a")
     
     if is_plat("mingw") and is_subhost("msys") then
         add_extsources("pacman::stb")