[cocos2d/cocos2d-swift] c1353a: Fix compile issues for Android.

[GitHub]

Branch: refs/heads/metal-hacking
Home: https://github.com/cocos2d/cocos2d-swift
Commit: c1353a63225a6aa1b942f8b4daf9cea5bc1ae915
https://github.com/cocos2d/cocos2d-swift/commit/c1353a63225a6aa1b942f8b4daf9cea5bc1ae915
Author: slembcke <slem...@gmail.com>
Date: 2014-09-23 (Tue, 23 Sep 2014)

Changed paths:
M CCRendererGLSupport.m
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d/Platforms/Android/CCGLView.h
M cocos2d/Platforms/Android/CCGLView.m
M cocos2d/Platforms/CCGL.h

Log Message:
-----------
Fix compile issues for Android.


Commit: 3ad9cb030bc8aa8e1890112dc835c83d0da4f34e
https://github.com/cocos2d/cocos2d-swift/commit/3ad9cb030bc8aa8e1890112dc835c83d0da4f34e
Author: slembcke <slem...@gmail.com>
Date: 2014-09-23 (Tue, 23 Sep 2014)

Changed paths:
M CCRendererGLSupport.m
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-osx.xcodeproj/project.pbxproj
M cocos2d-tests-ios.xcodeproj/project.pbxproj
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d/CCClippingNode.m
M cocos2d/CCConfiguration.m
M cocos2d/CCDrawNode.m
M cocos2d/CCEffect.m
M cocos2d/CCEffectStack.m
M cocos2d/CCRenderTexture.m
M cocos2d/CCRenderTexture_Private.h
M cocos2d/CCRenderer.m
M cocos2d/CCRendererBasicTypes.m
M cocos2d/CCShader.m
M cocos2d/CCTMXXMLParser.m
M cocos2d/CCTexture.h
M cocos2d/CCTexture.m
M cocos2d/CCTexturePVR.m
M cocos2d/Platforms/Mac/CCGLView.h
M cocos2d/Platforms/Mac/CCGLView.m
M cocos2d/Platforms/iOS/CCAppDelegate.m
M cocos2d/Platforms/iOS/CCMetalSupport.m
M cocos2d/Platforms/iOS/CCShaders.metal

Log Message:
-----------
Merge branch 'metal-hacking' of github.com:cocos2d/cocos2d-iphone into metal-hacking


Compare: https://github.com/cocos2d/cocos2d-swift/compare/0125b7f91d28...3ad9cb030bc8