diff options
| author |  caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-24 19:33:57 +0000 |
|---|---|---|
| committer | caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-24 19:33:57 +0000 |
| commit | 594dd3cd78e2f970d53bb0934fbbb63b41e1d40c (patch) | |
| tree | aeb48bc17abb7631ecac0998dc8b1609b386670b /gyp/common_variables.gypi | |
| parent | cdb426d55a4bc4dae4f6d4f23e6994762950fdc3 (diff) | |
iOS support work in progress
include/core/SkTypes.h
- address unsigned warning
include/core/SkInstCnt.h
src/core/SkInstCnt.cpp
gyp/common.gypi
- always define SK_ENABLE_INST_COUNT for debug builds
src/views/mac/SkNSView.mm
- only call glClear if there is a GL context
src/ports/SkImageDecoder_CG.cpp
- fix iOS hack by using proper include
gyp/opts.gyp
- exclude more ARM files from iOS for now (see issue 900)
gyp/common_conditions.gypi
- add release, more ios specific common settings
gyp/bench.gyp
- add iOS condition
gyp/SampleApp.gyp
- remove precompiled header, hardcoded SDK path
- add more frameworks
gyp/debugger.gyp
- fix syntax error
- add iOS/Android condition
gyp/core.gyp
- remove hardcoded SDK path, add more frameworks
gyp/common_variables.gypi
- add ios SDK path
- add ios SDK version
gyp/iOSSampleApp.gyp
- remove obsolete project
gyp/zlib.gyp
- add ios library path
Review URL: https://codereview.appspot.com/6551070
git-svn-id: http://skia.googlecode.com/svn/trunk@5649 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp/common_variables.gypi')
| -rw-r--r-- | gyp/common_variables.gypi | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index ee89ca94e0..8e4ab80b9c 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -67,6 +67,11 @@ }, { 'skia_static_initializers%': 1, }], + [ 'skia_arch_type == "x86"', { + 'ios_sdk_dir%': '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator', + }, { + 'ios_sdk_dir%': '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS', + }], ], 'skia_scalar%': 'float', @@ -78,6 +83,7 @@ 'android_make_apk%': 1, 'skia_nacl%': 0, 'skia_gpu%': 1, + 'ios_sdk_version%': '5.1', 'skia_osx_sdkroot%': 'macosx10.6', }, @@ -97,6 +103,8 @@ 'skia_gpu%': '<(skia_gpu)', 'skia_osx_sdkroot%': '<(skia_osx_sdkroot)', 'skia_static_initializers%': '<(skia_static_initializers)', + 'ios_sdk_version%': '<(ios_sdk_version)', + 'ios_sdk_dir%': '<(ios_sdk_dir)', # These are referenced by our .gypi files that list files (e.g. core.gypi) # |