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

Merge 7692ca41 from master.
5e5f990e · Geoff Lang · 8690da8b · 5e5f990e · 5e5f990e · 5e5f990e
Commit 5e5f990e authored Oct 08, 2013 by Geoff Lang
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 5 deletions

common.gypi build/common.gypi +14 -2

samples.gyp samples/samples.gyp +0 -1

libEGL.gypi src/libEGL.gypi +0 -1

libGLESv2.gypi src/libGLESv2.gypi +0 -1

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

--- a/samples/samples.gyp
+++ b/samples/samples.gyp
@@ -39,7 +39,6 @@
                            'AdditionalDependencies':
                            [
                                'd3d9.lib',
-                                '%(AdditionalDependencies)',
                            ],
                        }
                    }

--- a/src/libEGL.gypi
+++ b/src/libEGL.gypi
@@ -32,7 +32,6 @@
                            'AdditionalDependencies':
                            [
                                'd3d9.lib',
-                                '%(AdditionalDependencies)',
                            ],
                        },
                    },

--- a/src/libGLESv2.gypi
+++ b/src/libGLESv2.gypi
@@ -44,7 +44,6 @@
                            [
                                'd3d9.lib',
                                'dxguid.lib',
-                                '%(AdditionalDependencies)',
                            ]
                        }
                    },