Updating submodules

This commit is contained in:
Robert D. Blanchet Jr
2019-04-06 10:51:09 -07:00
committed by Joshua Brookover
parent 22805562b0
commit 8eb363a378
6 changed files with 33 additions and 10 deletions

View File

@@ -12,12 +12,10 @@ cmake_minimum_required( VERSION 3.0 )
project( bgfx )
set_property( GLOBAL PROPERTY USE_FOLDERS ON )
if( APPLE AND NOT IOS )
set( CMAKE_CXX_FLAGS "-ObjC++ --std=c++14" )
elseif(UNIX)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
endif()
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
option( BGFX_BUILD_TOOLS "Build bgfx tools." ON )
option( BGFX_BUILD_EXAMPLES "Build bgfx examples." ON )

2
bgfx

Submodule bgfx updated: 6e75f9f663...b5d8c89c29

2
bimg

Submodule bimg updated: baffd743b9...f89b12ae25

2
bx

Submodule bx updated: 46f7ea77c1...7a68aba842

24
cmake/3rdparty/astc-codec.cmake vendored Normal file
View File

@@ -0,0 +1,24 @@
# 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-codec )
return()
endif()
file(
GLOB
ASTC_CODEC_SOURCES
${BIMG_DIR}/3rdparty/astc-codec/src/decoder/*.cpp
${BIMG_DIR}/3rdparty/astc-codec/src/decoder/*.h
)
add_library( astc-codec STATIC ${ASTC_CODEC_SOURCES} )
target_include_directories( astc-codec PUBLIC ${BIMG_DIR}/3rdparty ${BIMG_DIR}/3rdparty/astc-codec/include )
set_target_properties( astc-codec 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-codec.cmake )
include( cmake/3rdparty/astc.cmake )
include( cmake/3rdparty/edtaa3.cmake )
include( cmake/3rdparty/etc1.cmake )
@@ -34,7 +35,7 @@ add_library( bimg STATIC ${BIMG_SOURCES} )
target_include_directories( bimg PUBLIC ${BIMG_DIR}/include )
# bimg dependencies
target_link_libraries( bimg bx astc edtaa3 etc1 etc2 iqa squish nvtt pvrtc )
target_link_libraries( bimg bx astc-codec astc edtaa3 etc1 etc2 iqa squish nvtt pvrtc )
# Put in a "bgfx" folder in Visual Studio
set_target_properties( bimg PROPERTIES FOLDER "bgfx" )