diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-11 19:39:01 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-11 19:39:01 +0000 |
| commit | 056048a7433f59b1f2e601c9099d8b402d3c7a9b (patch) | |
| tree | 4186a1cdbb8302d234f0e090ac930b2849237dee /o3d | |
| parent | e3679957446c2bcbf41559f28e401c3cf857750e (diff) | |
| download | chromium_src-056048a7433f59b1f2e601c9099d8b402d3c7a9b.zip chromium_src-056048a7433f59b1f2e601c9099d8b402d3c7a9b.tar.gz chromium_src-056048a7433f59b1f2e601c9099d8b402d3c7a9b.tar.bz2 | |
Copying swiftshader over if available.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/384035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31690 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/build/libs.gyp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/o3d/build/libs.gyp b/o3d/build/libs.gyp index a4492dd..32e5f42 100644 --- a/o3d/build/libs.gyp +++ b/o3d/build/libs.gyp @@ -5,8 +5,13 @@ { 'variables': { 'chromium_code': 1, - 'dx_redist_path': '../../o3d-internal/third_party/dx_nov_2007_redist', + 'dx_redist_path': + '../../o3d-internal/third_party/dx_nov_2007_redist', 'dx_redist_exists': '<!(python file_exists.py ../../o3d-internal/third_party/dx_nov_2007_redist/d3dx9_36.dll)', + 'swiftshader_path': + '../../o3d-internal/third_party/swiftshader/files/swiftshader_d3d9.dll', + 'swiftshader_exists': + '<!(python file_exists.py ../../o3d-internal/third_party/swiftshader/files/swiftshader_d3d9.dll)', }, 'includes': [ 'common.gypi', @@ -204,6 +209,16 @@ '"$(DXSDK_DIR)/Lib/x86/d3dx9.lib"', ], }, + 'conditions' : [ + ['"<(swiftshader_exists)" == "True"', { + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)/O3DExtras', + 'files': ['<(swiftshader_path)'], + }, + ], + }], + ], 'copies': [ { 'destination': '<(PRODUCT_DIR)', |