Merge remote-tracking branch 'origin/v0.10'

Conflicts:
	src/unix/udp.c
This commit is contained in:
Ben Noordhuis 2013-11-27 17:35:57 +01:00
commit 9342ef7155
2 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View File

@ -3,6 +3,7 @@
*.l[oa]
*.opensdf
*.orig
*.pyc
*.sdf
*.suo
core

View File

@ -75,7 +75,7 @@ if __name__ == '__main__':
if sys.platform != 'win32':
if '-f' not in args:
args.extend('-f make'.split())
if 'ninja' not in args:
if 'eclipse' not in args and 'ninja' not in args:
args.extend(['-Goutput_dir=' + output_dir])
args.extend(['--generator-output', output_dir])
(major, minor), is_clang = compiler_version()