Merge pull request #14672 from xiaofeng11/v3.10vc

Fix 3d touch compile error in lower version Xcode
This commit is contained in:
xiaofeng11 2015-12-14 16:04:27 +08:00
commit 9be87c2f87
1 changed files with 1 additions and 2 deletions

View File

@ -427,8 +427,7 @@ Copyright (C) 2008 Apple Inc. All Rights Reserved.
ids[i] = touch;
xs[i] = [touch locationInView: [touch view]].x * self.contentScaleFactor;;
ys[i] = [touch locationInView: [touch view]].y * self.contentScaleFactor;;
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0 // Use 9.0 or higher SDK to compile
#ifdef __IPHONE_9_0 && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0
// running on iOS 9.0 or higher version
if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 9.0f) {
fs[i] = touch.force;