diff options
| author | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-03 02:15:27 +0000 |
|---|---|---|
| committer | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-03 02:15:27 +0000 |
| commit | e662e8d9e42d9250ef5ebed4067ecdd146552581 (patch) | |
| tree | 4edc77232f4c681348153a82ef427a6eab26b1e4 /o3d/plugin | |
| parent | 23763611ff03226f8d5457906def87dfe644a924 (diff) | |
| download | chromium_src-e662e8d9e42d9250ef5ebed4067ecdd146552581.zip chromium_src-e662e8d9e42d9250ef5ebed4067ecdd146552581.tar.gz chromium_src-e662e8d9e42d9250ef5ebed4067ecdd146552581.tar.bz2 | |
Get Mac GYP build compiling.
Review URL: http://codereview.chromium.org/172119
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25292 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin')
| -rwxr-xr-x | o3d/plugin/mac/plugin_copy_frameworks.sh | 9 | ||||
| -rwxr-xr-x | o3d/plugin/mac/plugin_fix_install_names.sh | 5 | ||||
| -rw-r--r-- | o3d/plugin/mac/plugin_mac.mm | 2 | ||||
| -rw-r--r-- | o3d/plugin/plugin.gyp | 9 |
4 files changed, 12 insertions, 13 deletions
diff --git a/o3d/plugin/mac/plugin_copy_frameworks.sh b/o3d/plugin/mac/plugin_copy_frameworks.sh index 9edb962..1df95dc 100755 --- a/o3d/plugin/mac/plugin_copy_frameworks.sh +++ b/o3d/plugin/mac/plugin_copy_frameworks.sh @@ -3,10 +3,11 @@ # Copy stripped frameworks inside the plugin. ditto --arch i386 \ - "${PROJECT_DIR}/../../breakpad/src/client/mac/build/Release/Breakpad.framework" \ - "${BUILT_PRODUCTS_DIR}/O3D.plugin/Contents/Frameworks/Breakpad.framework" - -ditto --arch i386 \ "${PROJECT_DIR}/../../third_party/cg/files/mac/Cg.framework" \ "${BUILT_PRODUCTS_DIR}/O3D.plugin/Contents/Frameworks/Cg.framework" +ditto --arch i386 \ + "${BUILT_PRODUCTS_DIR}/crash_report_sender.app" \ + "${BUILT_PRODUCTS_DIR}/O3D.plugin/Contents/Resources/crash_report_sender.app" + + diff --git a/o3d/plugin/mac/plugin_fix_install_names.sh b/o3d/plugin/mac/plugin_fix_install_names.sh index 36ec595..a2cdbf0 100755 --- a/o3d/plugin/mac/plugin_fix_install_names.sh +++ b/o3d/plugin/mac/plugin_fix_install_names.sh @@ -2,11 +2,6 @@ # Make plugin look in its private Frameworks directory for these frameworks. -# First take care of Breakpad.framework -/usr/bin/install_name_tool -change \ - @executable_path/../Frameworks/Breakpad.framework/Versions/A/Breakpad \ - @loader_path/../Frameworks/Breakpad.framework/Versions/A/Breakpad \ - "${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}" # Cg.framework /usr/bin/install_name_tool -change \ diff --git a/o3d/plugin/mac/plugin_mac.mm b/o3d/plugin/mac/plugin_mac.mm index f04955d..a0d3396 100644 --- a/o3d/plugin/mac/plugin_mac.mm +++ b/o3d/plugin/mac/plugin_mac.mm @@ -32,7 +32,7 @@ #include "plugin_mac.h" -#include <Breakpad/Breakpad.h> +#include "Breakpad.h" #include <Cocoa/Cocoa.h> #include <QuickTime/QuickTime.h> #include "plugin/cross/o3d_glue.h" diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp index f0ea4c6..9331ce3 100644 --- a/o3d/plugin/plugin.gyp +++ b/o3d/plugin/plugin.gyp @@ -97,8 +97,10 @@ 'mac/graphics_utils_mac.mm', ], 'mac_framework_dirs': [ - '../../breakpad/src/client/mac/build/Release', - '<(cgdir)', + '../../<(cgdir)', + ], + 'include_dirs': [ + '../../breakpad/src/client/mac/Framework', ], 'defines': [ 'XP_MACOSX=1', @@ -112,7 +114,8 @@ '$(SDKROOT)/System/Library/Frameworks/IOKit.framework', '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', '$(SDKROOT)/System/Library/Frameworks/QuickTime.framework', - '../../breakpad/src/client/mac/build/Release/Breakpad.framework', + 'libbreakpad.a', + 'libbreakpad_utilities.a', '../../third_party/cg/files/mac/Cg.framework', '../../third_party/glew/files/lib/libMacStaticGLEW.a', ], |