Просмотр исходного кода

Fix build for libtiff&openimageio (#1208)

* Fix build for libtiff&openimageio

Signed-off-by: neverfelly <[email protected]>

* Add bsd support for libdeflate

Signed-off-by: neverfelly <[email protected]>
Shokuhou Misaki 3 лет назад
Родитель
Сommit
4023b478ac
2 измененных файлов с 3 добавлено и 2 удалено
  1. 1 1
      packages/l/libdeflate/xmake.lua
  2. 2 1
      packages/l/libtiff/xmake.lua

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

@@ -15,7 +15,7 @@ package("libdeflate")
         end
     end)
 
-    on_install("windows", "macosx", "linux", "android", "mingw", function (package)
+    on_install("windows", "macosx", "linux", "android", "mingw", "bsd", function (package)
         io.writefile("xmake.lua", [[
             add_rules("mode.debug", "mode.release")
             target("deflate")

+ 2 - 1
packages/l/libtiff/xmake.lua

@@ -11,9 +11,10 @@ package("libtiff")
 
     add_deps("zlib")
     add_deps("cmake")
+    add_deps("libdeflate")
 
     on_install("windows", "mingw", "macosx", "linux", "bsd", function (package)
-        local configs = {"-Dzstd=OFF", "-Dlzma=OFF", "-Dwebp=OFF", "-Djpeg=OFF", "-Djbig=OFF", "-Dpixarlog=OFF"}
+        local configs = {"-Dzstd=OFF", "-Dlzma=OFF", "-Dwebp=OFF", "-Djpeg=OFF", "-Djbig=OFF", "-Dpixarlog=OFF", "-Dlerc=OFF"}
         table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:debug() and "Debug" or "Release"))
         table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
         if package:config("pic") ~= false then