diff --git a/bgfx b/bgfx index 8ca270a..b0a1224 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 8ca270a44904ff116b9cf8465d965295c14294ee +Subproject commit b0a122449c0167520f854e341ca7b2f7d1b8d96b diff --git a/bimg b/bimg index 00bc99f..a495171 160000 --- a/bimg +++ b/bimg @@ -1 +1 @@ -Subproject commit 00bc99f7e8d9cc67c5db2052f15159f4b3709254 +Subproject commit a495171fda84b10ac6db9cc6d10f91813d881f44 diff --git a/bx b/bx index 96e8c66..5756434 160000 --- a/bx +++ b/bx @@ -1 +1 @@ -Subproject commit 96e8c66a60513aa5e609086f9a356aba0e825e6f +Subproject commit 5756434bb53cdc780d83b46dd8fd5c53b348203c diff --git a/cmake/3rdparty/iqa.cmake b/cmake/3rdparty/iqa.cmake new file mode 100644 index 0000000..9fb5d41 --- /dev/null +++ b/cmake/3rdparty/iqa.cmake @@ -0,0 +1,19 @@ +# bgfx.cmake - bgfx building in cmake +# Written in 2017 by Joshua Brookover + +# 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 . + +if( TARGET iqa ) + return() +endif() + +file( GLOB IQA_SOURCES ${BIMG_DIR}/3rdparty/iqa/source/*.c ${BIMG_DIR}/3rdparty/iqa/include/*.h ) + +add_library( iqa STATIC ${IQA_SOURCES} ) +target_include_directories( iqa PUBLIC ${BIMG_DIR}/3rdparty/iqa/include ) +set_target_properties( iqa PROPERTIES FOLDER "bgfx/3rdparty" ) diff --git a/cmake/bimg.cmake b/cmake/bimg.cmake index c80803f..be0190a 100644 --- a/cmake/bimg.cmake +++ b/cmake/bimg.cmake @@ -12,6 +12,7 @@ include( cmake/3rdparty/edtaa3.cmake ) include( cmake/3rdparty/etc1.cmake ) include( cmake/3rdparty/etc2.cmake ) +include( cmake/3rdparty/iqa.cmake ) include( cmake/3rdparty/libsquish.cmake ) include( cmake/3rdparty/nvtt.cmake ) include( cmake/3rdparty/pvrtc.cmake ) @@ -32,7 +33,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 squish nvtt pvrtc ) +target_link_libraries( bimg bx edtaa3 etc1 etc2 iqa squish nvtt pvrtc ) # Put in a "bgfx" folder in Visual Studio set_target_properties( bimg PROPERTIES FOLDER "bgfx" )