fix gyp project

This commit is contained in:
Konstantin Käfer
2014-10-30 15:06:10 -04:00
parent e3bc69b7e7
commit 242993b43a
5 changed files with 20 additions and 19 deletions

7
configure vendored
View File

@@ -45,13 +45,6 @@ case ${MASON_PLATFORM} in
ZLIB_VERSION=system
BOOST_VERSION=system
;;
'osx')
GLFW_VERSION=a21f2377
SQLITE_VERSION=system
LIBUV_VERSION=0.10.28
ZLIB_VERSION=system
BOOST_VERSION=system
;;
*)
GLFW_VERSION=a21f2377
SQLITE_VERSION=system

View File

@@ -22,8 +22,6 @@
'conditions': [
['OS == "linux"', {
'other_ldflags': [
'-L<(boost_root)/lib',
'-lboost_regex',
'<@(glfw3_static_libs)',
'<@(glfw3_ldflags)',
]

View File

@@ -22,13 +22,24 @@
'<@(glfw3_cflags)',
'-I<(boost_root)/include',
],
'libraries': [
'<@(png_ldflags)',
'<@(sqlite3_ldflags)',
'<@(glfw3_static_libs)',
'<@(glfw3_ldflags)',
'<@(curl_ldflags)',
'<@(zlib_ldflags)',
'variables': {
'ldflags': [
'<@(png_ldflags)',
'<@(sqlite3_ldflags)',
'<@(glfw3_static_libs)',
'<@(glfw3_ldflags)',
'<@(curl_ldflags)',
'<@(zlib_ldflags)',
],
},
'conditions': [
['OS == "mac"', {
'xcode_settings': {
'OTHER_LDFLAGS': [ '<@(ldflags)' ],
}
}, {
'ldflags': [ '<@(ldflags)' ],
}]
],
'dependencies': [
'../mapboxgl.gyp:mbgl-standalone',

View File

@@ -40,8 +40,7 @@
'<@(sqlite3_ldflags)',
'<@(glfw3_static_libs)',
'<@(glfw3_ldflags)',
'<@(curl_ldflags)',
'<@(png_ldflags)'
'<@(zlib_ldflags)',
]
},
'conditions': [