From 168a1fd8487c3c96062914bc53b86b7e067c2701 Mon Sep 17 00:00:00 2001
From: Mischa Aster Alff <aster@is.a.cxx.ninja>
Date: Mon, 20 Aug 2018 10:13:55 +0200
Subject: [PATCH] Update to latest versions of bx, bimg and bgfx

---
 bgfx                      |  2 +-
 bimg                      |  2 +-
 bx                        |  2 +-
 cmake/3rdparty/astc.cmake | 19 +++++++++++++++++++
 cmake/bimg.cmake          |  3 ++-
 5 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 cmake/3rdparty/astc.cmake

diff --git a/bgfx b/bgfx
index 5dffe30..b5838bd 160000
--- a/bgfx
+++ b/bgfx
@@ -1 +1 @@
-Subproject commit 5dffe3060a85ed97339820d32d78af00ee21be0f
+Subproject commit b5838bd861447069cc32d47a3a1ab84c956ab957
diff --git a/bimg b/bimg
index bd3366b..81e493d 160000
--- a/bimg
+++ b/bimg
@@ -1 +1 @@
-Subproject commit bd3366bba0ab15df20ac5be5547c526ef147cfb1
+Subproject commit 81e493d7a58d5b100478c15469ebaf26e3ca8408
diff --git a/bx b/bx
index 222456c..4ae1646 160000
--- a/bx
+++ b/bx
@@ -1 +1 @@
-Subproject commit 222456cdecdf9b3f6e8f7daeb3a63ab49f8b2729
+Subproject commit 4ae16463d696a42a44b51651f3c943a039259f3b
diff --git a/cmake/3rdparty/astc.cmake b/cmake/3rdparty/astc.cmake
new file mode 100644
index 0000000..e8478ab
--- /dev/null
+++ b/cmake/3rdparty/astc.cmake
@@ -0,0 +1,19 @@
+# bgfx.cmake - bgfx building in cmake
+# Written in 2017 by Joshua Brookover <joshua.al.brookover@gmail.com>
+
+# To the extent possible under law, the author(s) have dedicated all copyright
+# and related and neighboring rights to this software to the public domain
+# worldwide. This software is distributed without any warranty.
+
+# You should have received a copy of the CC0 Public Domain Dedication along with
+# this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+
+if( TARGET astc )
+	return()
+endif()
+
+file( GLOB ASTC_SOURCES ${BIMG_DIR}/3rdparty/astc/*.cpp ${BIMG_DIR}/3rdparty/astc/*.h )
+
+add_library( astc STATIC ${ASTC_SOURCES} )
+target_include_directories( astc PUBLIC ${BIMG_DIR}/3rdparty )
+set_target_properties( astc PROPERTIES FOLDER "bgfx/3rdparty" )
diff --git a/cmake/bimg.cmake b/cmake/bimg.cmake
index 3530f01..a30cd2f 100644
--- a/cmake/bimg.cmake
+++ b/cmake/bimg.cmake
@@ -9,6 +9,7 @@
 # this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 # Third party libs
+include( cmake/3rdparty/astc.cmake )
 include( cmake/3rdparty/edtaa3.cmake )
 include( cmake/3rdparty/etc1.cmake )
 include( cmake/3rdparty/etc2.cmake )
@@ -33,7 +34,7 @@ add_library( bimg STATIC ${BIMG_SOURCES} )
 target_include_directories( bimg PUBLIC ${BIMG_DIR}/include )
 
 # bimg dependencies
-target_link_libraries( bimg bx edtaa3 etc1 etc2 iqa squish nvtt pvrtc )
+target_link_libraries( bimg bx astc edtaa3 etc1 etc2 iqa squish nvtt pvrtc )
 
 # Put in a "bgfx" folder in Visual Studio
 set_target_properties( bimg PROPERTIES FOLDER "bgfx" )