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 $<$<CXX_COMPILER_ID:MSVC>:/Zc:__cplusplus> )
+
 # Link against psapi on Windows
 if( WIN32 )
 	target_link_libraries( bx PUBLIC psapi )