diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb6fcc2..78c5edf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ project(bgfx)
 cmake_policy(SET CMP0054 NEW)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
diff --git a/bgfx b/bgfx
index e2c5b1d..8b6a6bd 160000
--- a/bgfx
+++ b/bgfx
@@ -1 +1 @@
-Subproject commit e2c5b1d3e1320145baebc405a3c894cd851f8dc1
+Subproject commit 8b6a6bdf0eae130a62f0af003282bf042ed97e7b
diff --git a/bx b/bx
index 96748d9..198cd12 160000
--- a/bx
+++ b/bx
@@ -1 +1 @@
-Subproject commit 96748d9a58265b9a1269fbb4044f0bfec2e16240
+Subproject commit 198cd120e4941d8aeb677db945ef4291a1ced291