diff --git a/build/config-msvc2008-win32-debug.py b/build/config-msvc2008-win32-debug.py
index a7147917..f355d0be 100644
--- a/build/config-msvc2008-win32-debug.py
+++ b/build/config-msvc2008-win32-debug.py
@@ -4,7 +4,7 @@ BUILDDIR       = '#build/debug'
 DISTDIR        = '#dist'
 CXX            = 'cl'
 CC             = 'cl'
-# /Ox=optimize for speed, global optimizations, intrinsic functions, favor fast code, frame pointer omission
+# /O2=optimize for speed, global optimizations, intrinsic functions, favor fast code, frame pointer omission
 # /EHsc=C++ exceptions, /fp:fast=Enable reasonable FP optimizations, /GS-=No buffer security checks, /GL=whole program optimizations
 # To include debug information add '/Z7' to CXXFLAGS and '/DEBUG' to LINKFLAGS
 CXXFLAGS       = ['/nologo', '/Od', '/Z7', '/fp:fast', '/arch:SSE2' ,'/D', 'WIN32', '/W3', '/EHsc', '/GS-', '/GL', '/MD', '/D', 'MTS_DEBUG', '/D', 'SINGLE_PRECISION', '/D', 'SPECTRUM_SAMPLES=3', '/D', 'MTS_SSE', '/D', 'MTS_HAS_COHERENT_RT', '/D', '_CONSOLE', '/D', 'NDEBUG', '/openmp']
diff --git a/build/config-msvc2008-win32.py b/build/config-msvc2008-win32.py
index a37a20d4..67281dea 100644
--- a/build/config-msvc2008-win32.py
+++ b/build/config-msvc2008-win32.py
@@ -4,10 +4,10 @@ BUILDDIR       = '#build/release'
 DISTDIR        = '#dist'
 CXX            = 'cl'
 CC             = 'cl'
-# /Ox=optimize for speed, global optimizations, intrinsic functions, favor fast code, frame pointer omission
+# /O2=optimize for speed, global optimizations, intrinsic functions, favor fast code, frame pointer omission
 # /EHsc=C++ exceptions, /fp:fast=Enable reasonable FP optimizations, /GS-=No buffer security checks, /GL=whole program optimizations
 # To include debug information add '/Z7' to CXXFLAGS and '/DEBUG' to LINKFLAGS
-CXXFLAGS       = ['/nologo', '/Ox', '/fp:fast', '/arch:SSE2' ,'/D', 'WIN32', '/W3', '/EHsc', '/GS-', '/GL', '/MD', '/D', 'MTS_DEBUG', '/D', 'SINGLE_PRECISION', '/D', 'SPECTRUM_SAMPLES=3', '/D', 'MTS_SSE', '/D', 'MTS_HAS_COHERENT_RT', '/D', '_CONSOLE', '/D', 'NDEBUG', '/openmp']
+CXXFLAGS       = ['/nologo', '/O2', '/fp:fast', '/arch:SSE2' ,'/D', 'WIN32', '/W3', '/EHsc', '/GS-', '/GL', '/MD', '/D', 'MTS_DEBUG', '/D', 'SINGLE_PRECISION', '/D', 'SPECTRUM_SAMPLES=3', '/D', 'MTS_SSE', '/D', 'MTS_HAS_COHERENT_RT', '/D', '_CONSOLE', '/D', 'NDEBUG', '/openmp']
 SHCXXFLAGS     = CXXFLAGS
 TARGET_ARCH    = 'x86'
 MSVC_VERSION   = '9.0'
diff --git a/build/config-msvc2008-win64-debug.py b/build/config-msvc2008-win64-debug.py
index 00698c75..e6c2f3a2 100644
--- a/build/config-msvc2008-win64-debug.py
+++ b/build/config-msvc2008-win64-debug.py
@@ -4,7 +4,7 @@ BUILDDIR       = '#build/debug'
 DISTDIR        = '#dist'
 CXX            = 'cl'
 CC             = 'cl'
-# /Ox=optimize for speed, global optimizations, intrinsic functions, favor fast code, frame pointer omission
+# /O2=optimize for speed, global optimizations, intrinsic functions, favor fast code, frame pointer omission
 # /EHsc=C++ exceptions, /fp:fast=Enable reasonable FP optimizations, /GS-=No buffer security checks, /GL=whole program optimizations
 # To include debug information add '/Z7' to CXXFLAGS and '/DEBUG' to LINKFLAGS
 CXXFLAGS       = ['/nologo', '/Od', '/Z7', '/fp:fast', '/D', 'WIN32', '/D', 'WIN64', '/W3', '/EHsc', '/GS-', '/GL', '/MD', '/D', 'MTS_DEBUG', '/D', 'SINGLE_PRECISION', '/D', 'SPECTRUM_SAMPLES=3', '/D', 'MTS_SSE', '/D', 'MTS_HAS_COHERENT_RT', '/D', '_CONSOLE', '/D', 'NDEBUG', '/openmp']
diff --git a/build/config-msvc2008-win64.py b/build/config-msvc2008-win64.py
index d2ab2b4b..9e8bf2cb 100644
--- a/build/config-msvc2008-win64.py
+++ b/build/config-msvc2008-win64.py
@@ -4,10 +4,10 @@ BUILDDIR       = '#build/release'
 DISTDIR        = '#dist'
 CXX            = 'cl'
 CC             = 'cl'
-# /Ox=optimize for speed, global optimizations, intrinsic functions, favor fast code, frame pointer omission
+# /O2=optimize for speed, global optimizations, intrinsic functions, favor fast code, frame pointer omission
 # /EHsc=C++ exceptions, /fp:fast=Enable reasonable FP optimizations, /GS-=No buffer security checks, /GL=whole program optimizations
 # To include debug information add '/Z7' to CXXFLAGS and '/DEBUG' to LINKFLAGS
-CXXFLAGS       = ['/nologo', '/Ox', '/fp:fast', '/D', 'WIN32', '/D', 'WIN64', '/W3', '/EHsc', '/GS-', '/GL', '/MD', '/D', 'MTS_DEBUG', '/D', 'SINGLE_PRECISION', '/D', 'SPECTRUM_SAMPLES=3', '/D', 'MTS_SSE', '/D', 'MTS_HAS_COHERENT_RT', '/D', '_CONSOLE', '/D', 'NDEBUG', '/openmp']
+CXXFLAGS       = ['/nologo', '/O2', '/fp:fast', '/D', 'WIN32', '/D', 'WIN64', '/W3', '/EHsc', '/GS-', '/GL', '/MD', '/D', 'MTS_DEBUG', '/D', 'SINGLE_PRECISION', '/D', 'SPECTRUM_SAMPLES=3', '/D', 'MTS_SSE', '/D', 'MTS_HAS_COHERENT_RT', '/D', '_CONSOLE', '/D', 'NDEBUG', '/openmp']
 SHCXXFLAGS     = CXXFLAGS
 TARGET_ARCH    = 'x86_64'
 MSVC_VERSION   = '9.0'
diff --git a/build/config-msvc2010-win32-debug.py b/build/config-msvc2010-win32-debug.py
index 3b80ba42..a4d3ccc2 100644
--- a/build/config-msvc2010-win32-debug.py
+++ b/build/config-msvc2010-win32-debug.py
@@ -4,7 +4,7 @@ BUILDDIR       = '#build/debug'
 DISTDIR        = '#dist'
 CXX            = 'cl'
 CC             = 'cl'
-# /Ox=optimize for speed, global optimizations, intrinsic functions, favor fast code, frame pointer omission
+# /O2=optimize for speed, global optimizations, intrinsic functions, favor fast code, frame pointer omission
 # /EHsc=C++ exceptions, /fp:fast=Enable reasonable FP optimizations, /GS-=No buffer security checks, /GL=whole program optimizations
 # To include debug information add '/Z7' to CXXFLAGS and '/DEBUG' to LINKFLAGS
 CXXFLAGS       = ['/nologo', '/Od', '/Z7', '/fp:fast', '/arch:SSE2' ,'/D', 'WIN32', '/W3', '/EHsc', '/GS-', '/GL', '/MD', '/D', 'MTS_DEBUG', '/D', 'SINGLE_PRECISION', '/D', 'SPECTRUM_SAMPLES=3', '/D', 'MTS_SSE', '/D', 'MTS_HAS_COHERENT_RT', '/D', '_CONSOLE', '/D', 'NDEBUG', '/openmp']
diff --git a/build/config-msvc2010-win32.py b/build/config-msvc2010-win32.py
index 37404135..2fe9acd9 100644
--- a/build/config-msvc2010-win32.py
+++ b/build/config-msvc2010-win32.py
@@ -4,10 +4,10 @@ BUILDDIR       = '#build/release'
 DISTDIR        = '#dist'
 CXX            = 'cl'
 CC             = 'cl'
-# /Ox=optimize for speed, global optimizations, intrinsic functions, favor fast code, frame pointer omission
+# /O2=optimize for speed, global optimizations, intrinsic functions, favor fast code, frame pointer omission
 # /EHsc=C++ exceptions, /fp:fast=Enable reasonable FP optimizations, /GS-=No buffer security checks, /GL=whole program optimizations
 # To include debug information add '/Z7' to CXXFLAGS and '/DEBUG' to LINKFLAGS
-CXXFLAGS       = ['/nologo', '/Ox', '/fp:fast', '/arch:SSE2' ,'/D', 'WIN32', '/W3', '/EHsc', '/GS-', '/GL', '/MD', '/D', 'MTS_DEBUG', '/D', 'SINGLE_PRECISION', '/D', 'SPECTRUM_SAMPLES=3', '/D', 'MTS_SSE', '/D', 'MTS_HAS_COHERENT_RT', '/D', '_CONSOLE', '/D', 'NDEBUG', '/openmp']
+CXXFLAGS       = ['/nologo', '/O2', '/fp:fast', '/arch:SSE2' ,'/D', 'WIN32', '/W3', '/EHsc', '/GS-', '/GL', '/MD', '/D', 'MTS_DEBUG', '/D', 'SINGLE_PRECISION', '/D', 'SPECTRUM_SAMPLES=3', '/D', 'MTS_SSE', '/D', 'MTS_HAS_COHERENT_RT', '/D', '_CONSOLE', '/D', 'NDEBUG', '/openmp']
 SHCXXFLAGS     = CXXFLAGS
 TARGET_ARCH    = 'x86'
 MSVC_VERSION   = '10.0'
diff --git a/build/config-msvc2010-win64-debug.py b/build/config-msvc2010-win64-debug.py
index 6469f23e..65882194 100644
--- a/build/config-msvc2010-win64-debug.py
+++ b/build/config-msvc2010-win64-debug.py
@@ -4,7 +4,7 @@ BUILDDIR       = '#build/debug'
 DISTDIR        = '#dist'
 CXX            = 'cl'
 CC             = 'cl'
-# /Ox=optimize for speed, global optimizations, intrinsic functions, favor fast code, frame pointer omission
+# /O2=optimize for speed, global optimizations, intrinsic functions, favor fast code, frame pointer omission
 # /EHsc=C++ exceptions, /fp:fast=Enable reasonable FP optimizations, /GS-=No buffer security checks, /GL=whole program optimizations
 # To include debug information add '/Z7' to CXXFLAGS and '/DEBUG' to LINKFLAGS
 CXXFLAGS       = ['/nologo', '/Od', '/Z7', '/fp:fast', '/D', 'WIN32', '/D', 'WIN64', '/W3', '/EHsc', '/GS-', '/GL', '/MD', '/D', 'MTS_DEBUG', '/D', 'SINGLE_PRECISION', '/D', 'SPECTRUM_SAMPLES=3', '/D', 'MTS_SSE', '/D', 'MTS_HAS_COHERENT_RT', '/D', '_CONSOLE', '/D', 'NDEBUG', '/openmp']
diff --git a/build/config-msvc2010-win64.py b/build/config-msvc2010-win64.py
index 27335510..2d3bee4d 100644
--- a/build/config-msvc2010-win64.py
+++ b/build/config-msvc2010-win64.py
@@ -4,10 +4,10 @@ BUILDDIR       = '#build/release'
 DISTDIR        = '#dist'
 CXX            = 'cl'
 CC             = 'cl'
-# /Ox=optimize for speed, global optimizations, intrinsic functions, favor fast code, frame pointer omission
+# /O2=optimize for speed, global optimizations, intrinsic functions, favor fast code, frame pointer omission
 # /EHsc=C++ exceptions, /fp:fast=Enable reasonable FP optimizations, /GS-=No buffer security checks, /GL=whole program optimizations
 # To include debug information add '/Z7' to CXXFLAGS and '/DEBUG' to LINKFLAGS
-CXXFLAGS       = ['/nologo', '/Ox', '/fp:fast', '/D', 'WIN32', '/D', 'WIN64', '/W3', '/EHsc', '/GS-', '/GL', '/MD', '/D', 'MTS_DEBUG', '/D', 'SINGLE_PRECISION', '/D', 'SPECTRUM_SAMPLES=3', '/D', 'MTS_SSE', '/D', 'MTS_HAS_COHERENT_RT', '/D', '_CONSOLE', '/D', 'NDEBUG', '/openmp']
+CXXFLAGS       = ['/nologo', '/O2', '/fp:fast', '/D', 'WIN32', '/D', 'WIN64', '/W3', '/EHsc', '/GS-', '/GL', '/MD', '/D', 'MTS_DEBUG', '/D', 'SINGLE_PRECISION', '/D', 'SPECTRUM_SAMPLES=3', '/D', 'MTS_SSE', '/D', 'MTS_HAS_COHERENT_RT', '/D', '_CONSOLE', '/D', 'NDEBUG', '/openmp']
 SHCXXFLAGS     = CXXFLAGS
 TARGET_ARCH    = 'x86_64'
 MSVC_VERSION   = '10.0'