From 9017c5b46b1a865db58a9f29ce4bca79c9feb15a Mon Sep 17 00:00:00 2001 From: Frances Buontempo Date: Thu, 12 Jan 2012 19:04:42 -0800 Subject: windows: make ninja_test build --- configure.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.py b/configure.py index 7a79068..cce4197 100755 --- a/configure.py +++ b/configure.py @@ -262,6 +262,8 @@ if options.with_gtest: variables=[('cflags', gtest_cflags)]) test_cflags = cflags + ['-I%s' % os.path.join(path, 'include')] +elif platform == 'windows': + test_libs.extend(['gtest_main.lib', 'gtest.lib']) else: test_libs.extend(['-lgtest_main', '-lgtest']) @@ -280,7 +282,7 @@ for name in ['build_log_test', 'util_test']: objs += cxx(name, variables=[('cflags', test_cflags)]) -if platform != 'mingw': +if platform != 'mingw' and platform != 'windows': test_libs.append('-lpthread') ninja_test = n.build(binary('ninja_test'), 'link', objs, implicit=ninja_lib, variables=[('ldflags', test_ldflags), -- cgit v0.12