diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-28 12:47:58 -0400 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-28 12:47:58 -0400 |
commit | dbddd3c904d34eecdda4bb7d1d0dc30c4ea7e13b (patch) | |
tree | c3f40984bd0ec4cf136ad90de871b5e87a55062b /linux | |
parent | 602b9da9928e10b55489d2a5c9599107b32dc90a (diff) | |
download | qtlocation-mapboxgl-dbddd3c904d34eecdda4bb7d1d0dc30c4ea7e13b.tar.gz |
gyp fixes
Diffstat (limited to 'linux')
-rw-r--r-- | linux/mapboxgl-app.gyp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/linux/mapboxgl-app.gyp b/linux/mapboxgl-app.gyp index ee38b4b266..92175d1c0b 100644 --- a/linux/mapboxgl-app.gyp +++ b/linux/mapboxgl-app.gyp @@ -13,7 +13,9 @@ '../platform/default/glfw_view.cpp', '../platform/default/log_stderr.cpp', ], - + 'libraries': [ + '<@(glfw3_static_libs)', + ], 'conditions': [ ['OS == "mac"', @@ -24,23 +26,22 @@ '<@(glfw3_cflags)', ], 'OTHER_LDFLAGS': [ - '<@(glfw3_libraries)', + '<@(glfw3_ldflags)', ], } }, # Non-Mac OS X { - 'cflags': [ + 'cflags_cc': [ '<@(glfw3_cflags)', + '-I<(boost_root)/include', + ], + 'ldflags': [ + '<@(glfw3_ldflags)', + '-L<(boost_root)/lib', + '-lboost_regex', ], - 'link_settings': { - 'libraries': [ - '<@(glfw3_libraries)', - '-L<(boost_root)/lib', - '-lboost_regex', - ], - }, }], ], 'dependencies': [ |