luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

2
gyp_uv.py
View File

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