diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-25 18:58:34 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-25 18:58:34 +0000 |
| commit | 4a2a30ea291ad9386468e46faf86f2c9a355e16a (patch) | |
| tree | 3d41ca2d30b3dc135ff99d17471f3d25beb4482a /o3d/tests | |
| parent | f58c8cc4dd6d74524a668880929c95b63c6588af (diff) | |
| download | chromium_src-4a2a30ea291ad9386468e46faf86f2c9a355e16a.zip chromium_src-4a2a30ea291ad9386468e46faf86f2c9a355e16a.tar.gz chromium_src-4a2a30ea291ad9386468e46faf86f2c9a355e16a.tar.bz2 | |
Dynamically loads d3d9 and d3dx9 dlls on Windows.
It's so chrome.exe does not have to load these dlls even when there's no 3D going on.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/237004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27224 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/tests')
| -rw-r--r-- | o3d/tests/tests.gyp | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/o3d/tests/tests.gyp b/o3d/tests/tests.gyp index fc3c5ce..a4cc2a9 100644 --- a/o3d/tests/tests.gyp +++ b/o3d/tests/tests.gyp @@ -166,22 +166,28 @@ 'editbin /SUBSYSTEM:CONSOLE $(OutDir)/$(TargetFileName)', }, ], - ['OS == "win" and (renderer == "d3d9" or cb_service == "d3d9")', + ['OS == "win" and renderer == "d3d9"', { 'sources': [ 'common/win/dxcapture.cc', ], + 'link_settings': { + 'libraries': [ + '"$(DXSDK_DIR)/Lib/x86/d3dx9.lib"', + 'd3d9.lib', + ], + }, + }, + ], + ['OS == "win" and (renderer == "d3d9" or cb_service == "d3d9")', + { 'include_dirs': [ '"$(DXSDK_DIR)/Include"', ], - 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalDependencies': [ - '"$(DXSDK_DIR)/Lib/x86/DxErr.lib"', - '"$(DXSDK_DIR)/Lib/x86/d3dx9.lib"', - 'd3d9.lib', - ], - }, + 'link_settings': { + 'libraries': [ + '"$(DXSDK_DIR)/Lib/x86/DxErr.lib"', + ], }, }, ], |