From 26a0f1e54d131841dab511539ff3e6c5e6472fed Mon Sep 17 00:00:00 2001 From: e-erdal Date: Fri, 24 Jun 2022 11:42:25 +0300 Subject: [PATCH 1/2] update bx to require c++14 and add compiler flag for bx when using MSVC --- bgfx | 2 +- bx | 2 +- cmake/bx.cmake | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bgfx b/bgfx index 9204a53..db44d56 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit 9204a536dd62078bb81d17cbf25abf96ec3cf49c +Subproject commit db44d5675f4e02a9f3178fe54ac6d5a9c216a573 diff --git a/bx b/bx index 6332fb0..aa5090b 160000 --- a/bx +++ b/bx @@ -1 +1 @@ -Subproject commit 6332fb0305b84774f4f1a6595ed364b5649d6bfa +Subproject commit aa5090bbd8c39e84d483f4850a7d9ca7ff9241ed diff --git a/cmake/bx.cmake b/cmake/bx.cmake index bf79e68..a784cde 100644 --- a/cmake/bx.cmake +++ b/cmake/bx.cmake @@ -30,6 +30,10 @@ endif() # Create the bx target add_library( bx STATIC ${BX_SOURCES} ) +target_compile_features( bx PUBLIC cxx_std_14 ) +# (note: see bx\scripts\toolchain.lua for equivalent compiler flag) +target_compile_options( bx PUBLIC $<$:/Zc:__cplusplus> ) + # Link against psapi on Windows if( WIN32 ) target_link_libraries( bx PUBLIC psapi ) From f6a9fb16879881d342fda863d6986079479842ef Mon Sep 17 00:00:00 2001 From: Tom Hulton-Harrop Date: Sun, 17 Jul 2022 22:39:38 +0100 Subject: [PATCH 2/2] update from upstream - update bgfx submodule --- bgfx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgfx b/bgfx index b38389f..db44d56 160000 --- a/bgfx +++ b/bgfx @@ -1 +1 @@ -Subproject commit b38389f04e07cb27abab59f7a9ca444dd15b64a0 +Subproject commit db44d5675f4e02a9f3178fe54ac6d5a9c216a573