diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-05-27 14:30:38 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-01 13:53:39 +0300 |
| commit | a3e0c60a7c322c9040cfcf880cc7ca4956cf9e12 (patch) | |
| tree | df3a234494fa4a46b73318ddcea2614af7033c68 | |
| parent | f301df931cf879cf59765d5b0ccf5eb1e65dbdc6 (diff) | |
| download | qtlocation-mapboxgl-a3e0c60a7c322c9040cfcf880cc7ca4956cf9e12.tar.gz | |
[build] Added unique_resource as dependency
| m--------- | .mason | 0 | ||||
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | mbgl.gypi | 3 | ||||
| -rw-r--r-- | platform/android/scripts/configure.sh | 1 | ||||
| -rw-r--r-- | platform/ios/scripts/configure.sh | 1 | ||||
| -rw-r--r-- | platform/linux/scripts/configure.sh | 1 | ||||
| -rw-r--r-- | platform/osx/scripts/configure.sh | 1 | ||||
| -rw-r--r-- | platform/qt/scripts/configure.sh | 1 |
8 files changed, 9 insertions, 0 deletions
diff --git a/.mason b/.mason -Subproject 34cb8a83904d873dfcee6e3543c7527e83816d4 +Subproject 33d7b1139f7fd8d66f141160ad37f926b772d6b @@ -99,6 +99,7 @@ CONFIG+=" 'variables': {"$LN print_opengl_flags print_qt_flags +print_flags unique_resource cflags print_flags protozero cflags print_flags boost cflags print_flags boost_libprogram_options static_libs @@ -179,6 +179,7 @@ '<@(rapidjson_cflags)', '<@(variant_cflags)', '<@(earcut_cflags)', + '<@(unique_resource_cflags)', ], 'cflags': [ '<@(opengl_cflags)', @@ -291,11 +292,13 @@ 'cflags_cc': [ '<@(variant_cflags)', '<@(geometry_cflags)', + '<@(unique_resource_cflags)', ], 'xcode_settings': { 'OTHER_CPLUSPLUSFLAGS': [ '<@(variant_cflags)', '<@(geometry_cflags)', + '<@(unique_resource_cflags)', ], }, }, diff --git a/platform/android/scripts/configure.sh b/platform/android/scripts/configure.sh index a33249ebc0..2bbc134597 100644 --- a/platform/android/scripts/configure.sh +++ b/platform/android/scripts/configure.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash +UNIQUE_RESOURCE_VERSION=dev PROTOZERO_VERSION=1.3.0 BOOST_VERSION=1.60.0 LIBPNG_VERSION=1.6.20 diff --git a/platform/ios/scripts/configure.sh b/platform/ios/scripts/configure.sh index 0214e011d6..408180881c 100644 --- a/platform/ios/scripts/configure.sh +++ b/platform/ios/scripts/configure.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash +UNIQUE_RESOURCE_VERSION=dev PROTOZERO_VERSION=1.3.0 BOOST_VERSION=1.60.0 SQLITE_VERSION=system diff --git a/platform/linux/scripts/configure.sh b/platform/linux/scripts/configure.sh index b695d852ff..0f74afc55f 100644 --- a/platform/linux/scripts/configure.sh +++ b/platform/linux/scripts/configure.sh @@ -2,6 +2,7 @@ CXX11ABI=$(scripts/check-cxx11abi.sh) +UNIQUE_RESOURCE_VERSION=dev PROTOZERO_VERSION=1.3.0 BOOST_VERSION=1.60.0 BOOST_LIBPROGRAM_OPTIONS_VERSION=1.60.0 diff --git a/platform/osx/scripts/configure.sh b/platform/osx/scripts/configure.sh index bcfd0ada38..44cbea6f26 100644 --- a/platform/osx/scripts/configure.sh +++ b/platform/osx/scripts/configure.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash +UNIQUE_RESOURCE_VERSION=dev PROTOZERO_VERSION=1.3.0 BOOST_VERSION=1.60.0 BOOST_LIBPROGRAM_OPTIONS_VERSION=1.60.0 diff --git a/platform/qt/scripts/configure.sh b/platform/qt/scripts/configure.sh index b79c23532e..4b855f7c58 100644 --- a/platform/qt/scripts/configure.sh +++ b/platform/qt/scripts/configure.sh @@ -2,6 +2,7 @@ CXX11ABI=$(scripts/check-cxx11abi.sh) +UNIQUE_RESOURCE_VERSION=dev PROTOZERO_VERSION=1.3.0 BOOST_VERSION=1.60.0 GEOMETRY_VERSION=0.5.0 |