diff options
| author | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 18:23:45 +0000 |
|---|---|---|
| committer | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 18:23:45 +0000 |
| commit | f47df55a05517ffd561069b248efd23d0407095f (patch) | |
| tree | 5c8adfb54eff8b8a62b06d39cce5a6004f8627a3 | |
| parent | 1476ac546bc4be566f019e21580bb377d9945930 (diff) | |
| download | chromium_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
| -rw-r--r-- | o3d/build/common.gypi | 9 | ||||
| -rw-r--r-- | o3d/core/core.gyp | 12 | ||||
| -rw-r--r-- | o3d/plugin/plugin.gyp | 25 | ||||
| -rw-r--r-- | o3d/tests/tests.gyp | 2 |
4 files changed, 44 insertions, 4 deletions
diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi index ef49a52..a164f7c 100644 --- a/o3d/build/common.gypi +++ b/o3d/build/common.gypi @@ -67,11 +67,18 @@ 'MAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_4', 'SK_BUILD_FOR_MAC', ], + 'configurations': { + 'Debug': { + 'xcode_settings': { + 'CFLAGS': ['-g',], + }, + }, + }, 'xcode_settings': { - 'WARNING_CFLAGS': ['-Wno-deprecated-declarations'], 'CFLAGS': ['-gstabs+', '-fno-eliminate-unused-debug-symbols', '-mmacosx-version-min=10.4'], + 'WARNING_CFLAGS': ['-Wno-deprecated-declarations'], 'WARNING_CXXFLAGS': ['-Wstrict-aliasing', '-Wno-deprecated',], }, diff --git a/o3d/core/core.gyp b/o3d/core/core.gyp index 2cf7794..47aff60 100644 --- a/o3d/core/core.gyp +++ b/o3d/core/core.gyp @@ -278,7 +278,10 @@ 'mac', ], }, - } + 'xcode_settings': { + 'GCC_PREFIX_HEADER': 'cross/precompile.h', + }, + }, ], ], }, @@ -291,6 +294,13 @@ 'sources': [ ], 'conditions': [ + ['OS == "mac"', + { + 'xcode_settings': { + 'GCC_PREFIX_HEADER': 'cross/precompile.h', + }, + }, + ], ['renderer == "gl"', { 'sources': [ 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', + ], + }, ], }, ], diff --git a/o3d/tests/tests.gyp b/o3d/tests/tests.gyp index 2f1742b..802f636 100644 --- a/o3d/tests/tests.gyp +++ b/o3d/tests/tests.gyp @@ -98,7 +98,7 @@ '$(SDKROOT)/System/Library/Frameworks/GLUT.framework', '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', '../../third_party/cg/files/mac/Cg.framework', - '../../third_party/glew/files/lib/libGLEW.a', + '../../third_party/glew/files/lib/libMacStaticGLEW.a', ], }, }, |