projects
/
platform
/
framework
/
web
/
crosswalk-tizen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5133593
)
mas: Do not link with QTKit for mas build
author
Cheng Zhao
<zcbenz@gmail.com>
Fri, 9 Oct 2015 13:30:41 +0000
(21:30 +0800)
committer
Cheng Zhao
<zcbenz@gmail.com>
Wed, 14 Oct 2015 03:57:01 +0000
(11:57 +0800)
atom.gyp
patch
|
blob
|
history
vendor/brightray
patch
|
blob
|
history
diff --git
a/atom.gyp
b/atom.gyp
index
bf655c1
..
3d9b7f5
100644
(file)
--- a/
atom.gyp
+++ b/
atom.gyp
@@
-301,6
+301,12
@@
'vendor/crashpad/client/client.gyp:crashpad_client',
'vendor/crashpad/handler/handler.gyp:crashpad_handler',
],
+ 'link_settings': {
+ # Do not link with QTKit for mas build.
+ 'libraries': [
+ '$(SDKROOT)/System/Library/Frameworks/QTKit.framework',
+ ],
+ },
}], # OS=="mac" and mas_build==0
['OS=="mac" and mas_build==1', {
'defines': [
diff --git
a/vendor/brightray
b/vendor/brightray
index
d5ca855
..
fe2dd43
160000
(submodule)
--- a/
vendor/brightray
+++ b/
vendor/brightray
@@
-1
+1
@@
-Subproject commit
d5ca8556a65e37575fc39e2b394fa62401b996c5
+Subproject commit
fe2dd437c9ef7877bf9d454db8ae401965cd7cb0