Remove %(AdditionalDependencies) from gyp linker deps, and add full windows…

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

Remove %(AdditionalDependencies) from gyp linker deps, and add full windows…
7692ca41 · Jamie Madill · 5e73312d · 7692ca41 · 7692ca41
Commit 7692ca41 authored Oct 01, 2013 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 2 deletions

common.gypi build/common.gypi +15 -0

build_angle.gypi src/build_angle.gypi +0 -2

No files found.
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -83,6 +83,21 @@
            'AdditionalLibraryDirectories': [
              '$(ProgramFiles)/Windows Kits/8.0/Lib/win8/um/x86',
            ],
+            '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': {
            'AdditionalLibraryDirectories': [

--- a/src/build_angle.gypi
+++ b/src/build_angle.gypi
@@ -384,7 +384,6 @@
              'AdditionalDependencies': [
                'd3d9.lib',
                'dxguid.lib',
-                '%(AdditionalDependencies)',
              ],
            }
          },
@@ -423,7 +422,6 @@
            'VCLinkerTool': {
              'AdditionalDependencies': [
                'd3d9.lib',
-                '%(AdditionalDependencies)',
              ],
            }
          },