update imgui and dxc (#438)

* update imgui

* make flann consistent

* update dxc

packages/d/directxshadercompiler/xmake.lua

@@ -4,18 +4,20 @@ package("directxshadercompiler")
     set_description("DirectX Shader Compiler")
     set_license("LLVM")
 
-    local date = {["1.5.2010"] = "2020_10-22"}
+    local date = {["1.5.2010"] = "2020_10-22",
+                  ["1.6.2104"] = "2021_04-20"}
     add_urls("https://github.com/microsoft/DirectXShaderCompiler/releases/download/v$(version).zip", {version = function (version) return version .. "/dxc_" .. date[tostring(version)] end})
     add_versions("1.5.2010", "b691f63778f470ebeb94874426779b2f60685fc8711adf1b1f9f01535d9b67f8")
+    add_versions("1.6.2104", "ee5e96d58134957443ded04be132e2e19240c534d7602e3ab8fd5adc5156014a")
 
-    set_kind("binary")
-
-    on_install("@windows|x64", function (package)
-        os.cp("bin/x64/**", package:installdir("bin"))
-        os.cp("inc/**", package:installdir("include"))
-        os.cp("lib", package:installdir())
+    on_install("windows|x64", function (package)
+        os.cp("bin/x64/*", package:installdir("bin"))
+        os.cp("inc/*", package:installdir("include"))
+        os.cp("lib/x64/*", package:installdir("lib"))
+        package:addenv("PATH", "bin")
     end)
 
     on_test(function (package)
         os.vrun("dxc -help")
+        assert(package:has_cxxfuncs("DxcCreateInstance", {includes = {"windows.h", "dxcapi.h"}}))
     end)

packages/f/flann/xmake.lua

@@ -20,10 +20,16 @@ package("flann")
         if package:config("with_cuda") then
             package:add("deps", "cuda", {system = true})
         end
+        local suffix = package:config("shared") and "" or "_s"
+        local libs = package:config("with_cuda") and {"flann"} or {"flann", "flann_cuda"}
+        for _, lib in ipairs(libs) do
+            package:add("links", lib .. suffix)
+        end
     end)
 
     on_install("windows", "linux", "macosx", function (package)
         os.cd("src/cpp")
+        io.replace("flann/util/serialization.h", "flann/ext/lz4", "lz4", {plain = true})
         io.replace("flann/defines.h", "#ifdef WIN32", "#ifdef _WIN32", {plain = true})
         io.writefile("xmake.lua", format([[
             add_rules("mode.debug", "mode.release")
@@ -36,6 +42,9 @@ package("flann")
                 end
                 add_cxxflags("/bigobj")
             end
+            if is_kind("static") then
+                set_suffixname("_s")
+            end
             target("flann")
                 set_kind("$(kind)")
                 add_files("flann/flann.cpp")
@@ -44,6 +53,12 @@ package("flann")
                 add_packages("lz4")
                 add_headerfiles("(flann/config.h)", "(flann/defines.h)", "(flann/flann.h)")
                 add_headerfiles("(flann/flann.hpp)", "(flann/general.h)", "(flann/algorithms/*.h)", "(flann/io/*.h)", "(flann/nn/*.h)", "(flann/util/*.h)")
+            target("flann_cpp") -- for cmake finding only
+                set_kind("$(kind)")
+                add_files("flann/flann_cpp.cpp")
+                add_includedirs(".")
+                add_includedirs("flann")
+                add_packages("lz4")
             target("flann_cuda")
                 set_enabled(%s)
                 set_kind("$(kind)")

packages/i/imgui/xmake.lua

@@ -6,6 +6,7 @@ package("imgui")
     add_urls("https://github.com/ocornut/imgui/archive/$(version).tar.gz",
              "https://github.com/ocornut/imgui.git")
 
+    add_versions("v1.83", "ccf3e54b8d1fa30dd35682fc4f50f5d2fe340b8e29e08de71287d0452d8cc3ff")
     add_versions("v1.82", "fefa2804bd55f3d25b134af08c0e1f86d4d059ac94cef3ee7bd21e2f194e5ce5")
     add_versions("v1.81", "f7c619e03a06c0f25e8f47262dbc32d61fd033d2c91796812bf0f8c94fca78fb")
     add_versions("v1.80", "d7e4e1c7233409018437a646680316040e6977b9a635c02da93d172baad94ce9")