diff options
| author | Dane Springmeyer <dane@mapbox.com> | 2014-10-29 22:16:44 -0400 |
|---|---|---|
| committer | Dane Springmeyer <dane@mapbox.com> | 2014-10-29 22:16:44 -0400 |
| commit | 22f67bb8ab6960e1263f0c85ba540ff96123540b (patch) | |
| tree | 96caa026554c19252d5c90af7e24f314111068a1 /gyp | |
| parent | 761f753cbdba350411785ce4e82d4e843bf03224 (diff) | |
| download | qtlocation-mapboxgl-22f67bb8ab6960e1263f0c85ba540ff96123540b.tar.gz | |
start passing ldflags
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/install.gypi | 1 | ||||
| -rw-r--r-- | gyp/mbgl.gypi | 75 |
2 files changed, 1 insertions, 75 deletions
diff --git a/gyp/install.gypi b/gyp/install.gypi index e7217219c8..c25490c456 100644 --- a/gyp/install.gypi +++ b/gyp/install.gypi @@ -31,6 +31,7 @@ './utils/mbgl-config/build.sh', '<(install_prefix)', '<(platform)', + '<@(png_ldflags)' ] } ] diff --git a/gyp/mbgl.gypi b/gyp/mbgl.gypi deleted file mode 100644 index 0d914f46f4..0000000000 --- a/gyp/mbgl.gypi +++ /dev/null @@ -1,75 +0,0 @@ -{ - 'targets': [ - { 'target_name': 'mbgl', - 'product_name': 'mbgl', - 'type': 'static_library', - 'standalone_static_library': 1, - 'hard_dependency': 1, - 'dependencies': [ - 'shaders', - ], - 'sources': [ - '<!@(find src -name "*.cpp")', - '<!@(test -f "config/constants_local.cpp" && echo "config/constants_local.cpp" || echo "config/constants.cpp")', - '<!@(find src -name "*.c")', - '<!@(find src -name "*.h")', - '<!@(find include -name "*.hpp")', - '<!@(find include -name "*.h")', - '<!@(find src -name "*.glsl")', - 'bin/style.json' - ], - 'include_dirs': [ - '../include' - ], - 'conditions': [ - ['OS == "mac"', { - 'xcode_settings': { - 'PUBLIC_HEADERS_FOLDER_PATH': 'include', - 'OTHER_CPLUSPLUSFLAGS': [ - '<@(png_cflags)', - '<@(uv_cflags)', - '<@(sqlite3_cflags)', - '<@(zlib_cflags)', - '-I<(boost_root)/include', - ], - 'OTHER_CFLAGS': [ - '<@(uv_cflags)', - ], - }, - }, { - 'cflags': [ - '<@(png_cflags)', - '<@(uv_cflags)', - '<@(sqlite3_cflags)', - '<@(zlib_cflags)', - '-I<(boost_root)/include', - ], - }] - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../include', - ], - 'conditions': [ - ['OS == "mac"', { - 'xcode_settings': { - 'OTHER_LDFLAGS': [ - '<@(png_libraries)', - '<@(uv_libraries)', - '<@(sqlite3_libraries)', - '<@(zlib_libraries)', - ] - } - }, { - 'libraries': [ - '<@(png_libraries)', - '<@(uv_libraries)', - '<@(sqlite3_libraries)', - '<@(zlib_libraries)', - ] - }] - ] - } - } - ] -} |