Commit Graph

89 Commits

Author SHA1 Message Date
Thiago Marcos P. Santos
efb96e80ec [Qt] Use Qt resources for bundling the certificates 2016-04-20 20:55:51 +03:00
Thiago Marcos P. Santos
c8c69f1d2a [Qt] Build the Qt port 2016-04-20 20:55:51 +03:00
John Firebaugh
009a28943c [build] Fail configure if a mason command fails 2016-04-13 17:07:29 -07:00
John Firebaugh
f964e40e7e [build] Refactor and simplify build system
* Main gyp files are now standardized as platform/<platform>/platform.gyp.
* Each platform gyp file defines appropriate loop_lib and headless_lib variables.
* Each platform gyp file includes mbgl.gypi, which defines base targets which may be useful to all platforms.
* CI targets are consistent across platforms: `make $(PLATFORM) && make test-$(PLATFORM)`.
* Renamed the "linux" test app to "glfw". It's now built in OS X CI.
* Android build flakiness is fixed.
* iOS CI builds the bench and iosapp targets.
* Mesa version is now in one place.
* CI scripts use bash "strict mode" and correct error handling.
* All build output goes to the build directory.
* Removed vestigial iOS/OS X/Android Travis scripts.
2016-04-07 18:01:02 -07:00
John Firebaugh
2e467ff3f1 [build] Force git submodule update before running mason
Refs #4454
2016-03-24 10:58:42 -07:00
John Firebaugh
9e0be736fc [android] Add jni.hpp headers to build 2016-03-04 15:33:32 -08:00
Konstantin Käfer
9cfe64a122 [build] replace jpeg library with libjpeg-turbo 2016-01-22 16:00:51 +01:00
Cameron Mulhern
a5889409cc [ios] Updates configure to work when project is a submodule 2016-01-22 02:20:49 -08:00
Bruno de Oliveira Abinader
9cd9065031 Revert "Revert WebP support due to broken builds"
This reverts commit 6709bdcacd.

There was an issue with the script that removes '-lwebp' from WebP
linker flags, since we're statically linking. This is now fixed.
2016-01-20 10:35:44 +02:00
John Firebaugh
6709bdcacd Revert WebP support due to broken builds
This reverts commits 2010fbb0e6, a361ce47a1, and d004bb275a.
2016-01-19 13:34:56 -08:00
Bruno de Oliveira Abinader
d004bb275a [linux] Added WebP build deps 2016-01-19 15:41:47 +02:00
John Firebaugh
7a4e7376e1 Move platform scripts into platforms 2015-12-16 17:49:22 -08:00
John Firebaugh
ed5eb9edc1 [test] Add pixelmatch; use in annotation tests 2015-11-25 15:57:37 -08:00
Lucas Wojciechowski
da569c266b [node] enable npm to build mapbox-gl-native package from source
This reverts commit 311bf93abe.

more explicit require paths in tests
2015-11-04 11:34:35 -05:00
Mike Morris
79a5a96037 [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
2015-11-02 18:41:34 -05:00
John Firebaugh
ddc4a8193e Install gtest from mason 2015-10-02 10:17:16 -07:00
John Firebaugh
2066295e35 Install RapidJSON from mason 2015-10-01 11:40:47 -07:00
Mike Morris
b46c102eb0 mason variant@1.0 2015-09-30 15:34:40 -07:00
Konstantin Käfer
e6053aa547 Make build system architecture agnostic to remove Android special case 2015-08-04 14:08:58 +02:00
Konstantin Käfer
bb33493710 use boost_program_options from mason 2015-05-12 15:10:03 +02:00
Konstantin Käfer
8482df62e8 use custom boost 2015-04-28 10:43:13 +02:00
Konstantin Käfer
2b633cc51c build on Travis' sudo: false infrastructure 2015-04-28 10:43:13 +02:00
Thiago Marcos P. Santos
d66b24f58f Link with X11 explicitly
We are using X11 symbols directly like XFree() so we need to link
with it explicitly. Previously these symbols were being resolved
somehow by libGL, but apparently they are now hidden - good - in
the custom version we are using since 5e40f72b7.

Fixes #1005.
2015-03-16 10:54:34 +02:00
Konstantin Käfer
5e40f72b7c scripts for running linux tests with docker 2015-03-13 12:06:11 +01:00
Konstantin Käfer
47ede853c4 fixes black flicker on rotating the device
fixes #838

instead of rendering ad libitum on the map thread, we are now driving rendering from the UI thread on iOS via the map.renderSync() function. There are still white bars during the rotation, but the general content of the view is kept visible.

- upgrades GLFW to 3.1
- removes swapped/needsSwap in favor of a more explicit scheme
- View#invalidate() now replaces View#swap() and is called whenever the View needs to trigger a rerender. GLFW and Android to this right away, while iOS goes back to the main thread and does the Map redrawing as part of the GLKView update
- sets all iOS deployment targets to 7.0
- disables SQLite3 version check, since the library version changed on iOS 8.2
2015-03-12 12:16:38 +01:00
Leith Bade
4ca21db5df Use libuv 1.4.0 for arm64 support 2015-02-11 18:24:50 -08:00
Mike Morris
1ddb230488 dont set python gyp var 2015-02-10 14:09:44 -08:00
Konstantin Käfer
da981e7825 move config files to config/ folder 2015-02-04 18:07:32 +01:00
Konstantin Käfer
73f7db9af2 cleanup makefiles 2015-02-04 11:54:01 +01:00
Konstantin Käfer
69975c7094 make different abis for android 2015-02-04 10:49:09 +01:00
Konstantin Käfer
29baacf3a5 refactor makefile 2015-02-04 10:49:09 +01:00
Konstantin Käfer
3d51e116a8 use fake linker for merging the standalone static library 2015-02-04 10:49:08 +01:00
Konstantin Käfer
a67219ab8b allow overriding configuration variables 2015-02-04 10:49:07 +01:00
Dane Springmeyer
beac81f849 ensure pkg-config is found since mason depends on it for now 2015-01-28 21:22:39 -08:00
Leith Bade
61113bf343 Update android ABIs 2015-01-29 00:52:37 +13:00
Leith Bade
b7cc6bfaa6 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	src/mbgl/shader/shader.cpp
2015-01-15 11:39:50 +11:00
Mike Morris
139c0c6da6 build against mason sqlite 3.8.6 2015-01-13 14:31:50 -05:00
Leith Bade
87ef90b896 Use libnu 1.5.1 2014-12-11 07:24:20 +11:00
Leith Bade
6be8c840bb Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2014-12-03 23:03:14 +11:00
Konstantin Käfer
d3ab895153 switch to a newer version of GLFW
refs #679
2014-12-03 12:30:29 +01:00
Leith Bade
8762d5a9b6 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	include/mbgl/map/map.hpp
	src/map/map.cpp
2014-12-03 19:56:20 +11:00
artemp
2c05b23f6a update nunicode version to 1.5.1 2014-12-02 16:34:51 +01:00
Leith Bade
0886db76e5 Use new libnu version on Android 2014-11-30 12:26:56 +11:00
Leith Bade
e5317b5237 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2014-11-30 12:17:52 +11:00
artemp
90480ee58c add jpeg lib 2014-11-28 00:13:06 +11:00
artemp
9092cb4209 update nunicode version 2014-11-21 16:27:34 +01:00
Leith Bade
c092a686a7 Add libzip 2014-11-17 19:23:36 +11:00
artemp
13686cc182 add jpeg lib 2014-11-07 11:26:55 +00:00
Leith Bade
0cc43afab3 Add missing libs to android 2014-11-05 21:11:16 +11:00
Leith Bade
991c497e43 Use local boost 2014-11-04 23:13:58 +11:00