diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea5eb33..c325190 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,10 +22,6 @@ if(APPLE AND NOT XCODE)
 	set(CMAKE_CXX_FLAGS "-ObjC++")
 endif()
 
-if(MSVC AND (MSVC_VERSION GREATER_EQUAL 1914))
-	add_compile_options("/Zc:__cplusplus")
-endif()
-
 include(CMakeDependentOption)
 
 option(BX_AMALGAMATED "Amalgamated bx build for faster compilation" OFF)
diff --git a/bgfx b/bgfx
index 00fa5ad..d1feabe 160000
--- a/bgfx
+++ b/bgfx
@@ -1 +1 @@
-Subproject commit 00fa5ad179f5aa13c1e44d0bcbccdc535aba2d00
+Subproject commit d1feabe3194b4b41ffd9c5747536acfadeae919b
diff --git a/bimg b/bimg
index 98a40e8..59f188a 160000
--- a/bimg
+++ b/bimg
@@ -1 +1 @@
-Subproject commit 98a40e85334721446bbc2efe7bd4576d37952136
+Subproject commit 59f188a6add2c9ac4b986ccf9724575d3c41da9b
diff --git a/bx b/bx
index d171a0f..24527ea 160000
--- a/bx
+++ b/bx
@@ -1 +1 @@
-Subproject commit d171a0f264da10b42b18aac1ddc0847cb7ff495a
+Subproject commit 24527eabfd135dca569904baff1bdfd004ef8b41
diff --git a/cmake/bx/bx.cmake b/cmake/bx/bx.cmake
index e867912..d1a73c6 100644
--- a/cmake/bx/bx.cmake
+++ b/cmake/bx/bx.cmake
@@ -92,7 +92,7 @@ target_compile_definitions(bx PUBLIC "__STDC_CONSTANT_MACROS")
 
 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>)
+target_compile_options(bx PUBLIC $<$<CXX_COMPILER_ID:MSVC>:/Zc:__cplusplus /Zc:preprocessor>)
 
 # Link against psapi on Windows
 if(WIN32)