Mirrors/bgfx.cmake
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.cmake.git synced 2026-02-17 21:12:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update bgfx and build fix (#93)

Browse Source 
* Bump bgfx

* Fix glslang build

* Fix project generation for tvOS
This commit is contained in:
yaz0r
2020-11-08 22:58:03 -08:00
committed by GitHub
parent 22ffa2e003
commit 66f18daf5c
6 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bgfx

Submodule bgfx updated: e08de6dd2c...5b05c6c09e

2
bimg

Submodule bimg updated: 5ee42f6de1...bfe3c683f9

2
bx

Submodule bx updated: b1a707fac8...892062b10b

3
cmake/3rdparty/glslang.cmake vendored
View File

@@ -15,7 +15,8 @@ endif()
file( GLOB GLSLANG_SOURCES
${BGFX_DIR}/3rdparty/glslang/glslang/GenericCodeGen/*.cpp
${BGFX_DIR}/3rdparty/glslang/glslang/MachineIndependent/*.cpp
${BGFX_DIR}/3rdparty/glslang/glslang/MachineIndependent/preprocessor/*.cpp
${BGFX_DIR}/3rdparty/glslang/glslang/MachineIndependent/preprocessor/*.cpp
${BGFX_DIR}/3rdparty/glslang/glslang/HLSL/*.cpp
${BGFX_DIR}/3rdparty/glslang/hlsl/*.cpp
${BGFX_DIR}/3rdparty/glslang/SPIRV/*.cpp
${BGFX_DIR}/3rdparty/glslang/OGLCompilersDLL/*.cpp

4
cmake/bgfx.cmake
View File

@@ -89,8 +89,8 @@ if( BGFX_USE_OVR )
target_link_libraries( bgfx PUBLIC ovr )
endif()
# Frameworks required on iOS and macOS
if( IOS )
# Frameworks required on iOS, tvOS and macOS
if( ${CMAKE_SYSTEM_NAME} MATCHES iOS|tvOS )
target_link_libraries (bgfx PUBLIC "-framework OpenGLES -framework Metal -framework UIKit -framework CoreGraphics -framework QuartzCore")
elseif( APPLE )
find_library( COCOA_LIBRARY Cocoa )

2
cmake/shared.cmake
View File

@@ -28,7 +28,7 @@ target_include_directories( bgfx-bounds INTERFACE ${BGFX_DIR}/include )
target_include_directories( bgfx-bounds INTERFACE ${BGFX_DIR}/examples/common )
# Frameworks required on OS X
if( APPLE AND NOT IOS)
if( ${CMAKE_SYSTEM_NAME} MATCHES Darwin )
find_library( COCOA_LIBRARY Cocoa )
mark_as_advanced( COCOA_LIBRARY )
target_link_libraries( bgfx-vertexlayout INTERFACE ${COCOA_LIBRARY} )