diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-03 20:58:26 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-03 20:58:26 +0000 |
| commit | c6445a17ab958915ae5294a4619531f446a1fd02 (patch) | |
| tree | 2d7099ddb8a3a1cd6036762b13f8411cdcce9a40 | |
| parent | 1ba274d9f343c04eb09afda0a75847d9ad927644 (diff) | |
Make it possible to generate the ios xcode proj by specifying only skia_os="ios" in GYP_DEFINES.
R=caryclark@google.com,epoger@google.com
Review URL: https://codereview.appspot.com/6601051
git-svn-id: http://skia.googlecode.com/svn/trunk@5796 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gyp/common_variables.gypi | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index 6a0fc6bd98..ae77c847e5 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -45,13 +45,11 @@ # We set it automatically based on 'OS' (the host OS), but allow the # user to override it via GYP_DEFINES if they like. 'skia_os%': '<(OS)', - 'skia_arch_type%': 'x86', }, # Re-define all variables defined within the level-3 'variables' dict, # so that siblings of the level-2 'variables' dict can see them. 'skia_os%': '<(skia_os)', - 'skia_arch_type%': '<(skia_arch_type)', 'conditions': [ ['skia_os == "win"', { @@ -92,7 +90,6 @@ 'skia_mesa%': '<(skia_mesa)', 'skia_nv_path_rendering%': '<(skia_nv_path_rendering)', 'skia_angle%': '<(skia_angle)', - 'skia_arch_type%': '<(skia_arch_type)', 'skia_arch_width%': '<(skia_arch_width)', 'skia_directwrite%': '<(skia_directwrite)', 'android_make_apk%': '<(android_make_apk)', @@ -103,6 +100,15 @@ 'ios_sdk_version%': '<(ios_sdk_version)', 'ios_sdk_dir%': '<(ios_sdk_dir)', + 'conditions': [ + ['skia_os == "ios"', { + 'skia_arch_type%': 'arm', + 'armv7%': 1, + 'arm_neon%': 0, # neon asm files known not to work with the ios build + },{ # skia_os is not ios + 'skia_arch_type%': 'x86', + }], + ], # These are referenced by our .gypi files that list files (e.g. core.gypi) # 'skia_src_path%': '../src', |