Side by Side Diff: libadblockplus.gyp
Issue 10234088:
Use GYP to generate MSVS project files (Closed)
Patch Set: Tests passing now
Created April 24, 2013, 10:37 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« createsolution.bat ('k')
|
msvs_makesnapshot.bat » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 { | 1 { |
| 2 'conditions': [[ | 2 'conditions': [[ |
| 3 # We don't want to use curl on Windows, skip the check there | 3 # We don't want to use curl on Windows, skip the check there |
| 4 'OS=="win"', | 4 'OS=="win"', |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'have_curl': 0 | 7 'have_curl': 0 |
| 8 } | 8 } |
| 9 }, | 9 }, |
| 10 { | 10 { |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 30 'src/DefaultFileSystem.cpp', | 30 'src/DefaultFileSystem.cpp', |
| 31 'src/ErrorCallback.cpp', | 31 'src/ErrorCallback.cpp', |
| 32 'src/FileSystemJsObject.cpp', | 32 'src/FileSystemJsObject.cpp', |
| 33 'src/FilterEngine.cpp', | 33 'src/FilterEngine.cpp', |
| 34 'src/GlobalJsObject.cpp', | 34 'src/GlobalJsObject.cpp', |
| 35 'src/JsEngine.cpp', | 35 'src/JsEngine.cpp', |
| 36 'src/JsValue.cpp', | 36 'src/JsValue.cpp', |
| 37 'src/Thread.cpp', | 37 'src/Thread.cpp', |
| 38 'src/Utils.cpp', | 38 'src/Utils.cpp', |
| 39 'src/WebRequestJsObject.cpp', | 39 'src/WebRequestJsObject.cpp', |
| 40 '<(INTERMEDIATE_DIR)/adblockplus.js.cc' | 40 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' |
| 41 ], | 41 ], |
| 42 'direct_dependent_settings': { | 42 'direct_dependent_settings': { |
| 43 'include_dirs': ['include'] | 43 'include_dirs': ['include'] |
| 44 }, | 44 }, |
| 45 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], | 45 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], |
| 46 'conditions': [ | 46 'conditions': [ |
| 47 ['have_curl==1', | 47 ['have_curl==1', |
| 48 { | 48 { |
| 49 'sources': [ | 49 'sources': [ |
| 50 'src/DefaultWebRequestCurl.cpp', | 50 'src/DefaultWebRequestCurl.cpp', |
| 51 ], | 51 ], |
| 52 'link_settings': { | |
| 53 'libraries': ['-lcurl'] | |
| 54 }, | |
| 52 'all_dependent_settings': { | 55 'all_dependent_settings': { |
| 53 'defines': ['HAVE_CURL'], | 56 'defines': ['HAVE_CURL'], |
| 54 'libraries': ['-lcurl'] | |
| 55 } | 57 } |
| 56 } | 58 } |
| 57 ], | 59 ], |
| 58 ['have_curl!=1', | 60 ['OS=="win"', |
| 61 { | |
| 62 'sources': [ | |
| 63 'src/DefaultWebRequestWinInet.cpp', | |
| 64 ], | |
| 65 'link_settings': { | |
| 66 'libraries': [ '-lshlwapi.lib', '-lwinhttp.lib' ] | |
| 67 } | |
| 68 } | |
| 69 ], | |
| 70 ['have_curl!=1 and OS!="win"', | |
| 59 { | 71 { |
| 60 'sources': [ | 72 'sources': [ |
| 61 'src/DefaultWebRequestDummy.cpp', | 73 'src/DefaultWebRequestDummy.cpp', |
| 62 ] | 74 ] |
| 63 } | 75 } |
| 64 ] | 76 ], |
| 65 ], | 77 ], |
| 66 'actions': [{ | 78 'actions': [{ |
| 67 'action_name': 'convert_js', | 79 'action_name': 'convert_js', |
| 68 'variables': { | 80 'variables': { |
| 69 'library_files': [ | 81 'library_files': [ |
| 70 'lib/info.js', | 82 'lib/info.js', |
| 71 'lib/io.js', | 83 'lib/io.js', |
| 72 'lib/prefs.js', | 84 'lib/prefs.js', |
| 73 'lib/utils.js', | 85 'lib/utils.js', |
| 74 'lib/elemHideHitRegistration.js', | 86 'lib/elemHideHitRegistration.js', |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 119 'test/AppInfoJsObject.cpp', | 131 'test/AppInfoJsObject.cpp', |
| 120 'test/ConsoleJsObject.cpp', | 132 'test/ConsoleJsObject.cpp', |
| 121 'test/DefaultFileSystem.cpp', | 133 'test/DefaultFileSystem.cpp', |
| 122 'test/FileSystemJsObject.cpp', | 134 'test/FileSystemJsObject.cpp', |
| 123 'test/FilterEngine.cpp', | 135 'test/FilterEngine.cpp', |
| 124 'test/GlobalJsObject.cpp', | 136 'test/GlobalJsObject.cpp', |
| 125 'test/JsEngine.cpp', | 137 'test/JsEngine.cpp', |
| 126 'test/JsValue.cpp', | 138 'test/JsValue.cpp', |
| 127 'test/Thread.cpp', | 139 'test/Thread.cpp', |
| 128 'test/WebRequest.cpp' | 140 'test/WebRequest.cpp' |
| 129 ] | 141 ], |
| 142 'msvs_settings': { | |
| 143 'VCLinkerTool': { | |
| 144 'SubSystem': '1', # Console | |
| 145 'EntryPointSymbol': 'mainCRTStartup', | |
| 146 }, | |
| 147 }, | |
| 130 }] | 148 }] |
| 131 } | 149 } |
| OLD | NEW |
« no previous file with comments
|
« createsolution.bat ('k')
|
msvs_makesnapshot.bat » ('j')
|
no next file with comments »
