Skip to content

Commit

Permalink
Update bgfx and build fix (widberg#93)
Browse files Browse the repository at this point in the history
* Bump bgfx

* Fix glslang build

* Fix project generation for tvOS
  • Loading branch information
yaz0r authored Nov 9, 2020
1 parent 22ffa2e commit 66f18da
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion bgfx
Submodule bgfx updated 282 files
3 changes: 2 additions & 1 deletion cmake/3rdparty/glslang.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions cmake/bgfx.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
2 changes: 1 addition & 1 deletion cmake/shared.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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} )
Expand Down

0 comments on commit 66f18da

Please sign in to comment.