diff options
| author | Dane Springmeyer <dane@mapbox.com> | 2014-10-29 15:27:41 -0400 |
|---|---|---|
| committer | Dane Springmeyer <dane@mapbox.com> | 2014-10-29 15:27:41 -0400 |
| commit | c11dc0fa333bb20b2c3706c4d2ff739f6c25cd36 (patch) | |
| tree | f73c430dc0cff7b45336dbda7725bb9be23fca9a /linux | |
| parent | 139606019671c88dc86eea6b6ad4766b0006922a (diff) | |
| download | qtlocation-mapboxgl-c11dc0fa333bb20b2c3706c4d2ff739f6c25cd36.tar.gz | |
attempt to build against standalone libmgl.a
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/mapboxgl-app.gyp | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/linux/mapboxgl-app.gyp b/linux/mapboxgl-app.gyp index 77e4a5ab07..098b2bee93 100644 --- a/linux/mapboxgl-app.gyp +++ b/linux/mapboxgl-app.gyp @@ -25,28 +25,43 @@ 'OTHER_CPLUSPLUSFLAGS':[ '<@(glfw3_cflags)', ], - 'OTHER_LDFLAGS': [ - '<@(glfw3_ldflags)', - ], - } + }, + 'libraries': [ + '-L<(PRODUCT_DIR)/', + '-lmbgl', + '-lmbgl-linux', + '<@(png_ldflags)', + '<@(sqlite3_ldflags)', + '<@(glfw3_ldflags)', + '<@(curl_ldflags)', + '<@(zlib_ldflags)', + ] }, - # Non-Mac OS X { 'cflags_cc': [ '<@(glfw3_cflags)', '-I<(boost_root)/include', ], - 'ldflags': [ + 'libraries': [ + '-Wl,--start-group', + '-L<(PRODUCT_DIR)/', + '-lmbgl', + '-lmbgl-linux', + '<@(curl_static_libs)', + '<@(png_ldflags)', + '<@(sqlite3_ldflags)', '<@(glfw3_ldflags)', '-L<(boost_root)/lib', '-lboost_regex', + '<@(curl_ldflags)', + '<@(zlib_ldflags)', + '-Wl,--end-group' ], }], ], 'dependencies': [ - '../mapboxgl.gyp:mbgl-core', - '../mapboxgl.gyp:mbgl-linux', + '../mapboxgl.gyp:mbgl-standalone', '../mapboxgl.gyp:copy_styles', '../mapboxgl.gyp:copy_certificate_bundle', ], |