diff -r 95d818e1f496 -r 365162dbb87f AMBuildScript --- a/AMBuildScript Fri Mar 21 12:03:49 2014 -0400 +++ b/AMBuildScript Fri Mar 21 12:04:41 2014 -0400 @@ -216,6 +216,8 @@ cfg.defines += ['DEBUG', '_DEBUG'] if cxx.behavior == 'msvc': cfg.cflags += ['/Od', '/RTC1'] + elif int(cxx.version) >= 1600: + cfg.cflags += ['/d2Zi+'] # This needs to be after our optimization flags which could otherwise disable it. if cxx.name == 'msvc':