Delta Between Two Patch Sets: googletest.gyp
Issue 29451722:
Issue 4907 - Update v8 to 5.7.278 in libadblockplus (Closed)
Base URL: https://github.com/adblockplus/libadblockplus.git
Left Patch Set: add Xcode into readme
Created June 2, 2017, 2:24 p.m.
Right Patch Set: independence from file mode of make_gyp_wrapper.py
Created July 4, 2017, 11:11 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« dependencies ('k')
|
include/AdblockPlus/JsEngine.h » ('j')
|
no next file with change/comment »
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')
| LEFT | RIGHT |
|---|---|
| (no file at all) | |
| 1 { | 1 { |
| 2 'target_defaults': { | 2 'target_defaults': { |
| 3 'configurations': { | 3 'configurations': { |
| 4 'Debug': { | 4 'Debug': { |
| 5 'defines': [ 'DEBUG' ], | 5 'defines': [ 'DEBUG' ], |
| 6 'msvs_settings': { | 6 'msvs_settings': { |
| 7 'VCCLCompilerTool': { | 7 'VCCLCompilerTool': { |
| 8 'Optimization': '0', | 8 'Optimization': '0', |
| 9 | |
| 10 'conditions': [ | 9 'conditions': [ |
| 11 ['OS=="win" and component=="shared_library"', { | 10 ['OS=="win" and component=="shared_library"', { |
| 12 'RuntimeLibrary': '3', # /MDd | 11 'RuntimeLibrary': '3', # /MDd |
| 13 }, { | 12 }, { |
| 14 'RuntimeLibrary': '1', # /MTd | 13 'RuntimeLibrary': '1', # /MTd |
| 15 }] | 14 }] |
| 16 ], | 15 ], |
| 17 }, | 16 }, |
| 18 }, | 17 }, |
| 19 }, | 18 }, |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 30 ['OS=="win" and component=="shared_library"', { | 29 ['OS=="win" and component=="shared_library"', { |
| 31 'RuntimeLibrary': '2', # /MD | 30 'RuntimeLibrary': '2', # /MD |
| 32 }, { | 31 }, { |
| 33 'RuntimeLibrary': '0', # /MT | 32 'RuntimeLibrary': '0', # /MT |
| 34 }] | 33 }] |
| 35 ], | 34 ], |
| 36 }, | 35 }, |
| 37 }, | 36 }, |
| 38 }, | 37 }, |
| 39 }, | 38 }, |
| 40 'msvs_configuration_attributes': { | |
| 41 'OutputDirectory': '<(DEPTH)\\build\\$(ConfigurationName)', | |
| 42 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', | |
| 43 }, | |
| 44 'conditions': [[ | 39 'conditions': [[ |
| 45 'target_arch=="x64"', { | 40 'target_arch=="x64"', { |
| 46 'xcode_settings': { | 41 'xcode_settings': { |
| 47 'ARCHS': [ 'x86_64' ], | 42 'ARCHS': [ 'x86_64' ], |
| 48 }, | 43 }, |
| 49 'msvs_configuration_platform': 'x64', | 44 'msvs_configuration_platform': 'x64', |
| 50 }, { | 45 }, { |
| 51 'xcode_settings': { | 46 'xcode_settings': { |
| 52 'ARCHS': [ 'i386' ], | 47 'ARCHS': [ 'i386' ], |
| 53 }, | 48 }, |
| 54 }, | 49 }, |
| 55 ]] | 50 ]] |
| 56 }, | 51 }, |
| 57 'targets': [{ | 52 'targets': [{ |
| 58 'target_name': 'googletest', | 53 'target_name': 'googletest', |
| 59 'type': '<(library)', | 54 'type': '<(library)', |
| 60 'sources': [ | 55 'sources': [ |
| 61 'googletest/googletest/src/gtest-death-test.cc', | 56 'third_party/googletest/googletest/src/gtest-death-test.cc', |
| 62 'googletest/googletest/src/gtest-filepath.cc', | 57 'third_party/googletest/googletest/src/gtest-filepath.cc', |
| 63 'googletest/googletest/src/gtest-port.cc', | 58 'third_party/googletest/googletest/src/gtest-port.cc', |
| 64 'googletest/googletest/src/gtest-printers.cc', | 59 'third_party/googletest/googletest/src/gtest-printers.cc', |
| 65 'googletest/googletest/src/gtest-test-part.cc', | 60 'third_party/googletest/googletest/src/gtest-test-part.cc', |
| 66 'googletest/googletest/src/gtest-typed-test.cc', | 61 'third_party/googletest/googletest/src/gtest-typed-test.cc', |
| 67 'googletest/googletest/src/gtest.cc' | 62 'third_party/googletest/googletest/src/gtest.cc' |
| 68 ], | 63 ], |
| 69 'include_dirs': [ | 64 'include_dirs': [ |
| 70 'googletest/googletest', | 65 'third_party/googletest/googletest', |
| 71 'googletest/googletest/include' | 66 'third_party/googletest/googletest/include' |
| 72 ], | 67 ], |
| 73 'direct_dependent_settings': { | 68 'direct_dependent_settings': { |
| 74 'include_dirs': [ | 69 'include_dirs': [ |
| 75 'googletest/googletest', | 70 'third_party/googletest/googletest', |
| 76 'googletest/googletest/include' | 71 'third_party/googletest/googletest/include' |
| 77 ] | 72 ] |
| 78 }, | 73 }, |
| 79 'conditions': [[ | |
| 80 'OS=="win"', | |
| 81 { | |
| 82 'defines': [ '_VARIADIC_MAX=10' ], | |
| 83 'direct_dependent_settings': { | |
| 84 'defines': [ '_VARIADIC_MAX=10' ], | |
| 85 }, | |
| 86 }]], | |
| 87 }, | 74 }, |
| 88 { | 75 { |
| 89 'target_name': 'googletest_main', | 76 'target_name': 'googletest_main', |
| 90 'type': '<(library)', | 77 'type': '<(library)', |
| 91 'sources': ['googletest/googletest/src/gtest_main.cc'], | 78 'sources': ['third_party/googletest/googletest/src/gtest_main.cc'], |
| 92 'dependencies': ['googletest'], | 79 'dependencies': ['googletest'], |
| 93 'export_dependent_settings': ['googletest'] | 80 'export_dependent_settings': ['googletest'] |
| 94 }] | 81 }] |
| 95 } | 82 } |
| LEFT | RIGHT |
« dependencies ('k')
|
include/AdblockPlus/JsEngine.h » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
