summaryrefslogtreecommitdiff
path: root/deps
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-10-30 12:40:16 -0700
committerKonstantin Käfer <mail@kkaefer.com>2014-10-30 12:40:16 -0700
commit592ed57d09f8f0913dae195e6e867884d11a2327 (patch)
tree6dd3a1d4a027a40e525484de68a34c6754f291b3 /deps
parent3d6a87ab1b43e4f4712e5456ccf91bdcbc15bb7e (diff)
downloadqtlocation-mapboxgl-592ed57d09f8f0913dae195e6e867884d11a2327.tar.gz
use more modern libpng version instead of the system-provided one and fix compile errors
Diffstat (limited to 'deps')
-rw-r--r--deps/gtest/gtest.gyp4
1 files changed, 4 insertions, 0 deletions
diff --git a/deps/gtest/gtest.gyp b/deps/gtest/gtest.gyp
index c62b6be3f8..56d01bf988 100644
--- a/deps/gtest/gtest.gyp
+++ b/deps/gtest/gtest.gyp
@@ -12,6 +12,10 @@
'sources': [
'gtest-all.cc'
],
+ 'link_settings': {
+ 'xcode_settings': { 'OTHER_LDFLAGS': [ '-pthread' ] },
+ 'ldflags': [ '-pthread' ],
+ },
'direct_dependent_settings': {
'include_dirs': [
'.',