summaryrefslogtreecommitdiffstats
path: root/configure.py
diff options
context:
space:
mode:
Diffstat (limited to 'configure.py')
-rwxr-xr-xconfigure.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.py b/configure.py
index 4390434..99a2c86 100755
--- a/configure.py
+++ b/configure.py
@@ -305,6 +305,8 @@ if platform.is_msvc():
else:
n.variable('ar', configure_env.get('AR', 'ar'))
+# Note that build settings are separately specified in CMakeLists.txt and
+# these lists should be kept in sync.
if platform.is_msvc():
cflags = ['/showIncludes',
'/nologo', # Don't print startup banner.
@@ -320,6 +322,7 @@ if platform.is_msvc():
# Disable warnings about ignored typedef in DbgHelp.h
'/wd4091',
'/GR-', # Disable RTTI.
+ '/Zc:__cplusplus',
# Disable size_t -> int truncation warning.
# We never have strings or arrays larger than 2**31.
'/wd4267',
@@ -339,6 +342,7 @@ else:
'-Wno-unused-parameter',
'-fno-rtti',
'-fno-exceptions',
+ '-std=c++11',
'-fvisibility=hidden', '-pipe',
'-DNINJA_PYTHON="%s"' % options.with_python]
if options.debug: