diff options
| author | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-28 20:53:17 +0000 |
|---|---|---|
| committer | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-28 20:53:17 +0000 |
| commit | e6b248eb71e9c422d8186974f57a1a1bd5c2ff92 (patch) | |
| tree | df086ac4633375b23f9eba1d6a7adfbd0f8e8b8b /o3d | |
| parent | 88e719bdf5f36b2f0228523d8de42c8302ae448a (diff) | |
| download | chromium_src-e6b248eb71e9c422d8186974f57a1a1bd5c2ff92.zip chromium_src-e6b248eb71e9c422d8186974f57a1a1bd5c2ff92.tar.gz chromium_src-e6b248eb71e9c422d8186974f57a1a1bd5c2ff92.tar.bz2 | |
Mac: Fix bug that has always existed in the GYP build where O3D.rsrc was an empty file with all the data stored in the resource fork (which is lost when zipping). -useDF was in the ancient scons build but was never included in the GYP command.
TEST=built on Mac, verified O3D.rsrc file is now correct, and verified it works in various browsers
BUG=none
Review URL: http://codereview.chromium.org/2384003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48524 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/plugin/plugin.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp index 746f892..aa190ee 100644 --- a/o3d/plugin/plugin.gyp +++ b/o3d/plugin/plugin.gyp @@ -247,6 +247,7 @@ { # The unbranded Mac plugin's name is a special case. 'action': ['/usr/bin/Rez', + '-useDF', '-o', '${BUILT_PRODUCTS_DIR}/O3D.plugin/Contents/Resources/O3D.rsrc', '${BUILT_PRODUCTS_DIR}/O3D.r', @@ -254,6 +255,7 @@ }, { 'action': ['/usr/bin/Rez', + '-useDF', '-o', '${BUILT_PRODUCTS_DIR}/<(plugin_npapi_filename).plugin/Contents/Resources/<(plugin_npapi_filename).rsrc', '${BUILT_PRODUCTS_DIR}/O3D.r', |