diff --git a/wscript b/wscript
index 9e8245c11c..70c215e4bd 100644
--- a/wscript
+++ b/wscript
@@ -55,16 +55,17 @@ compiler_flags_dictionaries= {
         'c99': '-std=c99',
     },
     'msvc' : {
-        'debuggable' : ['/Od', '/Zi', '/MTd'],
-        'linker-debuggable' : ['/DEBUG' ],
-        'nondebuggable' : [ '/MD', '-DNDEBUG' ],
+        'debuggable' : ['/DDEBUG', '/Od', '/Zi', '/MDd', '/Gd', '/EHsc'],
+        'linker-debuggable' : ['/DEBUG', '/INCREMENTAL' ],
+        'nondebuggable' : ['/DNDEBUG', '/Ob1', '/MD', '/Gd', '/EHsc'],
         'profile' : '',
+        'sse' : '/arch:SSE',
         'silence-unused-arguments' : '',
         'sse' : '',
         'fpmath-see' : '',
         'xmmintrinsics' : '',
         'pipe' : '',
-        'full-optimization' : '',
+        'full-optimization' : '/O2',
         'no-frame-pointer' : '',
         'fast-math' : '',
         'strength-reduce' : '',
@@ -78,7 +79,7 @@ compiler_flags_dictionaries= {
         'c-strict' : '',
         'cxx-strict' : '',
         'strict' : '',
-        'c99': '-TP',
+        'c99': '/TP',
     },
 }