summaryrefslogtreecommitdiffstats
path: root/configure.py
diff options
context:
space:
mode:
authorFrances Buontempo <frances.buontempo@gmail.com>2012-01-13 03:04:42 (GMT)
committerEvan Martin <martine@danga.com>2012-01-13 03:04:42 (GMT)
commit9017c5b46b1a865db58a9f29ce4bca79c9feb15a (patch)
treed57904418ec0112de60fac72a1465afd05a07d59 /configure.py
parent920b0f7a276d8170efbcc73da154185605d22f56 (diff)
downloadNinja-9017c5b46b1a865db58a9f29ce4bca79c9feb15a.zip
Ninja-9017c5b46b1a865db58a9f29ce4bca79c9feb15a.tar.gz
Ninja-9017c5b46b1a865db58a9f29ce4bca79c9feb15a.tar.bz2
windows: make ninja_test build
Diffstat (limited to 'configure.py')
-rwxr-xr-xconfigure.py4
1 files changed, 3 insertions, 1 deletions
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),