summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-11-05 12:13:24 +0100
committerKonstantin Käfer <mail@kkaefer.com>2014-11-05 12:13:24 +0100
commit2f86a1735e2806047deebd8378dc60d35cd1993b (patch)
treeed3461bc7fc6f4355a964302db35f93cb306c3cd
parentc398a799c69c723ba77921331208462d12e42ab9 (diff)
downloadqtlocation-mapboxgl-2f86a1735e2806047deebd8378dc60d35cd1993b.tar.gz
fix boost includes and allow any platform builds for xcode test project
-rw-r--r--Makefile2
-rw-r--r--gyp/mbgl-linux.gypi1
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 73e4c87999..539ab12bcf 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@ build/macosx/Makefile: macosx/mapboxgl-app.gyp config.gypi
.PHONY: build/test/test.xcodeproj
build/test/test.xcodeproj: test/test.gyp config.gypi
- deps/run_gyp test/test.gyp -Iconfig.gypi -Dplatform=osx --depth=. -Goutput_dir=.. --generator-output=./build -f xcode
+ deps/run_gyp test/test.gyp -Iconfig.gypi -Dplatform=$(PLATFORM) --depth=. -Goutput_dir=.. --generator-output=./build -f xcode
.PHONY: build/macosx/mapboxgl-app.xcodeproj
build/macosx/mapboxgl-app.xcodeproj: macosx/mapboxgl-app.gyp config.gypi
diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi
index a22bd8f7c2..823ba91c35 100644
--- a/gyp/mbgl-linux.gypi
+++ b/gyp/mbgl-linux.gypi
@@ -11,6 +11,7 @@
'<@(uv_cflags)',
'<@(curl_cflags)',
'<@(nu_cflags)',
+ '-I<(boost_root)/include',
],
'cflags': [
'<@(uv_cflags)',