diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2015-01-22 07:02:14 -0800 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-02-04 10:49:06 +0100 |
| commit | 92a7f73bbe10f817d5c2d607ba07fc69b859593b (patch) | |
| tree | 6dfb4734d3b8731e8ec21cd036b192eceb31104b /test | |
| parent | bf629c97db98cc835e324409edfd8729bb3583c2 (diff) | |
| download | qtlocation-mapboxgl-92a7f73bbe10f817d5c2d607ba07fc69b859593b.tar.gz | |
fixes for linux
Diffstat (limited to 'test')
| -rw-r--r-- | test/test.gyp | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/test/test.gyp b/test/test.gyp index 9958240d06..0362b8805c 100644 --- a/test/test.gyp +++ b/test/test.gyp @@ -49,6 +49,7 @@ '<@(glfw3_static_libs)', '<@(sqlite3_static_libs)', '<@(zlib_static_libs)', + '<@(curl_static_libs)', ], 'variables': { 'cxxflags': [ @@ -60,16 +61,22 @@ '<@(glfw3_ldflags)', '<@(sqlite3_ldflags)', '<@(zlib_ldflags)', + '<@(curl_ldflags)', ], }, - 'xcode_settings': { - 'OTHER_CFLAGS': [ '<@(cxxflags)' ], - 'OTHER_CPLUSPLUSFLAGS': [ '<@(cxxflags)' ], - 'OTHER_LDFLAGS': [ '<@(ldflags)' ], - }, - 'cflags': [ '<@(cxxflags)' ], - 'cxxflags': [ '<@(cxxflags)' ], - 'ldflags': [ '<@(ldflags)' ], + 'conditions': [ + ['OS == "mac"', { + 'xcode_settings': { + 'OTHER_CFLAGS': [ '<@(cxxflags)' ], + 'OTHER_CPLUSPLUSFLAGS': [ '<@(cxxflags)' ], + 'OTHER_LDFLAGS': [ '<@(ldflags)' ], + }, + }, { + 'cflags': [ '<@(cxxflags)' ], + 'cxxflags': [ '<@(cxxflags)' ], + 'libraries': [ '<@(ldflags)' ], + }], + ], }, ] } |