diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 8e111ee6625349d35096830dcbc1fb9cce93e04b..cfce7aa55acaefccf46e9c89c1aabd40f78e0d2f 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -92,7 +92,7 @@ if (WINDOWS)
       endif(INCREMENTAL_LINK)
       set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /OPT:REF /OPT:ICF /INCREMENTAL:NO")
       set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /OPT:REF /OPT:ICF /INCREMENTAL:NO")
-      set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL")
+      set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL /Gy /Gw")
     elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
       if(INCREMENTAL_LINK)
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto=thin -fwhole-program-vtables /clang:-fforce-emit-vtables")