diff --git a/win32/CMakeLists.txt b/win32/CMakeLists.txt
index 4c927bab..c2d89aba 100644
--- a/win32/CMakeLists.txt
+++ b/win32/CMakeLists.txt
@@ -195,61 +195,14 @@ endif()
 
 ############################# glslang #############################
 
-add_library(GenericCodeGen STATIC IMPORTED GLOBAL)
-set_target_properties(GenericCodeGen PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/GenericCodeGen.lib
-)
-
-add_library(glslang SHARED IMPORTED GLOBAL)
-set_target_properties(glslang PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang.dll
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang.lib
-)
-
-add_library(glslang-default-resource-limits SHARED IMPORTED GLOBAL)
-set_target_properties(glslang-default-resource-limits PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang-default-resource-limits.dll
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang-default-resource-limits.lib
-)
-
-add_library(MachineIndependent STATIC IMPORTED GLOBAL)
-set_target_properties(MachineIndependent PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/MachineIndependent.lib
-)
-
-add_library(OGLCompiler STATIC IMPORTED GLOBAL)
-set_target_properties(OGLCompiler PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/OGLCompiler.lib
-)
-
-add_library(OSDependent STATIC IMPORTED GLOBAL)
-set_target_properties(OSDependent PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/OSDependent.lib
-)
-
-add_library(SPIRV SHARED IMPORTED GLOBAL)
-set_target_properties(SPIRV PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV.dll 
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV.lib
-)
-
-add_library(SPIRV-Tools STATIC IMPORTED GLOBAL)
-set_target_properties(SPIRV-Tools PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV-Tools.lib
-)
-
-add_library(SPIRV-Tools-opt STATIC IMPORTED GLOBAL)
-set_target_properties(SPIRV-Tools-opt PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV-Tools-opt.lib
-)
-
-add_library(SPVRemapper SHARED IMPORTED GLOBAL)
-set_target_properties(SPVRemapper PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPVRemapper.dll
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPVRemapper.lib
-)
-
-set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools-opt SPIRV-Tools SPVRemapper GenericCodeGen)
+set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools SPIRV-Tools-opt SPVRemapper GenericCodeGen)
+foreach(gl IN LISTS glslang_libs_name)
+  add_library(${gl} STATIC IMPORTED GLOBAL)
+  set_target_properties(${gl} PROPERTIES
+    IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/${gl}d.lib
+    IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/${gl}.lib
+  )
+endforeach()
 
 ############################# TBB #############################
 
@@ -272,6 +225,8 @@ set(tbb_libs_name tbb tbbmalloc tbbmalloc_proxy)
 
 list(APPEND CC_EXTERNAL_PRIVATE_DEFINITIONS __TBB_LIB_NAME=tbb)
 
+######################## PhysX ##############################
+
 if(USE_PHYSICS_PHYSX)
   set(PhysXSDK PhysX PhysXCommon PhysXFoundation PhysXExtensions PhysXCooking PhysXCharacterKinematic PhysXVehicle PhysXPvdSDK)
   foreach(PX IN LISTS PhysXSDK)
diff --git a/win32/libs/glslang/GenericCodeGen.lib b/win32/libs/glslang/GenericCodeGen.lib
index 61f551ba..ba964b16 100644
Binary files a/win32/libs/glslang/GenericCodeGen.lib and b/win32/libs/glslang/GenericCodeGen.lib differ
diff --git a/win32/libs/glslang/GenericCodeGend.lib b/win32/libs/glslang/GenericCodeGend.lib
new file mode 100644
index 00000000..f3c4a923
Binary files /dev/null and b/win32/libs/glslang/GenericCodeGend.lib differ
diff --git a/win32/libs/glslang/MachineIndependent.lib b/win32/libs/glslang/MachineIndependent.lib
index 55929be2..27b31069 100644
Binary files a/win32/libs/glslang/MachineIndependent.lib and b/win32/libs/glslang/MachineIndependent.lib differ
diff --git a/win32/libs/glslang/MachineIndependentd.lib b/win32/libs/glslang/MachineIndependentd.lib
new file mode 100644
index 00000000..35243795
Binary files /dev/null and b/win32/libs/glslang/MachineIndependentd.lib differ
diff --git a/win32/libs/glslang/OGLCompiler.lib b/win32/libs/glslang/OGLCompiler.lib
index e6e852a9..7a1c6120 100644
Binary files a/win32/libs/glslang/OGLCompiler.lib and b/win32/libs/glslang/OGLCompiler.lib differ
diff --git a/win32/libs/glslang/OGLCompilerd.lib b/win32/libs/glslang/OGLCompilerd.lib
new file mode 100644
index 00000000..88274841
Binary files /dev/null and b/win32/libs/glslang/OGLCompilerd.lib differ
diff --git a/win32/libs/glslang/OSDependent.lib b/win32/libs/glslang/OSDependent.lib
index 2ddac510..1f0f9a3c 100644
Binary files a/win32/libs/glslang/OSDependent.lib and b/win32/libs/glslang/OSDependent.lib differ
diff --git a/win32/libs/glslang/OSDependentd.lib b/win32/libs/glslang/OSDependentd.lib
new file mode 100644
index 00000000..80e9760b
Binary files /dev/null and b/win32/libs/glslang/OSDependentd.lib differ
diff --git a/win32/libs/glslang/SPIRV-Tools-opt.lib b/win32/libs/glslang/SPIRV-Tools-opt.lib
index 61ff3910..6f820fe1 100644
Binary files a/win32/libs/glslang/SPIRV-Tools-opt.lib and b/win32/libs/glslang/SPIRV-Tools-opt.lib differ
diff --git a/win32/libs/glslang/SPIRV-Tools-optd.lib b/win32/libs/glslang/SPIRV-Tools-optd.lib
new file mode 100644
index 00000000..7da9d15e
Binary files /dev/null and b/win32/libs/glslang/SPIRV-Tools-optd.lib differ
diff --git a/win32/libs/glslang/SPIRV-Tools.lib b/win32/libs/glslang/SPIRV-Tools.lib
index 5306202e..ab0aa35d 100644
Binary files a/win32/libs/glslang/SPIRV-Tools.lib and b/win32/libs/glslang/SPIRV-Tools.lib differ
diff --git a/win32/libs/glslang/SPIRV-Toolsd.lib b/win32/libs/glslang/SPIRV-Toolsd.lib
new file mode 100644
index 00000000..e5bf10c5
Binary files /dev/null and b/win32/libs/glslang/SPIRV-Toolsd.lib differ
diff --git a/win32/libs/glslang/SPIRV.dll b/win32/libs/glslang/SPIRV.dll
deleted file mode 100644
index be44269a..00000000
Binary files a/win32/libs/glslang/SPIRV.dll and /dev/null differ
diff --git a/win32/libs/glslang/SPIRV.lib b/win32/libs/glslang/SPIRV.lib
index 95a3c2b9..91c0799f 100644
Binary files a/win32/libs/glslang/SPIRV.lib and b/win32/libs/glslang/SPIRV.lib differ
diff --git a/win32/libs/glslang/SPIRVd.lib b/win32/libs/glslang/SPIRVd.lib
new file mode 100644
index 00000000..dc2cb5f4
Binary files /dev/null and b/win32/libs/glslang/SPIRVd.lib differ
diff --git a/win32/libs/glslang/SPVRemapper.dll b/win32/libs/glslang/SPVRemapper.dll
deleted file mode 100644
index 7f129a3f..00000000
Binary files a/win32/libs/glslang/SPVRemapper.dll and /dev/null differ
diff --git a/win32/libs/glslang/SPVRemapper.lib b/win32/libs/glslang/SPVRemapper.lib
index 1095a35e..85e9d650 100644
Binary files a/win32/libs/glslang/SPVRemapper.lib and b/win32/libs/glslang/SPVRemapper.lib differ
diff --git a/win32/libs/glslang/SPVRemapperd.lib b/win32/libs/glslang/SPVRemapperd.lib
new file mode 100644
index 00000000..1fb6ca72
Binary files /dev/null and b/win32/libs/glslang/SPVRemapperd.lib differ
diff --git a/win32/libs/glslang/glslang-default-resource-limits.dll b/win32/libs/glslang/glslang-default-resource-limits.dll
deleted file mode 100644
index 1534058c..00000000
Binary files a/win32/libs/glslang/glslang-default-resource-limits.dll and /dev/null differ
diff --git a/win32/libs/glslang/glslang-default-resource-limits.lib b/win32/libs/glslang/glslang-default-resource-limits.lib
index a5e1532b..a1c53e91 100644
Binary files a/win32/libs/glslang/glslang-default-resource-limits.lib and b/win32/libs/glslang/glslang-default-resource-limits.lib differ
diff --git a/win32/libs/glslang/glslang-default-resource-limitsd.lib b/win32/libs/glslang/glslang-default-resource-limitsd.lib
new file mode 100644
index 00000000..8c8f7ad6
Binary files /dev/null and b/win32/libs/glslang/glslang-default-resource-limitsd.lib differ
diff --git a/win32/libs/glslang/glslang.dll b/win32/libs/glslang/glslang.dll
deleted file mode 100644
index ef0baa27..00000000
Binary files a/win32/libs/glslang/glslang.dll and /dev/null differ
diff --git a/win32/libs/glslang/glslang.lib b/win32/libs/glslang/glslang.lib
index 3045d0f5..60983209 100644
Binary files a/win32/libs/glslang/glslang.lib and b/win32/libs/glslang/glslang.lib differ
diff --git a/win32/libs/glslang/glslangd.lib b/win32/libs/glslang/glslangd.lib
new file mode 100644
index 00000000..b1700a00
Binary files /dev/null and b/win32/libs/glslang/glslangd.lib differ
diff --git a/win64/CMakeLists.txt b/win64/CMakeLists.txt
index a2bb110c..dccf1273 100644
--- a/win64/CMakeLists.txt
+++ b/win64/CMakeLists.txt
@@ -195,62 +195,14 @@ endif()
 
 ############################# glslang #############################
 
-add_library(GenericCodeGen STATIC IMPORTED GLOBAL)
-set_target_properties(GenericCodeGen PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/GenericCodeGen.lib
-)
-
-add_library(glslang SHARED IMPORTED GLOBAL)
-set_target_properties(glslang PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang.dll
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang.lib
-)
-
-add_library(glslang-default-resource-limits SHARED IMPORTED GLOBAL)
-set_target_properties(glslang-default-resource-limits PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang-default-resource-limits.dll
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/glslang-default-resource-limits.lib
-)
-
-add_library(MachineIndependent STATIC IMPORTED GLOBAL)
-set_target_properties(MachineIndependent PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/MachineIndependent.lib
-)
-
-add_library(OGLCompiler STATIC IMPORTED GLOBAL)
-set_target_properties(OGLCompiler PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/OGLCompiler.lib
-)
-
-add_library(OSDependent STATIC IMPORTED GLOBAL)
-set_target_properties(OSDependent PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/OSDependent.lib
-)
-
-add_library(SPIRV SHARED IMPORTED GLOBAL)
-set_target_properties(SPIRV PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV.dll 
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV.lib
-)
-
-add_library(SPIRV-Tools STATIC IMPORTED GLOBAL)
-set_target_properties(SPIRV-Tools PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV-Tools.lib
-)
-
-add_library(SPIRV-Tools-opt STATIC IMPORTED GLOBAL)
-set_target_properties(SPIRV-Tools-opt PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPIRV-Tools-opt.lib
-)
-
-add_library(SPVRemapper SHARED IMPORTED GLOBAL)
-set_target_properties(SPVRemapper PROPERTIES
-  IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPVRemapper.dll
-  IMPORTED_IMPLIB ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/SPVRemapper.lib
-)
-
-set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools-opt SPIRV-Tools SPVRemapper GenericCodeGen)
-
+set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools SPIRV-Tools-opt SPVRemapper GenericCodeGen)
+foreach(gl IN LISTS glslang_libs_name)
+  add_library(${gl} STATIC IMPORTED GLOBAL)
+  set_target_properties(${gl} PROPERTIES
+    IMPORTED_LOCATION_DEBUG ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/${gl}d.lib
+    IMPORTED_LOCATION_RELEASE ${CMAKE_CURRENT_LIST_DIR}/libs/glslang/${gl}.lib
+  )
+endforeach()
 ############################# TBB #############################
 
 add_library(tbb SHARED IMPORTED GLOBAL)
diff --git a/win64/libs/glslang/GenericCodeGen.lib b/win64/libs/glslang/GenericCodeGen.lib
index 4d0c2a3b..331ea74b 100644
Binary files a/win64/libs/glslang/GenericCodeGen.lib and b/win64/libs/glslang/GenericCodeGen.lib differ
diff --git a/win64/libs/glslang/GenericCodeGend.lib b/win64/libs/glslang/GenericCodeGend.lib
new file mode 100644
index 00000000..15dd4239
Binary files /dev/null and b/win64/libs/glslang/GenericCodeGend.lib differ
diff --git a/win64/libs/glslang/MachineIndependent.lib b/win64/libs/glslang/MachineIndependent.lib
index cc7861b6..87b2cd86 100644
Binary files a/win64/libs/glslang/MachineIndependent.lib and b/win64/libs/glslang/MachineIndependent.lib differ
diff --git a/win64/libs/glslang/MachineIndependentd.lib b/win64/libs/glslang/MachineIndependentd.lib
new file mode 100644
index 00000000..77b3eda3
Binary files /dev/null and b/win64/libs/glslang/MachineIndependentd.lib differ
diff --git a/win64/libs/glslang/OGLCompiler.lib b/win64/libs/glslang/OGLCompiler.lib
index 04caddaa..408e43dc 100644
Binary files a/win64/libs/glslang/OGLCompiler.lib and b/win64/libs/glslang/OGLCompiler.lib differ
diff --git a/win64/libs/glslang/OGLCompilerd.lib b/win64/libs/glslang/OGLCompilerd.lib
new file mode 100644
index 00000000..3087bf9b
Binary files /dev/null and b/win64/libs/glslang/OGLCompilerd.lib differ
diff --git a/win64/libs/glslang/OSDependent.lib b/win64/libs/glslang/OSDependent.lib
index 7b3dee39..ad4d0269 100644
Binary files a/win64/libs/glslang/OSDependent.lib and b/win64/libs/glslang/OSDependent.lib differ
diff --git a/win64/libs/glslang/OSDependentd.lib b/win64/libs/glslang/OSDependentd.lib
new file mode 100644
index 00000000..26104c32
Binary files /dev/null and b/win64/libs/glslang/OSDependentd.lib differ
diff --git a/win64/libs/glslang/SPIRV-Tools-opt.lib b/win64/libs/glslang/SPIRV-Tools-opt.lib
index a9564c91..dbd863d0 100644
Binary files a/win64/libs/glslang/SPIRV-Tools-opt.lib and b/win64/libs/glslang/SPIRV-Tools-opt.lib differ
diff --git a/win64/libs/glslang/SPIRV-Tools-optd.lib b/win64/libs/glslang/SPIRV-Tools-optd.lib
new file mode 100644
index 00000000..c6f64aa4
Binary files /dev/null and b/win64/libs/glslang/SPIRV-Tools-optd.lib differ
diff --git a/win64/libs/glslang/SPIRV-Tools.lib b/win64/libs/glslang/SPIRV-Tools.lib
index 97a63dcd..77fcaf5d 100644
Binary files a/win64/libs/glslang/SPIRV-Tools.lib and b/win64/libs/glslang/SPIRV-Tools.lib differ
diff --git a/win64/libs/glslang/SPIRV-Toolsd.lib b/win64/libs/glslang/SPIRV-Toolsd.lib
new file mode 100644
index 00000000..2bcc8411
Binary files /dev/null and b/win64/libs/glslang/SPIRV-Toolsd.lib differ
diff --git a/win64/libs/glslang/SPIRV.dll b/win64/libs/glslang/SPIRV.dll
deleted file mode 100644
index 91b56d24..00000000
Binary files a/win64/libs/glslang/SPIRV.dll and /dev/null differ
diff --git a/win64/libs/glslang/SPIRV.lib b/win64/libs/glslang/SPIRV.lib
index d5f3c98e..c7feb20c 100644
Binary files a/win64/libs/glslang/SPIRV.lib and b/win64/libs/glslang/SPIRV.lib differ
diff --git a/win64/libs/glslang/SPIRVd.lib b/win64/libs/glslang/SPIRVd.lib
new file mode 100644
index 00000000..1c03e300
Binary files /dev/null and b/win64/libs/glslang/SPIRVd.lib differ
diff --git a/win64/libs/glslang/SPVRemapper.dll b/win64/libs/glslang/SPVRemapper.dll
deleted file mode 100644
index 61e90004..00000000
Binary files a/win64/libs/glslang/SPVRemapper.dll and /dev/null differ
diff --git a/win64/libs/glslang/SPVRemapper.lib b/win64/libs/glslang/SPVRemapper.lib
index bc61c6c0..cc5487a8 100644
Binary files a/win64/libs/glslang/SPVRemapper.lib and b/win64/libs/glslang/SPVRemapper.lib differ
diff --git a/win64/libs/glslang/SPVRemapperd.lib b/win64/libs/glslang/SPVRemapperd.lib
new file mode 100644
index 00000000..9f13446e
Binary files /dev/null and b/win64/libs/glslang/SPVRemapperd.lib differ
diff --git a/win64/libs/glslang/glslang-default-resource-limits.dll b/win64/libs/glslang/glslang-default-resource-limits.dll
deleted file mode 100644
index fdbfc2ea..00000000
Binary files a/win64/libs/glslang/glslang-default-resource-limits.dll and /dev/null differ
diff --git a/win64/libs/glslang/glslang-default-resource-limits.lib b/win64/libs/glslang/glslang-default-resource-limits.lib
index 1654750d..78f7fcf5 100644
Binary files a/win64/libs/glslang/glslang-default-resource-limits.lib and b/win64/libs/glslang/glslang-default-resource-limits.lib differ
diff --git a/win64/libs/glslang/glslang-default-resource-limitsd.lib b/win64/libs/glslang/glslang-default-resource-limitsd.lib
new file mode 100644
index 00000000..d8edd4af
Binary files /dev/null and b/win64/libs/glslang/glslang-default-resource-limitsd.lib differ
diff --git a/win64/libs/glslang/glslang.dll b/win64/libs/glslang/glslang.dll
deleted file mode 100644
index 697c6ea5..00000000
Binary files a/win64/libs/glslang/glslang.dll and /dev/null differ
diff --git a/win64/libs/glslang/glslang.lib b/win64/libs/glslang/glslang.lib
index 3fd23b73..c9ac3012 100644
Binary files a/win64/libs/glslang/glslang.lib and b/win64/libs/glslang/glslang.lib differ
diff --git a/win64/libs/glslang/glslangd.lib b/win64/libs/glslang/glslangd.lib
new file mode 100644
index 00000000..8ebf51bb
Binary files /dev/null and b/win64/libs/glslang/glslangd.lib differ