diff options
| author | Scott Graham <scott.github@h4ck3r.net> | 2013-04-11 03:16:24 (GMT) |
|---|---|---|
| committer | Scott Graham <scott.github@h4ck3r.net> | 2013-04-11 03:16:24 (GMT) |
| commit | 84b629e474178da1462d04d0059be89a39832bd0 (patch) | |
| tree | f76349c50f31c3676dcca8a77df38ab8ff0ad002 | |
| parent | 461fec29aa6dce66fdf431256744f67b5e9ba6b9 (diff) | |
| download | Ninja-84b629e474178da1462d04d0059be89a39832bd0.zip Ninja-84b629e474178da1462d04d0059be89a39832bd0.tar.gz Ninja-84b629e474178da1462d04d0059be89a39832bd0.tar.bz2 | |
try again on vs2012 build fixes
| -rwxr-xr-x | configure.py | 3 | ||||
| -rw-r--r-- | src/build_test.cc | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/configure.py b/configure.py index b40dafb..c526c1a 100755 --- a/configure.py +++ b/configure.py @@ -127,6 +127,7 @@ if platform == 'windows': # We never have strings or arrays larger than 2**31. '/wd4267', '/DNOMINMAX', '/D_CRT_SECURE_NO_WARNINGS', + '/D_VARIADIC_MAX=10', '/DNINJA_PYTHON="%s"' % options.with_python] ldflags = ['/DEBUG', '/libpath:$builddir'] if not options.debug: @@ -321,7 +322,7 @@ if options.with_gtest: gtest_all_incs = '-I%s -I%s' % (path, os.path.join(path, 'include')) if platform == 'windows': - gtest_cflags = '/nologo /EHsc /Zi ' + gtest_all_incs + gtest_cflags = '/nologo /EHsc /Zi /D_VARIADIC_MAX=10 ' + gtest_all_incs else: gtest_cflags = '-fvisibility=hidden ' + gtest_all_incs objs += n.build(built('gtest-all' + objext), 'cxx', diff --git a/src/build_test.cc b/src/build_test.cc index 2a0fa0f..1854387 100644 --- a/src/build_test.cc +++ b/src/build_test.cc @@ -242,8 +242,8 @@ TEST_F(PlanTest, PoolsWithDepthTwo) { )); // Mark all the out* nodes dirty for (int i = 0; i < 3; ++i) { - GetNode("out" + string(1, '1' + i))->MarkDirty(); - GetNode("outb" + string(1, '1' + i))->MarkDirty(); + GetNode("out" + string(1, '1' + static_cast<char>(i)))->MarkDirty(); + GetNode("outb" + string(1, '1' + static_cast<char>(i)))->MarkDirty(); } GetNode("allTheThings")->MarkDirty(); |