Side by Side Diff: adblockplus.gyp
Issue 11756012:
Enhanced Protected Mode support (Closed)
Patch Set: Addressing comments
Created Sept. 17, 2013, 2:51 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
installer/bho_registry_value.wxi » ('j')
|
installer/bho_registry_value.wxi » ('J')
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 'includes': ['defaults.gypi'], | 2 'includes': ['defaults.gypi'], |
| 3 | 3 |
| 4 'variables': { | 4 'variables': { |
| 5 'build_type%': 'devbuild', | 5 'build_type%': 'devbuild', |
| 6 'build_version%': '', | 6 'build_version%': '', |
| 7 'shared_files': [ | 7 'shared_files': [ |
| 8 'src/shared/AutoHandle.cpp', | 8 'src/shared/AutoHandle.cpp', |
| 9 'src/shared/Communication.cpp', | 9 'src/shared/Communication.cpp', |
| 10 'src/shared/Dictionary.cpp', | 10 'src/shared/Dictionary.cpp', |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 119 'AdditionalDependencies': ['atls.lib'], | 119 'AdditionalDependencies': ['atls.lib'], |
| 120 }, | 120 }, |
| 121 }, | 121 }, |
| 122 }, | 122 }, |
| 123 }, | 123 }, |
| 124 'msvs_settings': { | 124 'msvs_settings': { |
| 125 'VCLinkerTool': { | 125 'VCLinkerTool': { |
| 126 'conditions': [[ | 126 'conditions': [[ |
| 127 'target_arch=="ia32"', { | 127 'target_arch=="ia32"', { |
| 128 'AdditionalLibraryDirectories': [ | 128 'AdditionalLibraryDirectories': [ |
| 129 '$(VCInstallDir)atlmfc/lib', | |
| 129 '$(WindowsSDK_LibraryPath_x86)', | 130 '$(WindowsSDK_LibraryPath_x86)', |
| 130 '$(WINDDKDIR)/lib/ATL/i386', | 131 '$(WINDDKDIR)/lib/ATL/i386', |
| 131 ], | 132 ], |
| 132 }, { | 133 }, { |
| 133 'AdditionalLibraryDirectories': [ | 134 'AdditionalLibraryDirectories': [ |
| 135 '$(VCInstallDir)atlmfc/lib/amd64', | |
| 134 '$(WindowsSDK_LibraryPath_x64)', | 136 '$(WindowsSDK_LibraryPath_x64)', |
| 135 '$(WINDDKDIR)/lib/ATL/amd64', | 137 '$(WINDDKDIR)/lib/ATL/amd64', |
| 136 ], | 138 ], |
| 137 } | 139 } |
| 138 ]], | 140 ]], |
| 139 'AdditionalLibraryDirectories': [ | |
| 140 '$(VCInstallDir)atlmfc/lib', | |
| 141 ], | |
| 142 'DelayLoadDLLs': ['Shell32.dll'], | 141 'DelayLoadDLLs': ['Shell32.dll'], |
| 143 }, | 142 }, |
| 144 }, | 143 }, |
| 145 }, | 144 }, |
| 146 | 145 |
| 147 { | 146 { |
| 148 'target_name': 'tests', | 147 'target_name': 'tests', |
| 149 'type': 'executable', | 148 'type': 'executable', |
| 150 'dependencies': [ | 149 'dependencies': [ |
| 151 'libadblockplus/third_party/googletest.gyp:googletest_main', | 150 'libadblockplus/third_party/googletest.gyp:googletest_main', |
| 152 ], | 151 ], |
| 153 'sources': [ | 152 'sources': [ |
| 154 'test/CommunicationTest.cpp', | 153 'test/CommunicationTest.cpp', |
| 155 'test/DictionaryTest.cpp', | 154 'test/DictionaryTest.cpp', |
| 156 '<@(shared_files)', | 155 '<@(shared_files)', |
| 157 ], | 156 ], |
| 158 'defines': ['WINVER=0x0501'], | 157 'defines': ['WINVER=0x0501'], |
| 159 'link_settings': { | 158 'link_settings': { |
| 160 'libraries': ['-ladvapi32', '-lshell32', '-lole32'], | 159 'libraries': ['-ladvapi32', '-lshell32', '-lole32'], |
| 161 }, | 160 }, |
| 162 'msvs_settings': { | 161 'msvs_settings': { |
| 163 'VCLinkerTool': { | 162 'VCLinkerTool': { |
| 164 'SubSystem': '1', # Console | 163 'SubSystem': '1', # Console |
| 165 'EntryPointSymbol': 'mainCRTStartup', | 164 'EntryPointSymbol': 'mainCRTStartup', |
| 166 }, | 165 }, |
| 167 }, | 166 }, |
| 168 }] | 167 }] |
| 169 } | 168 } |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
installer/bho_registry_value.wxi » ('j')
|
installer/bho_registry_value.wxi » ('J')
