diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2015-03-13 12:05:51 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-03-13 12:06:11 +0100 |
| commit | 5e40f72b7cd5fd937ba8b628678cd5122298e8e5 (patch) | |
| tree | b30acdb825a4c633dd81313eeae429664233a660 /gyp | |
| parent | 5225a2ce5b7cd4fb6b08d1746c83455d64ef2c94 (diff) | |
| download | qtlocation-mapboxgl-5e40f72b7cd5fd937ba8b628678cd5122298e8e5.tar.gz | |
scripts for running linux tests with docker
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/core.gypi | 3 | ||||
| -rw-r--r-- | gyp/headless-glx.gypi | 6 | ||||
| -rw-r--r-- | gyp/platform-osx.gypi | 2 |
3 files changed, 11 insertions, 0 deletions
diff --git a/gyp/core.gypi b/gyp/core.gypi index 9a3b07d0bb..246419371c 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -29,14 +29,17 @@ 'variables': { 'cflags_cc': [ '<@(uv_cflags)', + '<@(opengl_cflags)', '<@(boost_cflags)', ], 'cflags': [ '<@(uv_cflags)', + '<@(opengl_cflags)', '-fPIC' ], 'ldflags': [ '<@(uv_ldflags)', + '<@(opengl_ldflags)', ], 'libraries': [ '<@(uv_static_libs)', diff --git a/gyp/headless-glx.gypi b/gyp/headless-glx.gypi index 06062be75f..5b9f3e136f 100644 --- a/gyp/headless-glx.gypi +++ b/gyp/headless-glx.gypi @@ -13,6 +13,12 @@ 'include_dirs': [ '../include', ], + + 'cflags_cc': [ '<@(opengl_cflags)' ], + + 'link_settings': { + 'libraries': [ '<@(opengl_ldflags)' ], + }, }, ], } diff --git a/gyp/platform-osx.gypi b/gyp/platform-osx.gypi index 011f26e836..39e18bb839 100644 --- a/gyp/platform-osx.gypi +++ b/gyp/platform-osx.gypi @@ -29,6 +29,8 @@ '-framework Foundation', '-framework ImageIO', '-framework CoreServices', + '-framework OpenGL', + '-framework ApplicationServices', ], }, |