Browse Source

fix assimp with minizip/bzip2 #8329 (#8339)

ruki 2 months ago
parent
commit
50b53fb582
1 changed files with 6 additions and 0 deletions
  1. 6 0
      packages/a/assimp/xmake.lua

+ 6 - 0
packages/a/assimp/xmake.lua

@@ -143,6 +143,9 @@ package("assimp")
             local minizip = package:dep("minizip")
             if minizip and not minizip:is_system() then
                 packagedeps = table.join2(packagedeps or {}, "minizip")
+                if minizip:config("bzip2") then
+                    table.insert(packagedeps, "bzip2")
+                end
             end
             -- fix ninja debug build
             os.mkdir(path.join(package:buildir(), "code/pdb"))
@@ -150,6 +153,9 @@ package("assimp")
             if package:is_debug() and package:has_runtime("MD", "MT") then
                 io.replace("CMakeLists.txt", "/D_DEBUG", "", {plain = true})
             end
+
+            -- fix std::min/max conflict with windows.h
+            io.insert("code/AssetLib/IFC/IFCLoader.cpp", 1, "#define NOMINMAX")
         end
 
         local zlib = package:dep("zlib")