diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-11 00:57:20 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-11 00:57:20 +0000 |
| commit | 3903e2609825d45aeaa41e36616bf81248fdb734 (patch) | |
| tree | 9e1ad283a714e48045644962b40e02ddc1eabadd /o3d | |
| parent | 961306dca553f6e7b5262e384317a73351a77985 (diff) | |
| download | chromium_src-3903e2609825d45aeaa41e36616bf81248fdb734.zip chromium_src-3903e2609825d45aeaa41e36616bf81248fdb734.tar.gz chromium_src-3903e2609825d45aeaa41e36616bf81248fdb734.tar.bz2 | |
Moving the copy of d3dx_36.dll to a common location.
Making it a copy by using a checked in copy if available or falling back on
the system copy otherwise.
BUG=None
TEST=None
TBR=gspencer
Review URL: http://codereview.chromium.org/164297
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22993 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/build/libs.gyp | 24 | ||||
| -rw-r--r-- | o3d/converter/converter.gyp | 18 |
2 files changed, 26 insertions, 16 deletions
diff --git a/o3d/build/libs.gyp b/o3d/build/libs.gyp index 765afbb..43daadb 100644 --- a/o3d/build/libs.gyp +++ b/o3d/build/libs.gyp @@ -5,6 +5,8 @@ { 'variables': { 'chromium_code': 1, + '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)', }, 'includes': [ 'common.gypi', @@ -40,4 +42,26 @@ ], }, ], + 'conditions': [ + ['OS=="win"', { + 'targets': [ + { + 'target_name': 'dx_dll', + 'type': 'none', + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)', + 'conditions' : [ + ['"<(dx_redist_exists)" == "True"', { + 'files': ['<(dx_redist_path)/d3dx9_36.dll'], + },{ + 'files': ['$(windir)/system32/d3dx9_36.dll'], + }], + ], + }, + ], + }, + ], + }], + ], } diff --git a/o3d/converter/converter.gyp b/o3d/converter/converter.gyp index 6535778..a96372c 100644 --- a/o3d/converter/converter.gyp +++ b/o3d/converter/converter.gyp @@ -73,22 +73,8 @@ ], ['OS == "win"', { - 'actions': [ - { - 'action_name': 'd3dx9_36_dll_copy', - 'inputs': [ - '$(DXSDK_DIR)/runtime/x86/d3dx9d_36.dll', - ], - 'outputs': [ - '<(PRODUCT_DIR)/d3dx9_36.dll', - ], - 'action': [ - 'cp', - '-f', - '<@(_inputs)', - '<@(_outputs)', - ], - }, + 'dependencies': [ + '../build/libs.gyp:dx_dll', ], 'msvs_settings': { 'VCLinkerTool': { |