From a423317abc667895fb5ff56ff373139243ac9abb Mon Sep 17 00:00:00 2001 From: minggo Date: Fri, 23 Nov 2012 16:30:09 +0800 Subject: [PATCH] issue #1564:make iOS test work ok --- cocos2dx/platform/CCPlatformConfig.h | 16 ++++++++-------- .../TestCpp/proj.ios/Classes/testsAppDelegate.mm | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cocos2dx/platform/CCPlatformConfig.h b/cocos2dx/platform/CCPlatformConfig.h index 42afaecc37..7ac8bec4a8 100644 --- a/cocos2dx/platform/CCPlatformConfig.h +++ b/cocos2dx/platform/CCPlatformConfig.h @@ -48,51 +48,51 @@ Config of cocos2d-x project, per target platform. #define CC_TARGET_PLATFORM CC_PLATFORM_UNKNOWN // mac -#if ! CC_TARGET_PLATFORM && defined(TARGET_OS_MAC) +#if defined(TARGET_OS_MAC) #undef CC_TARGET_PLATFORM #define CC_TARGET_PLATFORM CC_PLATFORM_MAC //#define CC_SUPPORT_PVRTC #endif // iphone -#if ! CC_TARGET_PLATFORM && (defined(TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR)) +#if (defined(TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR)) #undef CC_TARGET_PLATFORM #define CC_TARGET_PLATFORM CC_PLATFORM_IOS #define CC_SUPPORT_PVRTC #endif // android -#if ! CC_TARGET_PLATFORM && defined(ANDROID) +#if defined(ANDROID) #undef CC_TARGET_PLATFORM #define CC_TARGET_PLATFORM CC_PLATFORM_ANDROID #endif // win32 -#if ! CC_TARGET_PLATFORM && (defined(WIN32) && defined(_WINDOWS)) +#if defined(WIN32) && defined(_WINDOWS) #undef CC_TARGET_PLATFORM #define CC_TARGET_PLATFORM CC_PLATFORM_WIN32 #endif // linux -#if ! CC_TARGET_PLATFORM && defined(LINUX) +#if defined(LINUX) #undef CC_TARGET_PLATFORM #define CC_TARGET_PLATFORM CC_PLATFORM_LINUX #endif // marmalade -#if ! CC_TARGET_PLATFORM && defined(MARMALADE) +#if defined(MARMALADE) #undef CC_TARGET_PLATFORM #define CC_TARGET_PLATFORM CC_PLATFORM_MARMALADE #endif // bada -#if ! CC_TARGET_PLATFORM && defined(SHP) +#if defined(SHP) #undef CC_TARGET_PLATFORM #define CC_TARGET_PLATFORM CC_PLATFORM_BADA #endif // qnx -#if ! CC_TARGET_PLATFORM && defined(__QNX__) +#if defined(__QNX__) #undef CC_TARGET_PLATFORM #define CC_TARGET_PLATFORM CC_PLATFORM_BLACKBERRY #endif diff --git a/samples/TestCpp/proj.ios/Classes/testsAppDelegate.mm b/samples/TestCpp/proj.ios/Classes/testsAppDelegate.mm index 0809f531a4..09cb3d986f 100644 --- a/samples/TestCpp/proj.ios/Classes/testsAppDelegate.mm +++ b/samples/TestCpp/proj.ios/Classes/testsAppDelegate.mm @@ -30,7 +30,7 @@ static AppDelegate s_sharedApplication; // Init the EAGLView EAGLView *__glView = [EAGLView viewWithFrame: [window bounds] - pixelFormat: kEAGLColorFormatRGBA8 + pixelFormat: kEAGLColorFormatRGB565 depthFormat: GL_DEPTH24_STENCIL8_OES preserveBackbuffer: NO sharegroup: nil