reactos/ninja
1
0
Fork 0
mirror of https://github.com/reactos/ninja.git synced 2025-02-12 14:48:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

try again on vs2012 build fixes

Browse Source
This commit is contained in:
Scott Graham 2013-04-10 20:16:24 -07:00
parent 461fec29aa
commit 84b629e474
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.py
View File

@ -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',

4
src/build_test.cc
View File

@ -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();