Merge pull request #1400 from walzer/gles20

fix compilation error in xcodebuild command line mode, which are caused by ios6 compatibility

cocos2dx/platform/ios/FontLabel/FontLabel.m

@@ -118,18 +118,17 @@
             }
             size.width = MIN(size.width, origSize.width);
             // adjust the point for alignment
-            switch ((NSTextAlignment)self.textAlignment) {
+            switch (self.textAlignment) {
-                case NSTextAlignmentLeft:
+                case UITextAlignmentLeft:
                     break;
-                case NSTextAlignmentCenter:
+                case UITextAlignmentCenter:
                     point.x += (origSize.width - size.width) / 2.0f;
                     break;
-                case NSTextAlignmentRight:
+                case UITextAlignmentRight:
                     point.x += origSize.width - size.width;
                     break;
-                case NSTextAlignmentJustified:
+                default:
-                case NSTextAlignmentNatural:
+                    break;
-                default: break;
             }
             [self.text drawAtPoint:point forWidth:size.width withZFont:actualFont lineBreakMode:self.lineBreakMode];
         } else {

cocos2dx/platform/ios/FontLabel/FontLabelStringDrawing.m

@@ -637,19 +637,18 @@ static CGSize drawOrSizeTextConstrainedToSize(BOOL performDraw, NSString *string
                 
                 // draw
                 if (performDraw) {
-                    switch ((NSTextAlignment)alignment) {
+                    switch (alignment) {
-                        case NSTextAlignmentLeft:
+                        case UITextAlignmentLeft:
                             drawPoint.x = 0;
                             break;
-                        case NSTextAlignmentCenter:
+                        case UITextAlignmentCenter:
                             drawPoint.x = (constrainedSize.width - lineSize.width) / 2.0f;
                             break;
-                        case NSTextAlignmentRight:
+                        case UITextAlignmentRight:
                             drawPoint.x = constrainedSize.width - lineSize.width;
                             break;
-                        case NSTextAlignmentJustified:
+                        default:
-                        case NSTextAlignmentNatural:
+                            break;
-                        default: break;
                     }
                     NSUInteger stopGlyphIdx = glyphIdx;
                     NSUInteger lastRunIdx = currentRunIdx;

samples/HelloCpp/proj.ios/RootViewController.mm

@@ -57,15 +57,21 @@
     return UIInterfaceOrientationIsLandscape( interfaceOrientation );
 }
 
-// For ios6, use supportedInterfaceOrientations & shouldAutorotate instead
+// For ios6.0 and higher, use supportedInterfaceOrientations & shouldAutorotate instead
-- (NSUInteger) supportedInterfaceOrientations{
+- (NSUInteger) supportedInterfaceOrientations
-    return UIInterfaceOrientationMaskLandscape;
+{
+#ifdef __IPHONE_6_0
+    return UIInterfaceOrientationMaskAllButUpsideDown;
+#endif
 }
 
 - (BOOL) shouldAutorotate {
     return YES;
 }
 
+
+
+
 - (void)didReceiveMemoryWarning {
     // Releases the view if it doesn't have a superview.
     [super didReceiveMemoryWarning];

samples/HelloLua/proj.ios/RootViewController.mm

@@ -59,7 +59,9 @@
 
 // For ios6, use supportedInterfaceOrientations & shouldAutorotate instead
 - (NSUInteger) supportedInterfaceOrientations{
-    return UIInterfaceOrientationMaskLandscape;
+#ifdef __IPHONE_6_0
+    return UIInterfaceOrientationMaskAllButUpsideDown;
+#endif
 }
 
 - (BOOL) shouldAutorotate {

samples/SimpleGame/proj.ios/RootViewController.mm

@@ -59,7 +59,9 @@
 
 // For ios6, use supportedInterfaceOrientations & shouldAutorotate instead
 - (NSUInteger) supportedInterfaceOrientations{
-    return UIInterfaceOrientationMaskLandscape;
+#ifdef __IPHONE_6_0
+    return UIInterfaceOrientationMaskAllButUpsideDown;
+#endif
 }
 
 - (BOOL) shouldAutorotate {

samples/TestCpp/proj.ios/Classes/RootViewController.mm

@@ -42,7 +42,9 @@
 
 // For ios6, use supportedInterfaceOrientations & shouldAutorotate instead
 - (NSUInteger) supportedInterfaceOrientations{
-    return UIInterfaceOrientationMaskLandscape;
+#ifdef __IPHONE_6_0
+    return UIInterfaceOrientationMaskAllButUpsideDown;
+#endif
 }
 
 - (BOOL) shouldAutorotate {

samples/TestJavascript/proj.ios/RootViewController.mm

@@ -42,7 +42,9 @@
 
 // For ios6, use supportedInterfaceOrientations & shouldAutorotate instead
 - (NSUInteger) supportedInterfaceOrientations{
-    return UIInterfaceOrientationMaskLandscape;
+#ifdef __IPHONE_6_0
+    return UIInterfaceOrientationMaskAllButUpsideDown;
+#endif
 }
 
 - (BOOL) shouldAutorotate {

samples/TestLua/proj.ios/RootViewController.mm

@@ -59,7 +59,9 @@
 
 // For ios6, use supportedInterfaceOrientations & shouldAutorotate instead
 - (NSUInteger) supportedInterfaceOrientations{
-    return UIInterfaceOrientationMaskLandscape;
+#ifdef __IPHONE_6_0
+    return UIInterfaceOrientationMaskAllButUpsideDown;
+#endif
 }
 
 - (BOOL) shouldAutorotate {

template/xcode4/base_ios.xctemplate/ios/RootViewController.mm

@@ -42,7 +42,9 @@
 
 // For ios6, use supportedInterfaceOrientations & shouldAutorotate instead
 - (NSUInteger) supportedInterfaceOrientations{
-    return UIInterfaceOrientationMaskLandscape;
+#ifdef __IPHONE_6_0
+    return UIInterfaceOrientationMaskAllButUpsideDown;
+#endif
 }
 
 - (BOOL) shouldAutorotate {