Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: libadblockplus.gyp

Issue 10234088: Use GYP to generate MSVS project files (Closed)
Patch Set: Created April 23, 2013, 4:24 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: libadblockplus.gyp
===================================================================
--- a/libadblockplus.gyp
+++ b/libadblockplus.gyp
@@ -32,41 +32,53 @@
'src/FileSystemJsObject.cpp',
'src/FilterEngine.cpp',
'src/GlobalJsObject.cpp',
'src/JsEngine.cpp',
'src/JsValue.cpp',
'src/Thread.cpp',
'src/Utils.cpp',
'src/WebRequestJsObject.cpp',
- '<(INTERMEDIATE_DIR)/adblockplus.js.cc'
+ '<(INTERMEDIATE_DIR)/adblockplus.js.cpp'
Eric 2013/04/23 17:12:17 I had this as SHARED_INTERMEDIATE_DIRECTORY becaus
Wladimir Palant 2013/04/24 06:01:34 I'm not really convinced that this is a good idea
Eric 2013/04/24 13:09:44 If it's specific to a particular target, it should
Wladimir Palant 2013/04/24 14:04:34 From gyp documentation: "INTERMEDIATE_DIR is only
Eric 2013/04/24 14:21:56 That's what I get for inferring behavior only from
],
'direct_dependent_settings': {
'include_dirs': ['include']
},
'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'],
'conditions': [
['have_curl==1',
{
'sources': [
'src/DefaultWebRequestCurl.cpp',
],
+ 'link_settings': {
+ 'libraries': ['-lcurl']
+ },
'all_dependent_settings': {
'defines': ['HAVE_CURL'],
- 'libraries': ['-lcurl']
}
}
],
- ['have_curl!=1',
+ ['OS=="win"',
+ {
+ 'sources': [
+ 'src/DefaultWebRequestWinInet.cpp',
+ ],
+ 'link_settings': {
+ 'libraries': [ '-lshlwapi.lib', '-lwinhttp.lib' ]
+ }
+ }
+ ],
+ ['have_curl!=1 and OS!="win"',
{
'sources': [
'src/DefaultWebRequestDummy.cpp',
]
}
- ]
+ ],
],
'actions': [{
'action_name': 'convert_js',
'variables': {
'library_files': [
'lib/info.js',
'lib/io.js',
'lib/prefs.js',

Powered by Google App Engine
This is Rietveld