Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1680)

Unified Diff: gyp/expat.gyp

Issue 2142893006: Dust-off SkXMLParser (Closed) Base URL: https://chromium.googlesource.com/skia.git@master
Patch Set: XML_STATIC for MSVC voodoo Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | gyp/xml.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/expat.gyp
diff --git a/gyp/expat.gyp b/gyp/expat.gyp
index 90f7b02fbc597d6dc085eb27c92a082c7b7a772f..90e4e44f41fa8f601d757a61b5929cf8247c184b 100644
--- a/gyp/expat.gyp
+++ b/gyp/expat.gyp
@@ -12,9 +12,12 @@
'cflags': [ '-Wno-missing-field-initializers' ],
'xcode_settings': { 'WARNING_CFLAGS': [ '-Wno-missing-field-initializers', ], },
'msvs_disabled_warnings': [4244],
- 'defines': [ 'HAVE_EXPAT_CONFIG_H' ],
+ 'defines': [
+ 'HAVE_EXPAT_CONFIG_H',
+ 'XML_STATIC', # Compile for static linkage.
+ ],
'include_dirs': [
- '../third_party/externals/expat',
+ '../third_party/externals/expat',
],
'sources': [
'../third_party/externals/expat/lib/xmlparse.c',
@@ -22,7 +25,12 @@
'../third_party/externals/expat/lib/xmltok.c',
],
'direct_dependent_settings': {
- 'include_dirs': [ '../third_party/externals/expat/lib' ],
+ 'include_dirs': [
+ '../third_party/externals/expat/lib',
+ ],
+ 'defines': [
+ 'XML_STATIC', # Tell dependants to expect static linkage.
+ ],
},
}]
}
« no previous file with comments | « no previous file | gyp/xml.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698