Commit Graph

38 Commits

Author SHA1 Message Date
Dane Springmeyer
70a7ba81f3 ensure resources.cpp is included in xcode project - closes #175 2014-05-08 15:11:34 -07:00
Konstantin Käfer
263702b499 remove library name deduplication from gyp
refs #155
2014-04-22 10:18:32 +02:00
Konstantin Käfer
29fdfacfde gyp deduplicates the 'libraries' key, so we're using the ldflags instead 2014-04-22 09:53:45 +02:00
Konstantin Käfer
187b55448a add more commas to gyp file
[skip ci]
2014-04-16 11:24:21 -04:00
Konstantin Käfer
aa17237963 don't explicitly specify ARCHS (it's not supported by gyp anyway) 2014-04-15 18:45:27 -04:00
Konstantin Käfer
70bb318e75 update activity indicator on ios 2014-04-15 11:27:37 -04:00
Konstantin Käfer
79d34115d0 make processing more parallel
restores 669b342332
2014-04-15 11:06:29 -04:00
Konstantin Käfer
ee2f17d2b4 fix build on travis 2014-04-11 08:50:43 -07:00
Konstantin Käfer
320bb0b131 prebuild shaders 2014-04-11 10:49:51 -04:00
Konstantin Käfer
c395382774 make sure we find boost 2014-04-09 18:20:57 -04:00
Konstantin Käfer
662562d9fe use mapnik-packaging to build all dependencies 2014-04-09 15:57:21 -04:00
Konstantin Käfer
48e8ca0e43 define shader builds as separate targets 2014-03-25 13:23:04 +01:00
Konstantin Käfer
77f58960c4 build shaders for either desktop gl or gles2 2014-03-25 13:16:48 +01:00
Konstantin Käfer
1f2c71ec8b port of collision class 2014-03-17 16:53:40 +01:00
Konstantin Käfer
85449e097c add gtest 2014-03-17 12:32:27 +01:00
Konstantin Käfer
91d42911fb parse the json stylesheet 2014-03-12 11:23:01 +01:00
Dane Springmeyer
f9af0845a7 reduce duplicate in llmr.gyp 2014-03-10 18:40:33 -07:00
Konstantin Käfer
2e0681e2d6 Merge pull request #49 from mapbox/tessellation
Try out tessellating polygons
2014-03-03 15:08:48 +01:00
Konstantin Käfer
4e73a4d47c Merge branch 'master' into tessellation
Conflicts:
	include/llmr/renderer/fill_bucket.hpp
	src/renderer/fill_bucket.cpp
	src/renderer/painter.cpp
2014-02-28 12:25:45 +01:00
Justin R. Miller
060f1ce091 properly set 10.9 deploy again 2014-02-21 17:10:06 -08:00
Justin R. Miller
e59a5f1c1a Merge branch 'master' into tile-cancels 2014-02-21 14:18:48 -08:00
Konstantin Käfer
54735ddd9e rename -osx project to -x86 2014-02-21 13:08:25 +01:00
Justin R. Miller
2bb6163f64 moves from NSURLConnection to NSURLSession on iOS 2014-02-19 18:38:05 -08:00
Konstantin Käfer
b087c35c98 add tessellation library 2014-02-17 12:45:57 +01:00
Justin R. Miller
4ff01fb07f allow for easier editing of style in Xcode
* write protobuf directly to file instead of stdout (for Gyp)
 * add style.js to editable sources
 * add build phases for pbf conversion & resources updates
 * update README style directions
2014-02-13 16:24:00 -08:00
Justin R. Miller
e08b318c59 better spacing in gyp conf 2014-02-13 15:53:02 -08:00
Justin R. Miller
4f9b0e2109 only run shader rebuild when files are changed 2014-02-13 15:48:18 -08:00
Justin R. Miller
1424634659 automatically build shaders during Xcode builds 2014-02-13 15:34:22 -08:00
Justin R. Miller
f887025b1d add shader sources to project for easier editing 2014-02-13 15:24:39 -08:00
Dane Springmeyer
e2ea6c52a7 add target to build for simulator 2014-02-04 14:52:30 -08:00
Dane Springmeyer
bffb09c004 beauty is a triple arch command line build 2014-02-04 14:21:18 -08:00
Dane Springmeyer
f4aa7b9c70 same for ios build (no need to link -lpng directly) 2014-02-04 13:34:39 -08:00
Dane Springmeyer
8a4a11b7ed don't link -lpng when creating static llmr.a 2014-02-04 13:33:09 -08:00
Dane Springmeyer
c251155188 add GCC_INPUT_FILETYPE + make SUPPORTED_PLATFORMS a list 2014-02-04 12:22:49 -08:00
Dane Springmeyer
74aeab8ac7 put png_cflags in cflags not includes to avoid gyp double completing with -I 2014-02-04 11:33:39 -08:00
Dane Springmeyer
d9f132fe93 fix 'make xapp' target after new png dependency 2014-02-03 15:50:05 -08:00
Dane Springmeyer
b895711b01 png is a new dependency in sprite.cpp - add it to build system 2014-02-03 15:40:56 -08:00
Dane Springmeyer
b8d9f7704f switch build system to gyp 2014-02-03 14:32:00 -08:00