Commit Graph

1889 Commits

Author SHA1 Message Date
Konstantin Käfer
40a933ddce add missing header 2014-10-22 18:22:43 +02:00
Konstantin Käfer
e2aaae665b force exceptions and rtti in case they're disabled by another gyp file 2014-10-22 18:20:35 +02:00
Konstantin Käfer
214f99673f fix variable shadowing 2014-10-22 18:19:01 +02:00
Konstantin Käfer
74387c54e3 add missing include header 2014-10-22 16:37:59 +02:00
Konstantin Käfer
20ea7ef104 remove erroneous output during test run 2014-10-22 16:30:06 +02:00
Konstantin Käfer
7d6feffd56 replace boost optional with mapbox optional 2014-10-22 16:29:10 +02:00
Konstantin Käfer
2422e938ac fix typo 2014-10-22 15:50:54 +02:00
Konstantin Käfer
02e88e445d fixes for libuv 0.11 2014-10-22 15:29:28 +02:00
Konstantin Käfer
087d04292a Merge branch 'master' of github.com:mapbox/mapbox-gl-native 2014-10-22 15:18:30 +02:00
Konstantin Käfer
905c4294be Merge branch 'libuv-0.10-headless-display' into mason
Conflicts:
	common/http_request_baton_curl.cpp
	include/mbgl/map/map.hpp
	include/mbgl/util/uv_detail.hpp
	scripts/travis_before_install.sh
	setup-libraries.sh
	src/map/map.cpp
	src/storage/file_request_baton.cpp
	src/storage/http_request.cpp
	src/util/uv-messenger.c
2014-10-22 15:14:21 +02:00
Konstantin Käfer
253bbd1c5b New mason-based build system 2014-10-22 15:13:35 +02:00
Konstantin Käfer
251fafe2bf don't check for node in the current bash. we are using our own anyway 2014-10-22 15:05:33 +02:00
Konstantin Käfer
c6e4cf2f80 use ASSERT_FALSE for boolean comparisons 2014-10-22 04:20:51 -07:00
Konstantin Käfer
f701fb340f GCC doesn't like {} initialization 2014-10-22 04:18:05 -07:00
Konstantin Käfer
352bd095d4 GCC doesn't like #pragmas between the function declaration and definition 2014-10-22 04:17:43 -07:00
Konstantin Käfer
fd5b07d353 don't pass on boost path; it's unneeded 2014-10-22 12:45:42 +02:00
Konstantin Käfer
5d6748f8fe fix compile warnings in libtess2 2014-10-22 12:41:10 +02:00
Konstantin Käfer
8df906e2bc use correct configuration file 2014-10-22 12:40:30 +02:00
Konstantin Käfer
2dbe9edb06 write to correct file and add to gitignore 2014-10-22 12:01:56 +02:00
Konstantin Käfer
13c698fa26 fix more xcode upgrade warnings 2014-10-22 12:01:56 +02:00
Konstantin Käfer
baa684eb98 make gyp generate newer project files
patch from https://groups.google.com/forum/#!msg/gyp-developer/0JiSNtsKc30/xYxQFqRfrTcJ
2014-10-22 12:01:56 +02:00
Konstantin Käfer
159130a058 silence warning; GCC needs this parameter, but Clang says its unused 2014-10-22 12:01:56 +02:00
Konstantin Käfer
326af8a332 install boost on osx 2014-10-22 11:00:34 +02:00
Konstantin Käfer
2f3952b305 fix compile warnings 2014-10-22 11:00:34 +02:00
Konstantin Käfer
b9d422ebc3 use glfw3 libs instead of manually linking OpenGL frameworks on OS X
[skip ci]
2014-10-22 10:45:50 +02:00
Konstantin Käfer
3a39d69504 link boost when the boost variable is set 2014-10-22 10:45:50 +02:00
Dane Springmeyer
b6a42afe7e correctly set CC 2014-10-21 11:44:23 -07:00
Konstantin Käfer
59d0be1076 use ppa for more recent boost 2014-10-21 06:57:44 -07:00
Konstantin Käfer
dddd1c275c add libraries and make configure script more robust
[skip ci]
2014-10-21 15:45:41 +02:00
Konstantin Käfer
e98b3e5d86 install nvm and node
[skip ci]
2014-10-21 13:04:22 +02:00
Konstantin Käfer
ab42c0cf93 cleanup makefile
[skip ci]
2014-10-21 12:49:19 +02:00
Konstantin Käfer
ef1792fe47 properly detect boost root
[skip ci]
2014-10-21 12:08:04 +02:00
Konstantin Käfer
a1c5e0cdc1 don't omit parameter name
[skip ci]
2014-10-21 03:06:11 -07:00
Konstantin Käfer
9103d84ace ios build system fixes
[skip ci]
2014-10-21 11:41:30 +02:00
Konstantin Käfer
1da471abba curl fixes
[skip ci]
2014-10-20 18:21:21 +02:00
Konstantin Käfer
5a87fb337d first attempt at using mason to install packages
[skip ci]
2014-10-20 17:55:49 +02:00
John Firebaugh
d54809b04a Fix log message filtering
Taking the sizeof a pointer doesn't give you the array length!
2014-10-17 12:03:43 -07:00
John Firebaugh
4e9688e430 Fix compiler warnings 2014-10-17 11:12:31 -07:00
John Firebaugh
4603ca037c background-image support 2014-10-17 10:44:38 -07:00
Konstantin Käfer
48a3104066 Update README.md
use master branch for travis icon [skip ci]
2014-10-16 18:58:23 +02:00
Konstantin Käfer
8954b3971f don't time xvfb startup 2014-10-16 07:07:05 -07:00
Konstantin Käfer
2c6d9374a4 fix misnamed function 2014-10-16 07:00:04 -07:00
Konstantin Käfer
21b97d4906 better timing functions 2014-10-16 06:54:36 -07:00
Konstantin Käfer
42b54b11d8 export all required functions 2014-10-16 05:59:47 -07:00
Konstantin Käfer
0d213283c0 export function to subshells 2014-10-16 05:56:18 -07:00
Konstantin Käfer
3d6304e8c3 remove spaces from fold command and put in separate file 2014-10-16 05:50:10 -07:00
Konstantin Käfer
e211ee620d add more instrumentation and code folding to travis builds 2014-10-16 05:44:26 -07:00
Konstantin Käfer
97986f603f we don't need a root_fbo function anymore
[skip ci]
2014-10-16 04:27:30 -07:00
Konstantin Käfer
4bc56eac24 we now always use the fbo
[skip ci]
2014-10-16 04:26:50 -07:00
Konstantin Käfer
8b08772d33 first attempt to create an opengl core profile version before falling back to legacy opengl contexts 2014-10-16 03:49:29 -07:00