diff --git a/bgfx b/bgfx index e08de6d..5b05c6c 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit e08de6dd2cf126bf7c4c8276ce80dfd955b05f57 +Subproject commit 5b05c6c09e3884143491f289f456d6e98579c7ae diff --git a/bimg b/bimg index 5ee42f6..bfe3c68 160000 --- a/bimg +++ b/bimg @@ -1 +1 @@ -Subproject commit 5ee42f6de1c18345f7ad58bae71f2b1f38ecc9bd +Subproject commit bfe3c683f9c628fb3fd5d71b1a80d8fbdb6044a4 diff --git a/bx b/bx index b1a707f..892062b 160000 --- a/bx +++ b/bx @@ -1 +1 @@ -Subproject commit b1a707fac854753088d9b17ceef11d20dd01ad20 +Subproject commit 892062b10b16f905915258c0ad0d3c5d89dc6444 diff --git a/cmake/3rdparty/glslang.cmake b/cmake/3rdparty/glslang.cmake index 2b2e2dc..f58c52b 100644 --- a/cmake/3rdparty/glslang.cmake +++ b/cmake/3rdparty/glslang.cmake @@ -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 diff --git a/cmake/bgfx.cmake b/cmake/bgfx.cmake index 3fa2c27..c2757ad 100755 --- a/cmake/bgfx.cmake +++ b/cmake/bgfx.cmake @@ -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 ) diff --git a/cmake/shared.cmake b/cmake/shared.cmake index 9821609..ded8a53 100644 --- a/cmake/shared.cmake +++ b/cmake/shared.cmake @@ -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} )