Update to latest versions of bx, bimg and bgfx

This commit is contained in:
Mischa Aster Alff
2018-08-20 10:13:55 +02:00
committed by Joshua Brookover
parent 9e660ee65e
commit 168a1fd848
5 changed files with 24 additions and 4 deletions

2
bgfx

Submodule bgfx updated: 5dffe3060a...b5838bd861

2
bimg

Submodule bimg updated: bd3366bba0...81e493d7a5

2
bx

Submodule bx updated: 222456cdec...4ae16463d6

19
cmake/3rdparty/astc.cmake vendored Normal file
View File

@@ -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" )

View File

@@ -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" )