summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/bimg/scripts
diff options
context:
space:
mode:
author mooglyguy <therealmogminer@gmail.com>2018-12-05 19:45:08 +0100
committer mooglyguy <therealmogminer@gmail.com>2018-12-05 19:45:08 +0100
commit0bd02131b644b61088789f52f31b750c9aecaa6d (patch)
tree811c679a1bba8b24fc7967cdfe73640254d64156 /3rdparty/bimg/scripts
parent9a81ec7eaf00d73a23db5c003dc45b55d4b76c4a (diff)
3rdparty: Updated bgfx, bimg, and bx to latest upstream. [Ryan Holtz]
Diffstat (limited to '3rdparty/bimg/scripts')
-rw-r--r--3rdparty/bimg/scripts/bimg.lua13
-rw-r--r--3rdparty/bimg/scripts/bimg_decode.lua2
-rw-r--r--3rdparty/bimg/scripts/bimg_encode.lua5
-rw-r--r--3rdparty/bimg/scripts/genie.lua4
-rw-r--r--3rdparty/bimg/scripts/texturec.lua22
5 files changed, 21 insertions, 25 deletions
diff --git a/3rdparty/bimg/scripts/bimg.lua b/3rdparty/bimg/scripts/bimg.lua
index b1f56d1d225..a70460ef092 100644
--- a/3rdparty/bimg/scripts/bimg.lua
+++ b/3rdparty/bimg/scripts/bimg.lua
@@ -1,8 +1,18 @@
--
--- Copyright 2010-2017 Branimir Karadzic. All rights reserved.
+-- Copyright 2010-2018 Branimir Karadzic. All rights reserved.
-- License: https://github.com/bkaradzic/bx#license-bsd-2-clause
--
+function filesexist(_srcPath, _dstPath, _files)
+ for _, file in ipairs(_files) do
+ file = path.getrelative(_srcPath, file)
+ local filePath = path.join(_dstPath, file)
+ if not os.isfile(filePath) then return false end
+ end
+
+ return true
+end
+
project "bimg"
kind "StaticLib"
@@ -14,6 +24,7 @@ project "bimg"
files {
path.join(BIMG_DIR, "include/**"),
path.join(BIMG_DIR, "src/image.*"),
+ path.join(BIMG_DIR, "src/image_gnf.cpp"),
}
configuration { "linux-*" }
diff --git a/3rdparty/bimg/scripts/bimg_decode.lua b/3rdparty/bimg/scripts/bimg_decode.lua
index 743d0ec59e1..ca045ed1b92 100644
--- a/3rdparty/bimg/scripts/bimg_decode.lua
+++ b/3rdparty/bimg/scripts/bimg_decode.lua
@@ -1,5 +1,5 @@
--
--- Copyright 2010-2017 Branimir Karadzic. All rights reserved.
+-- Copyright 2010-2018 Branimir Karadzic. All rights reserved.
-- License: https://github.com/bkaradzic/bx#license-bsd-2-clause
--
diff --git a/3rdparty/bimg/scripts/bimg_encode.lua b/3rdparty/bimg/scripts/bimg_encode.lua
index 44021dc44a7..06649108b82 100644
--- a/3rdparty/bimg/scripts/bimg_encode.lua
+++ b/3rdparty/bimg/scripts/bimg_encode.lua
@@ -1,5 +1,5 @@
--
--- Copyright 2010-2017 Branimir Karadzic. All rights reserved.
+-- Copyright 2010-2018 Branimir Karadzic. All rights reserved.
-- License: https://github.com/bkaradzic/bx#license-bsd-2-clause
--
@@ -17,6 +17,7 @@ project "bimg_encode"
files {
path.join(BIMG_DIR, "include/**"),
path.join(BIMG_DIR, "src/image_encode.*"),
+ path.join(BIMG_DIR, "src/image_cubemap_filter.*"),
path.join(BIMG_DIR, "3rdparty/libsquish/**.cpp"),
path.join(BIMG_DIR, "3rdparty/libsquish/**.h"),
path.join(BIMG_DIR, "3rdparty/edtaa3/**.cpp"),
@@ -29,6 +30,8 @@ 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"),
diff --git a/3rdparty/bimg/scripts/genie.lua b/3rdparty/bimg/scripts/genie.lua
index b22c4dd26ce..93acdfb712f 100644
--- a/3rdparty/bimg/scripts/genie.lua
+++ b/3rdparty/bimg/scripts/genie.lua
@@ -1,6 +1,6 @@
--
--- Copyright 2010-2017 Branimir Karadzic. All rights reserved.
--- License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause
+-- Copyright 2010-2018 Branimir Karadzic. All rights reserved.
+-- License: https://github.com/bkaradzic/bimg#license-bsd-2-clause
--
newoption {
diff --git a/3rdparty/bimg/scripts/texturec.lua b/3rdparty/bimg/scripts/texturec.lua
index 02f6bb65d41..9bb3ef63649 100644
--- a/3rdparty/bimg/scripts/texturec.lua
+++ b/3rdparty/bimg/scripts/texturec.lua
@@ -1,6 +1,6 @@
--
--- Copyright 2010-2017 Branimir Karadzic. All rights reserved.
--- License: https://github.com/bkaradzic/bgfx#license-bsd-2-clause
+-- Copyright 2010-2018 Branimir Karadzic. All rights reserved.
+-- License: https://github.com/bkaradzic/bimg#license-bsd-2-clause
--
project "texturec"
@@ -9,27 +9,9 @@ project "texturec"
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/iqa/include"),
}
files {
- path.join(BIMG_DIR, "3rdparty/libsquish/**.cpp"),
- path.join(BIMG_DIR, "3rdparty/libsquish/**.h"),
- path.join(BIMG_DIR, "3rdparty/edtaa3/**.cpp"),
- path.join(BIMG_DIR, "3rdparty/edtaa3/**.h"),
- path.join(BIMG_DIR, "3rdparty/etc1/**.cpp"),
- path.join(BIMG_DIR, "3rdparty/etc1/**.h"),
- path.join(BIMG_DIR, "3rdparty/etc2/**.cpp"),
- path.join(BIMG_DIR, "3rdparty/etc2/**.hpp"),
- path.join(BIMG_DIR, "3rdparty/nvtt/**.cpp"),
- 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/tinyexr/**.h"),
- path.join(BIMG_DIR, "3rdparty/iqa/include/**.h"),
- path.join(BIMG_DIR, "3rdparty/iqa/source/**.c"),
path.join(BIMG_DIR, "tools/texturec/**.cpp"),
path.join(BIMG_DIR, "tools/texturec/**.h"),
}