gre-ilya/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v0.8'

Browse Source 
Conflicts:
	test/test-spawn.c
	uv.gyp
This commit is contained in:
Ben Noordhuis 2012-11-09 20:39:52 +01:00
commit f352e40e00
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
uv.gyp
View File

@ -9,11 +9,9 @@
], ],
'conditions': [ 'conditions': [
['OS=="solaris"', { ['OS=="solaris"', {
'cflags': ['-pthreads'], 'cflags': [ '-pthreads' ],
'ldlags': ['-pthreads'],
}, { }, {
'cflags': ['-pthread'], 'cflags': [ '-pthread' ],
'ldlags': ['-pthread'],
}], }],
], ],
}], }],
@ -38,12 +36,11 @@
['OS == "mac"', { ['OS == "mac"', {
'defines': [ '_DARWIN_USE_64_BIT_INODE=1' ], 'defines': [ '_DARWIN_USE_64_BIT_INODE=1' ],
}], }],
['OS == "linux"', {
'libraries': [ '-ldl' ],
}],
], ],
}, },
'defines': [
'HAVE_CONFIG_H'
],
'sources': [ 'sources': [
'common.gypi', 'common.gypi',
'include/uv.h', 'include/uv.h',
@ -144,7 +141,16 @@
'src/unix/udp.c', 'src/unix/udp.c',
], ],
'include_dirs': [ 'src/unix/ev', ], 'include_dirs': [ 'src/unix/ev', ],
'libraries': [ '-lm' ], 'link_settings': {
'libraries': [ '-lm' ],
'conditions': [
['OS=="solaris"', {
'ldflags': [ '-pthreads' ],
}, {
'ldflags': [ '-pthread' ],
}],
],
},
'conditions': [ 'conditions': [
['"<(library)" == "shared_library"', { ['"<(library)" == "shared_library"', {
'cflags': [ '-fPIC' ], 'cflags': [ '-fPIC' ],
@ -153,7 +159,7 @@
}], }],
[ 'OS=="mac"', { [ 'OS=="mac"', {
'sources': [ 'src/unix/darwin.c', 'src/unix/fsevents.c' ], 'sources': [ 'src/unix/darwin.c', 'src/unix/fsevents.c' ],
'direct_dependent_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'$(SDKROOT)/System/Library/Frameworks/CoreServices.framework', '$(SDKROOT)/System/Library/Frameworks/CoreServices.framework',
], ],
@ -173,8 +179,8 @@
'defines': [ 'defines': [
'EV_CONFIG_H="config_linux.h"', 'EV_CONFIG_H="config_linux.h"',
], ],
'direct_dependent_settings': { 'link_settings': {
'libraries': [ '-lrt' ], 'libraries': [ '-ldl', '-lrt' ],
}, },
}], }],
[ 'OS=="solaris"', { [ 'OS=="solaris"', {
@ -184,7 +190,7 @@
'_XOPEN_SOURCE=500', '_XOPEN_SOURCE=500',
'EV_CONFIG_H="config_sunos.h"', 'EV_CONFIG_H="config_sunos.h"',
], ],
'direct_dependent_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'-lkstat', '-lkstat',
'-lnsl', '-lnsl',
@ -201,7 +207,7 @@
'_XOPEN_SOURCE=500', '_XOPEN_SOURCE=500',
'EV_CONFIG_H="config_aix.h"', 'EV_CONFIG_H="config_aix.h"',
], ],
'direct_dependent_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'-lperfstat', '-lperfstat',
], ],
@ -212,7 +218,7 @@
'defines': [ 'defines': [
'EV_CONFIG_H="config_freebsd.h"', 'EV_CONFIG_H="config_freebsd.h"',
], ],
'direct_dependent_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'-lkvm', '-lkvm',
], ],
@ -229,7 +235,7 @@
'defines': [ 'defines': [
'EV_CONFIG_H="config_netbsd.h"', 'EV_CONFIG_H="config_netbsd.h"',
], ],
'direct_dependent_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'-lkvm', '-lkvm',
], ],