diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 80bea833a1b69ecab3d697367006d6040d50b604..e10ccc276c3d3de92c63510b4746c1240276bc57 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -75,8 +75,8 @@ if (WINDOWS)
   endif (ADDRESS_SIZE EQUAL 32)
 
 
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG")
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG")
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG /IGNORE:4099")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG /IGNORE:4099")
 
   set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:LIBCMT")
   set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:LIBCMT /NODEFAULTLIB:LIBCMTD /NODEFAULTLIB:MSVCRT")
@@ -132,8 +132,10 @@ if (WINDOWS)
 
   if (USE_AVX2)
     set(GLOBAL_CXX_FLAGS "${GLOBAL_CXX_FLAGS} /arch:AVX2")
+    add_definitions(/DAL_AVX2=1 /DAL_AVX=1)
   elseif (USE_AVX)
     set(GLOBAL_CXX_FLAGS "${GLOBAL_CXX_FLAGS} /arch:AVX")
+    add_definitions(/DAL_AVX=1)
   elseif (ADDRESS_SIZE EQUAL 32)
     set(GLOBAL_CXX_FLAGS "${GLOBAL_CXX_FLAGS} /arch:SSE2")
   endif ()
@@ -171,6 +173,7 @@ if (WINDOWS)
       /D_WINSOCK_DEPRECATED_NO_WARNINGS
       /D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING
       /DBOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE
+      /wd4351
       )
 
   if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")