summaryrefslogtreecommitdiffstats
path: root/o3d/plugin
diff options
context:
space:
mode:
authormaf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-26 18:23:45 +0000
committermaf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-26 18:23:45 +0000
commitf47df55a05517ffd561069b248efd23d0407095f (patch)
tree5c8adfb54eff8b8a62b06d39cce5a6004f8627a3 /o3d/plugin
parent1476ac546bc4be566f019e21580bb377d9945930 (diff)
downloadchromium_src-f47df55a05517ffd561069b248efd23d0407095f.zip
chromium_src-f47df55a05517ffd561069b248efd23d0407095f.tar.gz
chromium_src-f47df55a05517ffd561069b248efd23d0407095f.tar.bz2
Changes needed to get everything packaged for Mac.
Review URL: http://codereview.chromium.org/173453 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24478 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin')
-rw-r--r--o3d/plugin/plugin.gyp25
1 files changed, 24 insertions, 1 deletions
diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp
index b5b72bd..d2cc0a0 100644
--- a/o3d/plugin/plugin.gyp
+++ b/o3d/plugin/plugin.gyp
@@ -81,6 +81,12 @@
'dependencies': [
'../../breakpad/breakpad.gyp:breakpad',
],
+ 'xcode_settings': {
+ 'INFOPLIST_FILE': '<(SHARED_INTERMEDIATE_DIR)/plugin/Info.plist',
+ },
+ 'mac_bundle_resources': [
+ 'mac/Resources/English.lproj',
+ ],
'sources': [
'mac/config_mac.mm',
'mac/main_mac.mm',
@@ -92,6 +98,7 @@
],
'mac_framework_dirs': [
'../../breakpad/src/client/mac/build/Release',
+ '<(cgdir)',
],
'defines': [
'XP_MACOSX=1',
@@ -107,7 +114,7 @@
'$(SDKROOT)/System/Library/Frameworks/QuickTime.framework',
'../../breakpad/src/client/mac/build/Release/Breakpad.framework',
'../../third_party/cg/files/mac/Cg.framework',
- '../../third_party/glew/files/lib/libGLEW.a',
+ '../../third_party/glew/files/lib/libMacStaticGLEW.a',
],
},
'postbuilds': [
@@ -131,6 +138,22 @@
'postbuild_name': 'Copy Frameworks',
'action': ['<(copy_frameworks_path)'],
},
+ {
+ 'postbuild_name': 'Process Resource File',
+ 'action': ['python',
+ 'version_info.py',
+ 'mac/o3d_plugin.r',
+ '${BUILT_PRODUCTS_DIR}/O3D.r',
+ ],
+ },
+ {
+ 'postbuild_name': 'Compile Resource File',
+ 'action': ['/usr/bin/Rez',
+ '-o',
+ '${BUILT_PRODUCTS_DIR}/O3D.plugin/Contents/Resources/O3D.rsrc',
+ '${BUILT_PRODUCTS_DIR}/O3D.r',
+ ],
+ },
],
},
],