diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2015-10-15 13:59:31 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2015-11-02 18:41:34 -0500 |
| commit | 79a5a960370a1bfcb8a90a628d85b8cd6d9b6a76 (patch) | |
| tree | 5c418cf49c67eefc251a94606cf8e0b4e6d7d9a7 /scripts/main.mk | |
| parent | ba7cc755e74006b14b46b13b65a100a519e402f3 (diff) | |
| download | qtlocation-mapboxgl-79a5a960370a1bfcb8a90a628d85b8cd6d9b6a76.tar.gz | |
[core] mason geojsonvt-2.1.6.3
- [osx] set -fvisibility-inlines-hidden in gyp/common.gypi to silence
mismatched visibility linker warnings
- [linux] set cxx_host in GYP_FLAGS to set -fabi-version=0 on gcc builds
to use clang-built mason binaries
- [ios] update symbol visibility for iOS tests
- [ios] link libgeojsonvt.a in iOS tests xcodeproj
- add libgeojsonvt.a to General -> Linked Frameworks and Libraries
- add mason_packages (recursive) to Build Settings -> Library Search Path
- [ios] add libuv and geojsonvt first in iOS libtool smush to ensure symbols
are found by later compilation units where they are undefined
Diffstat (limited to 'scripts/main.mk')
| -rw-r--r-- | scripts/main.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/main.mk b/scripts/main.mk index 75e574d26d..15e3484e01 100644 --- a/scripts/main.mk +++ b/scripts/main.mk @@ -22,6 +22,11 @@ ifneq (,$(wildcard scripts/$(HOST)/$(HOST_VERSION)/configure.sh)) CONFIGURE_FILES += scripts/$(HOST)/$(HOST_VERSION)/configure.sh endif +ifneq (,$(findstring clang,$(CXX))) + CXX_HOST = "clang" +else ifneq (,$(findstring g++,$(CXX))) + CXX_HOST = "g++" +endif # Text formatting TEXT_BOLD = \033[1m @@ -38,10 +43,6 @@ SUBMODULES += .mason/mason.sh .mason/mason.sh: ./scripts/flock.py .git/Submodule.lock git submodule update --init .mason -SUBMODULES += src/mbgl/util/geojsonvt/geojsonvt.hpp -src/mbgl/util/geojsonvt/geojsonvt.hpp: - ./scripts/flock.py .git/Submodule.lock git submodule update --init src/mbgl/util/geojsonvt - ifeq ($(HOST),ios) SUBMODULES += platform/ios/vendor/SMCalloutView/SMCalloutView.h platform/ios/vendor/SMCalloutView/SMCalloutView.h: @@ -70,6 +71,7 @@ GYP_FLAGS += -Dcache_lib=$(CACHE) GYP_FLAGS += -Dheadless_lib=$(HEADLESS) GYP_FLAGS += -Dtest=$(BUILD_TEST) GYP_FLAGS += -Drender=$(BUILD_RENDER) +GYP_FLAGS += -Dcxx_host=$(CXX_HOST) GYP_FLAGS += --depth=. GYP_FLAGS += -Goutput_dir=. GYP_FLAGS += --generator-output=./build/$(HOST_SLUG) |