diff options
| author | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-19 18:46:26 +0000 |
|---|---|---|
| committer | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-19 18:46:26 +0000 |
| commit | 76b3af422d58822e17523064aca0a3de116a3457 (patch) | |
| tree | 312e948e14acfd7bbf63dfd3a6677b8625df80d2 /o3d/converter/converter.gyp | |
| parent | 9a5bf36ab389af98120f9922bd191509321366da (diff) | |
| download | chromium_src-76b3af422d58822e17523064aca0a3de116a3457.zip chromium_src-76b3af422d58822e17523064aca0a3de116a3457.tar.gz chromium_src-76b3af422d58822e17523064aca0a3de116a3457.tar.bz2 | |
Changes needed to make "all" build complete, including fixing the generated converter tool.
Review URL: http://codereview.chromium.org/173045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23721 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/converter/converter.gyp')
| -rw-r--r-- | o3d/converter/converter.gyp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/o3d/converter/converter.gyp b/o3d/converter/converter.gyp index a96372c..0e15f54 100644 --- a/o3d/converter/converter.gyp +++ b/o3d/converter/converter.gyp @@ -58,6 +58,18 @@ 'conditions' : [ ['OS == "mac"', { + 'postbuilds': [ + { + 'variables': { + # Define install_name in a variable ending in _path + # so that gyp understands it's a path and performs proper + # relativization during dict merging. + 'install_name_path': 'mac/converter_install_name.sh', + }, + 'postbuild_name': 'Fix Framework Paths', + 'action': ['<(install_name_path)'], + }, + ], 'sources': [ 'mac/converter_main.mm', ], @@ -66,7 +78,7 @@ '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework', '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', - '../../../<(cgdir)/Cg.framework', + '../../<(cgdir)/Cg.framework', ], }, }, |