diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-10 22:53:00 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-10 22:53:00 +0000 |
| commit | 1a23d36a9ffa591b56a2fc0826b92d19904bfa34 (patch) | |
| tree | 419a8a1ae00858530060180743f3e321fee0c5fe | |
| parent | 6653c19c044e724ad9a93248611abd2135d16a1a (diff) | |
| download | chromium_src-1a23d36a9ffa591b56a2fc0826b92d19904bfa34.zip chromium_src-1a23d36a9ffa591b56a2fc0826b92d19904bfa34.tar.gz chromium_src-1a23d36a9ffa591b56a2fc0826b92d19904bfa34.tar.bz2 | |
gl_implementation_win includes d3d9.h, so add the dx sdk to include_dirs
BUG=none
TEST=Install the dx sdk from microsoft instead of going the src-internal route, build with msvc2010. No error messages about d3d9.h or d3d9x.lib.
TBR=avi
Review URL: http://codereview.chromium.org/10033003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131663 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/chrome_dll.gypi | 1 | ||||
| -rw-r--r-- | content/content_common.gypi | 1 | ||||
| -rw-r--r-- | ui/gfx/gl/gl.gyp | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index df0c4a2..96bf378 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -132,6 +132,7 @@ }, 'msvs_settings': { 'VCLinkerTool': { + 'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'], 'BaseAddress': '0x01c30000', 'ImportLibrary': '$(OutDir)\\lib\\chrome_dll.lib', 'ProgramDatabaseFile': '$(OutDir)\\chrome_dll.pdb', diff --git a/content/content_common.gypi b/content/content_common.gypi index 117339a..5c5c04b 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -401,6 +401,7 @@ ], 'msvs_settings': { 'VCLinkerTool': { + 'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'], 'DelayLoadDLLs': [ 'd3d9.dll', 'd3dx9_43.dll', diff --git a/ui/gfx/gl/gl.gyp b/ui/gfx/gl/gl.gyp index 9db771a..e4e1a89 100644 --- a/ui/gfx/gl/gl.gyp +++ b/ui/gfx/gl/gl.gyp @@ -161,6 +161,9 @@ '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.cc', '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.h', ], + 'include_dirs': [ + '$(DXSDK_DIR)/include', + ], }], ['OS=="mac"', { 'sources': [ |