diff options
| author | Evan Martin <martine@danga.com> | 2012-04-26 03:06:59 (GMT) |
|---|---|---|
| committer | Evan Martin <martine@danga.com> | 2012-04-26 03:06:59 (GMT) |
| commit | 5d6249fa8c3d6241f46701f43fd48db576714ae4 (patch) | |
| tree | d009d66bc559d939bcb29a2b24004d09cd95c004 /configure.py | |
| parent | 16cab01cccf0b3ccadb150cd54f760929b3cc07e (diff) | |
| parent | d8775e0db82fe140d97fc1bc26730eec17e93776 (diff) | |
| download | Ninja-5d6249fa8c3d6241f46701f43fd48db576714ae4.zip Ninja-5d6249fa8c3d6241f46701f43fd48db576714ae4.tar.gz Ninja-5d6249fa8c3d6241f46701f43fd48db576714ae4.tar.bz2 | |
Merge pull request #207 from iwadon/fix-configure.py-windows
Fix configure.py for unpacked gtest on Windows platform.
Diffstat (limited to 'configure.py')
| -rwxr-xr-x | configure.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/configure.py b/configure.py index 0637de6..b5c986d 100755 --- a/configure.py +++ b/configure.py @@ -259,11 +259,14 @@ if options.with_gtest: path = options.with_gtest gtest_all_incs = '-I%s -I%s' % (path, os.path.join(path, 'include')) - gtest_cflags = '-fvisibility=hidden ' + gtest_all_incs - objs += n.build(built('gtest-all.o'), 'cxx', + if platform == 'windows': + gtest_cflags = '/nologo /EHsc ' + gtest_all_incs + else: + gtest_cflags = '-fvisibility=hidden ' + gtest_all_incs + objs += n.build(built('gtest-all' + objext), 'cxx', os.path.join(path, 'src/gtest-all.cc'), variables=[('cflags', gtest_cflags)]) - objs += n.build(built('gtest_main.o'), 'cxx', + objs += n.build(built('gtest_main' + objext), 'cxx', os.path.join(path, 'src/gtest_main.cc'), variables=[('cflags', gtest_cflags)]) |