| OLD | NEW |
| 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 # This file contains flags that are specific to o3d, but affect the build as a | 5 # This file contains flags that are specific to o3d, but affect the build as a |
| 6 # whole (e.g. build flags that change the ABI). | 6 # whole (e.g. build flags that change the ABI). |
| 7 # For example, on linux amd64, all the libraries that will be linked into the | 7 # For example, on linux amd64, all the libraries that will be linked into the |
| 8 # plugin (skia, v8, ...) need to be compiled with -fPIC but we don't want to do | 8 # plugin (skia, v8, ...) need to be compiled with -fPIC but we don't want to do |
| 9 # that generally in Chrome (so it can't be lumped into the top-level | 9 # that generally in Chrome (so it can't be lumped into the top-level |
| 10 # build/common.gypi). | 10 # build/common.gypi). |
| 11 { | 11 { |
| 12 'variables': { | 12 'variables': { |
| 13 'conditions': [ | 13 'conditions': [ |
| 14 [ 'OS == "linux"', { | 14 [ 'OS == "linux"', { |
| 15 'use_system_zlib': 0, | 15 'use_system_zlib': 0, |
| 16 'use_system_libjpeg': 0, | 16 'use_system_libjpeg': 0, |
| 17 'nacl_standalone': 1, |
| 18 # nacl_standalone=1 is broken because nacl's build/common.gypi |
| 19 # insists on building 32-bit. Force target_arch to be defined |
| 20 # so that nacl's override isn't used. |
| 21 # Note: this variable setting is copied from nacl's |
| 22 # build/common.gypi so that it has the exact same semantics. |
| 23 'target_arch%': '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/arm.
*/arm/")' |
| 17 }], | 24 }], |
| 18 [ 'OS == "win"', { | 25 [ 'OS == "win"', { |
| 19 'nacl_standalone': 1, | 26 'nacl_standalone': 1, |
| 20 }], | 27 }], |
| 21 ], | 28 ], |
| 22 }, | 29 }, |
| 23 'target_defaults': { | 30 'target_defaults': { |
| 24 'conditions': [ | 31 'conditions': [ |
| 25 [ 'OS == "linux" and target_arch=="x64"', { | 32 [ 'OS == "linux" and target_arch=="x64"', { |
| 26 'cflags': [ | 33 'cflags': [ |
| (...skipping 15 matching lines...) Expand all Loading... |
| 42 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES', | 49 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES', |
| 43 'OTHER_CFLAGS': ['-mmacosx-version-min=10.5'], | 50 'OTHER_CFLAGS': ['-mmacosx-version-min=10.5'], |
| 44 }, | 51 }, |
| 45 'defines': [ | 52 'defines': [ |
| 46 'MAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_5', | 53 'MAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_5', |
| 47 ], | 54 ], |
| 48 }], | 55 }], |
| 49 ], | 56 ], |
| 50 }, | 57 }, |
| 51 } | 58 } |
| OLD | NEW |