diff options
| author | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 23:17:37 +0000 |
|---|---|---|
| committer | maf@google.com <maf@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-13 23:17:37 +0000 |
| commit | fb8d32aab3a33166d3c1814e295eeafbea97174b (patch) | |
| tree | 333cebe6d64ed3edb2fc5a3d7ef03fe8f5dec1b1 /o3d/build | |
| parent | ebe89e0676c12a6ebccb35fef1611323d1b35afb (diff) | |
| download | chromium_src-fb8d32aab3a33166d3c1814e295eeafbea97174b.zip chromium_src-fb8d32aab3a33166d3c1814e295eeafbea97174b.tar.gz chromium_src-fb8d32aab3a33166d3c1814e295eeafbea97174b.tar.bz2 | |
Changes needed to get Mac plugin gyp project build compiling and linking.
Review URL: http://codereview.chromium.org/165433
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23375 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/build')
| -rw-r--r-- | o3d/build/common.gypi | 3 | ||||
| -rw-r--r-- | o3d/build/libs.gyp | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi index 1883836..ef49a52 100644 --- a/o3d/build/common.gypi +++ b/o3d/build/common.gypi @@ -68,11 +68,12 @@ 'SK_BUILD_FOR_MAC', ], 'xcode_settings': { + 'WARNING_CFLAGS': ['-Wno-deprecated-declarations'], 'CFLAGS': ['-gstabs+', '-fno-eliminate-unused-debug-symbols', '-mmacosx-version-min=10.4'], 'WARNING_CXXFLAGS': ['-Wstrict-aliasing', - '-Wno-deprecated'], + '-Wno-deprecated',], }, }, }, diff --git a/o3d/build/libs.gyp b/o3d/build/libs.gyp index 43daadb..88dba6b 100644 --- a/o3d/build/libs.gyp +++ b/o3d/build/libs.gyp @@ -19,6 +19,12 @@ { 'destination': '<(PRODUCT_DIR)', 'conditions' : [ + [ 'OS=="mac"', + { + 'files': [ + ], + }, + ], [ 'OS=="win"', { 'files': [ |