Skip to content

A
angle
Commit 5e5f990e by Geoff Lang
Options

Merge 7692ca41 from master.

Remove %(AdditionalDependencies) from gyp linker deps, and add full windows dependency library list. ANGLEBUG=477 BUG= R=zmo@chromium.org Review URL: https://codereview.appspot.com/14161043
parent 8690da8b
Showing with 14 additions and 5 deletions
build/common.gypi
...@@ -87,8 +87,20 @@ ...@@ -87,8 +87,20 @@
'$(ProgramFiles)/Windows Kits/8.0/Lib/win8/um/x86', '$(ProgramFiles)/Windows Kits/8.0/Lib/win8/um/x86',
], ],
'AdditionalDependencies': [ 'AdditionalDependencies': [
'%(AdditionalDependencies)', 'kernel32.lib',
] 'gdi32.lib',
'winspool.lib',
'comdlg32.lib',
'advapi32.lib',
'shell32.lib',
'ole32.lib',
'oleaut32.lib',
'user32.lib',
'uuid.lib',
'odbc32.lib',
'odbccp32.lib',
'delayimp.lib',
],
}, },
'VCLibrarianTool': { 'VCLibrarianTool': {
'AdditionalLibraryDirectories': [ 'AdditionalLibraryDirectories': [
......
samples/samples.gyp
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
'AdditionalDependencies': 'AdditionalDependencies':
[ [
'd3d9.lib', 'd3d9.lib',
'%(AdditionalDependencies)',
], ],
} }
} }
......
src/libEGL.gypi
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
'AdditionalDependencies': 'AdditionalDependencies':
[ [
'd3d9.lib', 'd3d9.lib',
'%(AdditionalDependencies)',
], ],
}, },
}, },
......
src/libGLESv2.gypi
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
[ [
'd3d9.lib', 'd3d9.lib',
'dxguid.lib', 'dxguid.lib',
'%(AdditionalDependencies)',
] ]
} }
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment