Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(154)

Unified Diff: chrome/chrome.gyp

Issue 2843060: GYP changed to extract D3DX9 DLL into product dir.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/dir_exists.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 52708)
+++ chrome/chrome.gyp (working copy)
@@ -68,6 +68,7 @@
'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'],
# TODO: remove this helper when we have loops in GYP
'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py'],
+ 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/directxsdk)',
'conditions': [
['OS=="win"', {
'nacl_defines': [
@@ -715,7 +716,34 @@
'include_dirs': [
'<(DEPTH)/third_party/wtl/include',
],
+ 'dependencies': [
+ '../third_party/angle/src/build_angle.gyp:libEGL',
+ '../third_party/angle/src/build_angle.gyp:libGLESv2',
+ ],
}],
+ ['OS=="win" and directxsdk_exists=="True"', {
+ 'actions': [
+ {
+ 'action_name': 'extract_d3dx9',
+ 'variables': {
+ 'input': 'Aug2009_d3dx9_42_x86.cab',
+ 'output': 'd3dx9_42.dll',
+ },
+ 'inputs': [
+ '../third_party/directxsdk/files/Redist/<(input)',
+ ],
+ 'outputs': [
+ '<(PRODUCT_DIR)/<(output)',
+ ],
+ 'action': [
+ 'expand',
+ '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
+ '-F:<(output)',
+ '<(PRODUCT_DIR)',
+ ],
+ },
+ ],
+ }],
['OS=="linux" and target_arch!="arm"', {
'sources': [
'gpu/gpu_backing_store_glx.cc',
« no previous file with comments | « build/dir_exists.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698