Unified Diff: adblockplus.gyp
Issue 4923675673362432:
Noissue - Change build order for the include and library directories of ATL. (Closed)
Patch Set:
Created May 21, 2015, 9:25 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: adblockplus.gyp |
| =================================================================== |
| --- a/adblockplus.gyp |
| +++ b/adblockplus.gyp |
| @@ -143,9 +143,9 @@ |
| 'src/plugin/SinkPolicy.inl', |
| ], |
| 'include_dirs': [ |
| + '$(WINDDKDIR)/inc/atl71', |
| + '$(VCInstallDir)atlmfc/include', |
| '$(WindowsSDK_IncludePath)', |
| - '$(VCInstallDir)atlmfc/include', |
| - '$(WINDDKDIR)/inc/atl71', |
| ], |
| # See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or a DLL |
| # That Is Brought into a Process" on the link here: |
| @@ -179,15 +179,15 @@ |
| 'conditions': [[ |
| 'target_arch=="ia32"', { |
| 'AdditionalLibraryDirectories': [ |
| + '$(WINDDKDIR)/lib/ATL/i386', |
| '$(VCInstallDir)atlmfc/lib', |
| '$(WindowsSDK_LibraryPath_x86)', |
| - '$(WINDDKDIR)/lib/ATL/i386', |
| ], |
| }, { |
| 'AdditionalLibraryDirectories': [ |
| + '$(WINDDKDIR)/lib/ATL/amd64', |
| '$(VCInstallDir)atlmfc/lib/amd64', |
| '$(WindowsSDK_LibraryPath_x64)', |
| - '$(WINDDKDIR)/lib/ATL/amd64', |
| ], |
| } |
| ]], |
| @@ -257,6 +257,7 @@ |
| ], |
| 'include_dirs': [ |
| '$(WINDDKDIR)/inc/atl71', |
| + '$(VCInstallDir)atlmfc/include', |
| ], |
| 'defines': [ |
| 'WINVER=0x0501', |
| @@ -272,15 +273,15 @@ |
| 'conditions': [[ |
| 'target_arch=="ia32"', { |
| 'AdditionalLibraryDirectories': [ |
| + '$(WINDDKDIR)/lib/ATL/i386', |
| '$(VCInstallDir)atlmfc/lib', |
| '$(WindowsSDK_LibraryPath_x86)', |
| - '$(WINDDKDIR)/lib/ATL/i386', |
| ], |
| }, { |
| 'AdditionalLibraryDirectories': [ |
| + '$(WINDDKDIR)/lib/ATL/amd64', |
| '$(VCInstallDir)atlmfc/lib/amd64', |
| '$(WindowsSDK_LibraryPath_x64)', |
| - '$(WINDDKDIR)/lib/ATL/amd64', |
| ], |
| } |
| ]], |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
