Merge branch 'develop' into headless-develop

Author: osinoleg

cocos2d-ios.xcodeproj/project.pbxproj

@@ -2789,7 +2789,7 @@
 				MACOSX_DEPLOYMENT_TARGET = "$(inherited)";
 				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = apportablesdk1.0;
+				SDKROOT = sbpbeta;
 			};
 			name = Debug;
 		};
@@ -2813,7 +2813,7 @@
 				MACOSX_DEPLOYMENT_TARGET = "$(inherited)";
 				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = apportablesdk1.0;
+				SDKROOT = sbpbeta;
 			};
 			name = Release;
 		};
@@ -2979,7 +2979,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = cocos2dAndroid;
-				SDKROOT = apportablesdk1.0;
+				SDKROOT = sbpbeta;
 				SKIP_INSTALL = YES;
 			};
 			name = Debug;
@@ -3022,7 +3022,7 @@
 				);
 				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = cocos2dAndroid;
-				SDKROOT = apportablesdk1.0;
+				SDKROOT = sbpbeta;
 				SKIP_INSTALL = YES;
 				ZERO_LINK = NO;
 			};