diff options
Diffstat (limited to '3rdparty/bimg/scripts/bimg_encode.lua')
-rw-r--r-- | 3rdparty/bimg/scripts/bimg_encode.lua | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/3rdparty/bimg/scripts/bimg_encode.lua b/3rdparty/bimg/scripts/bimg_encode.lua index 06649108b82..6bc48d345e0 100644 --- a/3rdparty/bimg/scripts/bimg_encode.lua +++ b/3rdparty/bimg/scripts/bimg_encode.lua @@ -1,5 +1,5 @@ -- --- Copyright 2010-2018 Branimir Karadzic. All rights reserved. +-- Copyright 2010-2022 Branimir Karadzic. All rights reserved. -- License: https://github.com/bkaradzic/bx#license-bsd-2-clause -- @@ -7,11 +7,12 @@ project "bimg_encode" kind "StaticLib" includedirs { - path.join(BX_DIR, "include"), path.join(BIMG_DIR, "include"), path.join(BIMG_DIR, "3rdparty"), - path.join(BIMG_DIR, "3rdparty/nvtt"), + path.join(BIMG_DIR, "3rdparty/astc-encoder/include"), path.join(BIMG_DIR, "3rdparty/iqa/include"), + path.join(BIMG_DIR, "3rdparty/nvtt"), + path.join(BIMG_DIR, "3rdparty/tinyexr/deps/miniz"), } files { @@ -30,16 +31,35 @@ project "bimg_encode" path.join(BIMG_DIR, "3rdparty/nvtt/**.h"), path.join(BIMG_DIR, "3rdparty/pvrtc/**.cpp"), path.join(BIMG_DIR, "3rdparty/pvrtc/**.h"), - path.join(BIMG_DIR, "3rdparty/astc/**.cpp"), - path.join(BIMG_DIR, "3rdparty/astc/**.h"), path.join(BIMG_DIR, "3rdparty/tinyexr/**.h"), path.join(BIMG_DIR, "3rdparty/iqa/include/**.h"), path.join(BIMG_DIR, "3rdparty/iqa/source/**.c"), } + using_bx() + + configuration {} + + removeflags { + "FloatFast", -- astc-encoder doesn't work with it. + } + configuration { "linux-*" } buildoptions { "-fPIC", } + configuration { "mingw* or linux* or osx*" } + buildoptions { + "-Wno-implicit-fallthrough", + "-Wno-shadow", + "-Wno-shift-negative-value", + "-Wno-undef", + } + + buildoptions_cpp { + "-Wno-class-memaccess", + "-Wno-deprecated-copy", + } + configuration {} |