From 0f672473255ba78e212155cb325efa8e1e3a7d37 Mon Sep 17 00:00:00 2001 From: Ricardo Quesada Date: Fri, 16 May 2014 14:36:00 -0700 Subject: [PATCH] Squashed commit of the following: commit a794d107ad85667e3d754f0b6251fc864dfbf288 Author: Ricardo Quesada Date: Fri May 16 14:33:49 2014 -0700 Yeah... everything compiles on win32 and wp8 commit 4740be6e4a0d16f742c27996e7ab2c100adc76af Author: Ricardo Quesada Date: Fri May 16 13:58:38 2014 -0700 CCIME moved to base and compiles on Android commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72 Author: Ricardo Quesada Date: Fri May 16 13:02:57 2014 -0700 compiles Ok for Windows Phone 8 commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd Author: Ricardo Quesada Date: Fri May 16 12:25:31 2014 -0700 fixes for Windows Phone 8 commit 418197649efc93032aee0adc205e502101cdb53d Author: Ricardo Quesada Date: Fri May 16 11:15:13 2014 -0700 Compiles on Win32 commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33 Author: Ricardo Quesada Date: Fri May 16 10:08:31 2014 -0700 Compiles on linux! commit 118896521e5b335a5257090b6863f1fb2a2002fe Author: Ricardo Quesada Date: Fri May 16 09:30:42 2014 -0700 moves cocos/2d/platform -> cocos/platform commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0 Merge: bd68ec2 511295e Author: Ricardo Quesada Date: Fri May 16 08:24:41 2014 -0700 Merge remote-tracking branch 'cocos2d/v3' into files commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56 Author: Ricardo Quesada Date: Thu May 15 19:36:23 2014 -0700 files in the correct directory --- CMakeLists.txt | 4 +- build/android-build.py | 2 +- build/cocos2d_libs.xcodeproj/project.pbxproj | 2513 ++++++++--------- build/cocos2d_tests.xcodeproj/project.pbxproj | 32 +- cocos/2d/CCActionGrid.cpp | 4 +- cocos/2d/CCActionInstant.cpp | 2 +- cocos/2d/CCActionInterval.h | 5 +- cocos/2d/CCActionManager.cpp | 4 +- cocos/2d/CCAnimation.cpp | 6 +- cocos/2d/CCAnimationCache.cpp | 2 +- cocos/2d/CCAtlasNode.cpp | 4 +- cocos/2d/CCAtlasNode.h | 2 +- cocos/2d/CCComponent.cpp | 2 +- cocos/2d/CCComponent.h | 2 +- cocos/2d/CCFont.cpp | 4 +- cocos/2d/CCFontAtlas.cpp | 2 +- cocos/2d/CCFontCharMap.cpp | 6 +- cocos/2d/CCFontFNT.cpp | 11 +- cocos/2d/CCFontFreeType.cpp | 9 +- cocos/2d/CCGrabber.cpp | 2 +- cocos/2d/CCGrid.cpp | 2 +- cocos/2d/CCGrid.h | 2 +- cocos/2d/CCLabel.cpp | 4 +- cocos/2d/CCLabelAtlas.cpp | 10 +- cocos/2d/CCLabelTextFormatter.cpp | 5 +- cocos/2d/CCLabelTextFormatter.h | 2 + cocos/2d/CCLayer.cpp | 4 +- cocos/2d/CCLayer.h | 2 +- cocos/2d/CCMenuItem.cpp | 2 +- cocos/2d/CCMenuItem.h | 2 +- cocos/2d/CCMotionStreak.cpp | 9 +- cocos/2d/CCMotionStreak.h | 4 +- cocos/2d/CCNode.cpp | 4 +- cocos/2d/CCNode.h | 4 +- cocos/2d/CCParallaxNode.cpp | 2 +- cocos/2d/CCParticleBatchNode.cpp | 6 +- cocos/2d/CCParticleBatchNode.h | 2 +- cocos/2d/CCParticleExamples.cpp | 9 +- cocos/2d/CCParticleSystem.cpp | 14 +- cocos/2d/CCParticleSystem.h | 2 +- cocos/2d/CCParticleSystemQuad.cpp | 2 +- cocos/2d/CCProgressTimer.cpp | 2 +- cocos/2d/CCRenderTexture.cpp | 26 +- cocos/2d/CCRenderTexture.h | 2 +- cocos/2d/CCSprite.cpp | 10 +- cocos/2d/CCSprite.h | 4 +- cocos/2d/CCSpriteBatchNode.cpp | 6 +- cocos/2d/CCSpriteBatchNode.h | 4 +- cocos/2d/CCSpriteFrame.cpp | 3 +- cocos/2d/CCSpriteFrame.h | 2 +- cocos/2d/CCSpriteFrameCache.cpp | 18 +- cocos/2d/CCSpriteFrameCache.h | 2 +- cocos/2d/CCTMXLayer.cpp | 8 +- cocos/2d/CCTMXLayer.h | 2 +- cocos/2d/CCTMXXMLParser.cpp | 2 +- cocos/2d/CCTMXXMLParser.h | 2 +- cocos/2d/CCTextFieldTTF.h | 2 +- cocos/2d/CCTileMapAtlas.cpp | 6 +- cocos/2d/CMakeLists.txt | 70 +- cocos/2d/cocos2d.vcxproj | 161 +- cocos/2d/cocos2d.vcxproj.filters | 1568 +++++----- cocos/2d/cocos2d_headers.props | 2 +- cocos/2d/cocos2d_winrt_headers.props | 2 +- cocos/2d/cocos2d_wp8.vcxproj | 246 +- cocos/2d/cocos2d_wp8.vcxproj.filters | 1675 ++++++----- cocos/2d/cocos2d_wp8_headers.props | 2 +- .../platform/android/java/project.properties | 15 - .../wp8-xaml/CopyTemplateFiles.vcxproj.user | 6 - cocos/Android.mk | 85 +- cocos/CMakeLists.txt | 3 +- cocos/audio/android/Android.mk | 6 +- cocos/base/CCConfiguration.cpp | 2 +- cocos/base/CCConsole.cpp | 4 +- cocos/base/CCData.cpp | 2 +- cocos/base/CCDirector.cpp | 18 +- cocos/base/CCEventListener.cpp | 2 +- cocos/{2d => base}/CCIMEDelegate.h | 0 cocos/{2d => base}/CCIMEDispatcher.cpp | 2 +- cocos/{2d => base}/CCIMEDispatcher.h | 2 +- cocos/base/CCPlatformConfig.h | 6 +- cocos/{2d => base}/CCProtocols.h | 11 +- cocos/base/CCRef.cpp | 2 +- cocos/base/CCRef.h | 6 +- cocos/base/CCScheduler.cpp | 6 +- cocos/base/CCScheduler.h | 2 +- cocos/{2d => base}/CCScriptSupport.cpp | 2 +- cocos/{2d => base}/CCScriptSupport.h | 2 +- cocos/{2d => base}/CCUserDefault.cpp | 6 +- cocos/{2d => base}/CCUserDefault.h | 0 cocos/{2d => base}/CCUserDefault.mm | 0 cocos/{2d => base}/CCUserDefaultAndroid.cpp | 8 +- cocos/base/CMakeLists.txt | 26 +- cocos/{2d => base}/TGAlib.cpp | 2 +- cocos/{2d => base}/TGAlib.h | 0 cocos/base/ZipUtils.cpp | 2 +- cocos/base/ZipUtils.h | 2 +- cocos/{2d => base}/ccCArray.cpp | 2 +- cocos/{2d => base}/ccCArray.h | 0 cocos/{2d => base}/ccFPSImages.c | 2 +- cocos/{2d => base}/ccFPSImages.h | 6 +- cocos/base/ccMacros.h | 6 +- cocos/base/ccTypes.h | 7 +- cocos/{2d => base}/ccUTF8.cpp | 2 +- cocos/{2d => base}/ccUTF8.h | 0 cocos/{2d => base}/ccUtils.cpp | 3 +- cocos/{2d => base}/ccUtils.h | 0 cocos/{2d => base}/firePngData.h | 0 cocos/{2d => base}/uthash.h | 0 cocos/{2d => base}/utlist.h | 0 ...cocos2dx-Prefix.pch => cocos2d-prefix.pch} | 0 cocos/cocos2d.h | 114 +- cocos/deprecated/CCArray.cpp | 2 +- cocos/deprecated/CCArray.h | 2 +- cocos/deprecated/CCDictionary.cpp | 2 +- cocos/deprecated/CCDictionary.h | 2 +- cocos/deprecated/CCInteger.h | 2 +- cocos/deprecated/CCNotificationCenter.cpp | 8 +- cocos/deprecated/CCString.cpp | 2 +- .../editor-support/cocosbuilder/CCBReader.cpp | 4 +- .../cocostudio/CCDataReaderHelper.cpp | 2 +- .../cocostudio/CCInputDelegate.cpp | 2 +- cocos/editor-support/spine/CCSkeleton.h | 4 +- cocos/math/CCMath.h | 8 +- cocos/{2d => math}/CCVertex.cpp | 2 +- cocos/{2d => math}/CCVertex.h | 0 cocos/math/CMakeLists.txt | 19 +- cocos/math/{Matrix.cpp => Mat4.cpp} | 6 +- cocos/math/{Matrix.h => Mat4.h} | 6 +- cocos/math/{Matrix.inl => Mat4.inl} | 2 +- cocos/math/Quaternion.h | 4 +- cocos/math/{Vector2.cpp => Vec2.cpp} | 10 +- cocos/math/{Vector2.h => Vec2.h} | 2 +- cocos/math/{Vector2.inl => Vec2.inl} | 2 +- cocos/math/{Vector3.cpp => Vec3.cpp} | 4 +- cocos/math/{Vector3.h => Vec3.h} | 2 +- cocos/math/{Vector3.inl => Vec3.inl} | 4 +- cocos/math/{Vector4.cpp => Vec4.cpp} | 4 +- cocos/math/{Vector4.h => Vec4.h} | 2 +- cocos/math/{Vector4.inl => Vec4.inl} | 4 +- cocos/network/HttpClient.cpp | 2 +- .../{2d => }/platform/CCApplicationProtocol.h | 0 cocos/{2d => }/platform/CCCommon.h | 0 cocos/{2d => }/platform/CCDevice.h | 0 cocos/{2d => }/platform/CCFileUtils.cpp | 8 +- cocos/{2d => }/platform/CCFileUtils.h | 8 +- cocos/{2d => }/platform/CCGLViewProtocol.cpp | 3 +- cocos/{2d => }/platform/CCGLViewProtocol.h | 0 cocos/{2d => }/platform/CCImage.cpp | 10 +- cocos/{2d => }/platform/CCImage.h | 2 +- cocos/{2d => }/platform/CCSAXParser.cpp | 8 +- cocos/{2d => }/platform/CCSAXParser.h | 2 +- cocos/{2d => }/platform/CCThread.cpp | 2 +- cocos/{2d => }/platform/CCThread.h | 3 +- cocos/platform/CMakeLists.txt | 43 + cocos/{2d => }/platform/android/Android.mk | 0 .../platform/android/CCApplication.cpp | 0 .../{2d => }/platform/android/CCApplication.h | 4 +- cocos/{2d => }/platform/android/CCCommon.cpp | 2 +- cocos/{2d => }/platform/android/CCDevice.cpp | 4 +- .../platform/android/CCFileUtilsAndroid.cpp | 2 +- .../platform/android/CCFileUtilsAndroid.h | 2 +- cocos/{2d => }/platform/android/CCGL.h | 0 cocos/{2d => }/platform/android/CCGLView.cpp | 0 cocos/{2d => }/platform/android/CCGLView.h | 2 +- .../platform/android/CCPlatformDefine.h | 0 cocos/{2d => }/platform/android/CCStdC.h | 0 .../{2d => }/platform/android/java/.classpath | 0 cocos/{2d => }/platform/android/java/.project | 0 .../java/.settings/org.eclipse.jdt.core.prefs | 0 .../platform/android/java/AndroidManifest.xml | 0 .../platform/android/java/ant.properties | 0 .../{2d => }/platform/android/java/build.xml | 0 .../android/java/proguard-project.txt | 0 .../platform/android/java/res/.gitignore | 0 .../cocos2dx/lib/Cocos2dxAccelerometer.java | 0 .../org/cocos2dx/lib/Cocos2dxActivity.java | 0 .../src/org/cocos2dx/lib/Cocos2dxBitmap.java | 0 .../org/cocos2dx/lib/Cocos2dxETCLoader.java | 0 .../cocos2dx/lib/Cocos2dxEditBoxDialog.java | 0 .../org/cocos2dx/lib/Cocos2dxEditText.java | 0 .../cocos2dx/lib/Cocos2dxGLSurfaceView.java | 0 .../src/org/cocos2dx/lib/Cocos2dxHandler.java | 0 .../src/org/cocos2dx/lib/Cocos2dxHelper.java | 0 .../cocos2dx/lib/Cocos2dxLocalStorage.java | 0 .../cocos2dx/lib/Cocos2dxLuaJavaBridge.java | 0 .../src/org/cocos2dx/lib/Cocos2dxMusic.java | 0 .../org/cocos2dx/lib/Cocos2dxRenderer.java | 0 .../src/org/cocos2dx/lib/Cocos2dxSound.java | 0 .../cocos2dx/lib/Cocos2dxTextInputWraper.java | 0 .../org/cocos2dx/lib/Cocos2dxTypefaces.java | 0 .../org/cocos2dx/lib/Cocos2dxVideoHelper.java | 0 .../org/cocos2dx/lib/Cocos2dxVideoView.java | 0 .../platform/android/javaactivity.cpp | 21 +- .../{2d => }/platform/android/jni/DPIJni.cpp | 0 cocos/{2d => }/platform/android/jni/DPIJni.h | 0 .../{2d => }/platform/android/jni/IMEJni.cpp | 2 +- cocos/{2d => }/platform/android/jni/IMEJni.h | 0 ...org_cocos2dx_lib_Cocos2dxAccelerometer.cpp | 6 +- .../Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp | 2 +- .../Java_org_cocos2dx_lib_Cocos2dxBitmap.h | 0 .../Java_org_cocos2dx_lib_Cocos2dxHelper.cpp | 0 .../Java_org_cocos2dx_lib_Cocos2dxHelper.h | 0 ...Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp | 6 +- .../platform/android/jni/JniHelper.cpp | 0 .../{2d => }/platform/android/jni/JniHelper.h | 0 .../platform/android/jni/TouchesJni.cpp | 4 +- .../platform/apple/CCFileUtilsApple.h | 0 .../platform/apple/CCFileUtilsApple.mm | 0 cocos/{2d => }/platform/apple/CCLock.cpp | 0 cocos/{2d => }/platform/apple/CCLock.h | 0 cocos/{2d => }/platform/apple/CCThread.mm | 0 cocos/{2d => }/platform/desktop/CCGLView.cpp | 2 +- cocos/{2d => }/platform/desktop/CCGLView.h | 4 +- cocos/{2d => }/platform/ios/CCApplication.h | 4 +- cocos/{2d => }/platform/ios/CCApplication.mm | 0 cocos/{2d => }/platform/ios/CCCommon.mm | 2 +- cocos/{2d => }/platform/ios/CCDevice.mm | 0 .../{2d => }/platform/ios/CCDirectorCaller.h | 7 + .../{2d => }/platform/ios/CCDirectorCaller.mm | 7 + cocos/{2d => }/platform/ios/CCEAGLView.h | 0 cocos/{2d => }/platform/ios/CCEAGLView.mm | 0 cocos/{2d => }/platform/ios/CCES2Renderer.h | 0 cocos/{2d => }/platform/ios/CCES2Renderer.m | 0 cocos/{2d => }/platform/ios/CCESRenderer.h | 0 cocos/{2d => }/platform/ios/CCGL.h | 0 cocos/{2d => }/platform/ios/CCGLView.h | 4 +- cocos/{2d => }/platform/ios/CCGLView.mm | 1 - cocos/{2d => }/platform/ios/CCImage.mm | 6 +- .../{2d => }/platform/ios/CCPlatformDefine.h | 0 cocos/{2d => }/platform/ios/CCStdC.h | 0 cocos/{2d => }/platform/ios/OpenGL_Internal.h | 0 .../{2d => }/platform/linux/CCApplication.cpp | 2 +- cocos/{2d => }/platform/linux/CCApplication.h | 4 +- cocos/{2d => }/platform/linux/CCCommon.cpp | 2 +- cocos/{2d => }/platform/linux/CCDevice.cpp | 4 +- .../platform/linux/CCFileUtilsLinux.cpp | 2 +- .../platform/linux/CCFileUtilsLinux.h | 2 +- cocos/{2d => }/platform/linux/CCGL.h | 0 .../platform/linux/CCPlatformDefine.h | 0 cocos/{2d => }/platform/linux/CCStdC.cpp | 0 cocos/{2d => }/platform/linux/CCStdC.h | 0 cocos/{2d => }/platform/mac/CCApplication.h | 4 +- cocos/{2d => }/platform/mac/CCApplication.mm | 5 +- cocos/{2d => }/platform/mac/CCCommon.mm | 2 +- cocos/{2d => }/platform/mac/CCDevice.mm | 2 +- cocos/{2d => }/platform/mac/CCGL.h | 0 .../{2d => }/platform/mac/CCPlatformDefine.h | 0 cocos/{2d => }/platform/mac/CCStdC.h | 0 .../{2d => }/platform/win32/CCApplication.cpp | 2 +- cocos/{2d => }/platform/win32/CCApplication.h | 4 +- cocos/{2d => }/platform/win32/CCCommon.cpp | 2 +- cocos/{2d => }/platform/win32/CCDevice.cpp | 4 +- .../platform/win32/CCFileUtilsWin32.cpp | 2 +- .../platform/win32/CCFileUtilsWin32.h | 2 +- cocos/{2d => }/platform/win32/CCGL.h | 0 .../platform/win32/CCPlatformDefine.h | 0 cocos/{2d => }/platform/win32/CCStdC.cpp | 0 cocos/{2d => }/platform/win32/CCStdC.h | 0 cocos/{2d => }/platform/win32/compat/stdint.h | 0 .../{2d => }/platform/winrt/CCApplication.cpp | 2 +- cocos/{2d => }/platform/winrt/CCApplication.h | 2 +- cocos/{2d => }/platform/winrt/CCCommon.cpp | 0 cocos/{2d => }/platform/winrt/CCDevice.cpp | 2 +- .../platform/winrt/CCFileUtilsWinRT.cpp | 0 .../platform/winrt/CCFileUtilsWinRT.h | 7 +- .../platform/winrt/CCFreeTypeFont.cpp | 2 +- .../{2d => }/platform/winrt/CCFreeTypeFont.h | 0 cocos/{2d => }/platform/winrt/CCGL.h | 0 cocos/{2d => }/platform/winrt/CCGLView.cpp | 13 +- cocos/{2d => }/platform/winrt/CCGLView.h | 5 + cocos/{2d => }/platform/winrt/CCGL_Angle.h | 0 .../platform/winrt/CCPThreadWinRT.cpp | 8 +- .../{2d => }/platform/winrt/CCPThreadWinRT.h | 12 +- .../platform/winrt/CCPlatformDefine.h | 0 .../platform/winrt/CCPrecompiledShaders.cpp | 0 .../platform/winrt/CCPrecompiledShaders.h | 0 cocos/{2d => }/platform/winrt/CCStdC.cpp | 0 cocos/{2d => }/platform/winrt/CCStdC.h | 4 +- .../{2d => }/platform/winrt/CCWinRTUtils.cpp | 0 cocos/{2d => }/platform/winrt/CCWinRTUtils.h | 2 +- cocos/{2d => }/platform/winrt/DirectXBase.cpp | 6 +- cocos/{2d => }/platform/winrt/DirectXBase.h | 5 + cocos/{2d => }/platform/winrt/DirectXHelper.h | 6 + cocos/{2d => }/platform/winrt/InputEvent.cpp | 2 +- cocos/{2d => }/platform/winrt/InputEvent.h | 0 .../{2d => }/platform/winrt/InputEventTypes.h | 0 .../platform/winrt/inet_ntop_winrt.cpp | 0 .../{2d => }/platform/winrt/inet_ntop_winrt.h | 0 cocos/{2d => }/platform/winrt/pch.cpp | 0 cocos/{2d => }/platform/winrt/pch.h | 0 cocos/{2d => }/platform/winrt/sha1.cpp | 0 cocos/{2d => }/platform/winrt/sha1.h | 0 .../winrt/shaders/precompiledshaders.h | 0 .../wp8-xaml/CopyTemplateFiles.vcxproj | 0 .../CopyTemplateFiles.vcxproj.filters | 0 .../platform/wp8-xaml/cpp/Cocos2dRenderer.cpp | 0 .../platform/wp8-xaml/cpp/Cocos2dRenderer.h | 0 .../wp8-xaml/cpp/Direct3DContentProvider.cpp | 0 .../wp8-xaml/cpp/Direct3DContentProvider.h | 0 .../platform/wp8-xaml/cpp/Direct3DInterop.cpp | 0 .../platform/wp8-xaml/cpp/Direct3DInterop.h | 0 .../platform/wp8-xaml/cpp/DirectXBase.cpp | 0 .../platform/wp8-xaml/cpp/DirectXBase.h | 0 .../platform/wp8-xaml/cpp/DirectXHelper.h | 0 .../platform/wp8-xaml/cpp/EditBoxEvent.cpp | 0 .../platform/wp8-xaml/cpp/EditBoxEvent.h | 0 .../{2d => }/platform/wp8-xaml/xaml/App.xaml | 0 .../platform/wp8-xaml/xaml/App.xaml.cs | 0 .../platform/wp8-xaml/xaml/EditBox.xaml | 0 .../platform/wp8-xaml/xaml/EditBox.xaml.cs | 0 .../platform/wp8-xaml/xaml/MainPage.xaml | 0 .../platform/wp8-xaml/xaml/MainPage.xaml.cs | 0 cocos/{2d => }/platform/wp8/CCGLView.cpp | 14 +- cocos/{2d => }/platform/wp8/CCGLView.h | 8 +- cocos/{2d => }/platform/wp8/Direct3DBase.cpp | 20 +- cocos/{2d => }/platform/wp8/Direct3DBase.h | 11 +- cocos/{2d => }/platform/wp8/DirectXBase.cpp | 0 cocos/{2d => }/platform/wp8/DirectXBase.h | 0 .../platform/wp8/shaders/precompiledshaders.h | 0 cocos/renderer/CCBatchCommand.cpp | 4 +- cocos/renderer/CCBatchCommand.h | 2 +- cocos/renderer/CCCustomCommand.h | 4 +- cocos/renderer/CCGLProgram.cpp | 16 +- cocos/renderer/CCGLProgram.h | 3 +- cocos/renderer/CCGLProgramCache.cpp | 1 + cocos/renderer/CCGLProgramCache.h | 4 +- cocos/renderer/CCGLProgramState.cpp | 3 +- cocos/renderer/CCGLProgramState.h | 10 +- cocos/renderer/CCGLProgramStateCache.cpp | 1 + cocos/renderer/CCGLProgramStateCache.h | 7 +- cocos/renderer/CCGroupCommand.h | 4 +- cocos/renderer/CCQuadCommand.cpp | 1 + cocos/renderer/CCRenderCommand.cpp | 2 +- cocos/renderer/CCRenderCommand.h | 3 +- cocos/renderer/CCRenderCommandPool.h | 2 + cocos/renderer/CCRenderer.h | 9 +- cocos/{2d => renderer}/CCTexture2D.cpp | 11 +- cocos/{2d => renderer}/CCTexture2D.h | 0 cocos/{2d => renderer}/CCTextureAtlas.cpp | 25 +- cocos/{2d => renderer}/CCTextureAtlas.h | 3 +- cocos/{2d => renderer}/CCTextureCache.cpp | 12 +- cocos/{2d => renderer}/CCTextureCache.h | 6 +- cocos/renderer/CMakeLists.txt | 27 +- cocos/renderer/ccGLStateCache.cpp | 1 + .../lua-bindings/manual/CCLuaEngine.h | 2 +- .../platform/android/CCLuaJavaBridge.cpp | 2 +- .../project.pbxproj | 8 +- extensions/GUI/CCEditBox/CCEditBox.h | 2 +- extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp | 4 +- extensions/GUI/CCScrollView/CCScrollView.cpp | 2 +- .../GUI/CCScrollView/CCTableViewCell.cpp | 2 +- .../proj.android/jni/hellocpp/main.cpp | 2 +- .../proj.android/project.properties | 2 +- .../proj.android/jni/hellolua/main.cpp | 2 +- .../proj.android/project.properties | 2 +- .../runtime-src/proj.android/jni/lua/main.cpp | 2 +- .../proj.android/project.properties | 2 +- .../cpp-empty-test/cpp-empty-test.csproj | 43 +- .../cpp-empty-testComponent.vcxproj | 22 +- .../cpp-empty-testComponent.vcxproj.filters | 22 +- .../cpp-empty-test/proj.android/jni/main.cpp | 2 +- .../proj.android/project.properties | 2 +- tests/cpp-tests/proj.android/jni/main.cpp | 2 +- .../cpp-tests/proj.android/project.properties | 2 +- .../proj.wp8-xaml/cpp-tests/cpp-tests.csproj | 43 +- .../cpp-testsComponent.vcxproj | 24 +- .../cpp-testsComponent.vcxproj.filters | 28 +- .../project/Classes/AppDelegate.cpp | 2 +- .../project/proj.android/jni/main.cpp | 2 +- .../project/proj.android/project.properties | 2 +- .../project/proj.android/jni/main.cpp | 2 +- .../project/proj.android/project.properties | 2 +- 372 files changed, 3794 insertions(+), 3985 deletions(-) delete mode 100644 cocos/2d/platform/android/java/project.properties delete mode 100644 cocos/2d/platform/wp8-xaml/CopyTemplateFiles.vcxproj.user rename cocos/{2d => base}/CCIMEDelegate.h (100%) rename cocos/{2d => base}/CCIMEDispatcher.cpp (99%) rename cocos/{2d => base}/CCIMEDispatcher.h (99%) rename cocos/{2d => base}/CCProtocols.h (98%) rename cocos/{2d => base}/CCScriptSupport.cpp (99%) rename cocos/{2d => base}/CCScriptSupport.h (99%) rename cocos/{2d => base}/CCUserDefault.cpp (99%) rename cocos/{2d => base}/CCUserDefault.h (100%) rename cocos/{2d => base}/CCUserDefault.mm (100%) rename cocos/{2d => base}/CCUserDefaultAndroid.cpp (98%) rename cocos/{2d => base}/TGAlib.cpp (99%) rename cocos/{2d => base}/TGAlib.h (100%) rename cocos/{2d => base}/ccCArray.cpp (99%) rename cocos/{2d => base}/ccCArray.h (100%) rename cocos/{2d => base}/ccFPSImages.c (99%) rename cocos/{2d => base}/ccFPSImages.h (93%) rename cocos/{2d => base}/ccUTF8.cpp (99%) rename cocos/{2d => base}/ccUTF8.h (100%) rename cocos/{2d => base}/ccUtils.cpp (98%) rename cocos/{2d => base}/ccUtils.h (100%) rename cocos/{2d => base}/firePngData.h (100%) rename cocos/{2d => base}/uthash.h (100%) rename cocos/{2d => base}/utlist.h (100%) rename cocos/{2d/cocos2dx-Prefix.pch => cocos2d-prefix.pch} (100%) rename cocos/{2d => math}/CCVertex.cpp (99%) rename cocos/{2d => math}/CCVertex.h (100%) rename cocos/math/{Matrix.cpp => Mat4.cpp} (99%) rename cocos/math/{Matrix.h => Mat4.h} (99%) rename cocos/math/{Matrix.inl => Mat4.inl} (98%) rename cocos/math/{Vector2.cpp => Vec2.cpp} (98%) rename cocos/math/{Vector2.h => Vec2.h} (99%) rename cocos/math/{Vector2.inl => Vec2.inl} (98%) rename cocos/math/{Vector3.cpp => Vec3.cpp} (99%) rename cocos/math/{Vector3.h => Vec3.h} (99%) rename cocos/math/{Vector3.inl => Vec3.inl} (97%) rename cocos/math/{Vector4.cpp => Vec4.cpp} (99%) rename cocos/math/{Vector4.h => Vec4.h} (99%) rename cocos/math/{Vector4.inl => Vec4.inl} (97%) rename cocos/{2d => }/platform/CCApplicationProtocol.h (100%) rename cocos/{2d => }/platform/CCCommon.h (100%) rename cocos/{2d => }/platform/CCDevice.h (100%) rename cocos/{2d => }/platform/CCFileUtils.cpp (99%) rename cocos/{2d => }/platform/CCFileUtils.h (100%) rename cocos/{2d => }/platform/CCGLViewProtocol.cpp (99%) rename cocos/{2d => }/platform/CCGLViewProtocol.h (100%) rename cocos/{2d => }/platform/CCImage.cpp (99%) rename cocos/{2d => }/platform/CCImage.h (99%) rename cocos/{2d => }/platform/CCSAXParser.cpp (98%) rename cocos/{2d => }/platform/CCSAXParser.h (98%) rename cocos/{2d => }/platform/CCThread.cpp (98%) rename cocos/{2d => }/platform/CCThread.h (98%) create mode 100644 cocos/platform/CMakeLists.txt rename cocos/{2d => }/platform/android/Android.mk (100%) rename cocos/{2d => }/platform/android/CCApplication.cpp (100%) rename cocos/{2d => }/platform/android/CCApplication.h (97%) rename cocos/{2d => }/platform/android/CCCommon.cpp (98%) rename cocos/{2d => }/platform/android/CCDevice.cpp (99%) rename cocos/{2d => }/platform/android/CCFileUtilsAndroid.cpp (99%) rename cocos/{2d => }/platform/android/CCFileUtilsAndroid.h (98%) rename cocos/{2d => }/platform/android/CCGL.h (100%) rename cocos/{2d => }/platform/android/CCGLView.cpp (100%) rename cocos/{2d => }/platform/android/CCGLView.h (98%) rename cocos/{2d => }/platform/android/CCPlatformDefine.h (100%) rename cocos/{2d => }/platform/android/CCStdC.h (100%) rename cocos/{2d => }/platform/android/java/.classpath (100%) rename cocos/{2d => }/platform/android/java/.project (100%) rename cocos/{2d => }/platform/android/java/.settings/org.eclipse.jdt.core.prefs (100%) rename cocos/{2d => }/platform/android/java/AndroidManifest.xml (100%) rename cocos/{2d => }/platform/android/java/ant.properties (100%) rename cocos/{2d => }/platform/android/java/build.xml (100%) rename cocos/{2d => }/platform/android/java/proguard-project.txt (100%) rename cocos/{2d => }/platform/android/java/res/.gitignore (100%) rename cocos/{2d => }/platform/android/java/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java (100%) rename cocos/{2d => }/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java (100%) rename cocos/{2d => }/platform/android/java/src/org/cocos2dx/lib/Cocos2dxBitmap.java (100%) rename cocos/{2d => }/platform/android/java/src/org/cocos2dx/lib/Cocos2dxETCLoader.java (100%) rename cocos/{2d => }/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditBoxDialog.java (100%) rename cocos/{2d => }/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditText.java (100%) rename cocos/{2d => }/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java (100%) rename cocos/{2d => }/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHandler.java (100%) rename cocos/{2d => }/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java (100%) rename cocos/{2d => }/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLocalStorage.java (100%) rename cocos/{2d => }/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLuaJavaBridge.java (100%) rename cocos/{2d => }/platform/android/java/src/org/cocos2dx/lib/Cocos2dxMusic.java (100%) rename cocos/{2d => }/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java (100%) rename cocos/{2d => }/platform/android/java/src/org/cocos2dx/lib/Cocos2dxSound.java (100%) rename cocos/{2d => }/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTextInputWraper.java (100%) rename cocos/{2d => }/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTypefaces.java (100%) rename cocos/{2d => }/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoHelper.java (100%) rename cocos/{2d => }/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java (100%) rename cocos/{2d => }/platform/android/javaactivity.cpp (89%) rename cocos/{2d => }/platform/android/jni/DPIJni.cpp (100%) rename cocos/{2d => }/platform/android/jni/DPIJni.h (100%) rename cocos/{2d => }/platform/android/jni/IMEJni.cpp (98%) rename cocos/{2d => }/platform/android/jni/IMEJni.h (100%) rename cocos/{2d => }/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp (86%) rename cocos/{2d => }/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp (98%) rename cocos/{2d => }/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.h (100%) rename cocos/{2d => }/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp (100%) rename cocos/{2d => }/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h (100%) rename cocos/{2d => }/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp (94%) rename cocos/{2d => }/platform/android/jni/JniHelper.cpp (100%) rename cocos/{2d => }/platform/android/jni/JniHelper.h (100%) rename cocos/{2d => }/platform/android/jni/TouchesJni.cpp (98%) rename cocos/{2d => }/platform/apple/CCFileUtilsApple.h (100%) rename cocos/{2d => }/platform/apple/CCFileUtilsApple.mm (100%) rename cocos/{2d => }/platform/apple/CCLock.cpp (100%) rename cocos/{2d => }/platform/apple/CCLock.h (100%) rename cocos/{2d => }/platform/apple/CCThread.mm (100%) rename cocos/{2d => }/platform/desktop/CCGLView.cpp (99%) rename cocos/{2d => }/platform/desktop/CCGLView.h (98%) rename cocos/{2d => }/platform/ios/CCApplication.h (97%) rename cocos/{2d => }/platform/ios/CCApplication.mm (100%) rename cocos/{2d => }/platform/ios/CCCommon.mm (97%) rename cocos/{2d => }/platform/ios/CCDevice.mm (100%) rename cocos/{2d => }/platform/ios/CCDirectorCaller.h (92%) rename cocos/{2d => }/platform/ios/CCDirectorCaller.mm (96%) rename cocos/{2d => }/platform/ios/CCEAGLView.h (100%) rename cocos/{2d => }/platform/ios/CCEAGLView.mm (100%) rename cocos/{2d => }/platform/ios/CCES2Renderer.h (100%) rename cocos/{2d => }/platform/ios/CCES2Renderer.m (100%) rename cocos/{2d => }/platform/ios/CCESRenderer.h (100%) rename cocos/{2d => }/platform/ios/CCGL.h (100%) rename cocos/{2d => }/platform/ios/CCGLView.h (97%) rename cocos/{2d => }/platform/ios/CCGLView.mm (99%) rename cocos/{2d => }/platform/ios/CCImage.mm (98%) rename cocos/{2d => }/platform/ios/CCPlatformDefine.h (100%) rename cocos/{2d => }/platform/ios/CCStdC.h (100%) rename cocos/{2d => }/platform/ios/OpenGL_Internal.h (100%) rename cocos/{2d => }/platform/linux/CCApplication.cpp (99%) rename cocos/{2d => }/platform/linux/CCApplication.h (97%) rename cocos/{2d => }/platform/linux/CCCommon.cpp (97%) rename cocos/{2d => }/platform/linux/CCDevice.cpp (99%) rename cocos/{2d => }/platform/linux/CCFileUtilsLinux.cpp (99%) rename cocos/{2d => }/platform/linux/CCFileUtilsLinux.h (98%) rename cocos/{2d => }/platform/linux/CCGL.h (100%) rename cocos/{2d => }/platform/linux/CCPlatformDefine.h (100%) rename cocos/{2d => }/platform/linux/CCStdC.cpp (100%) rename cocos/{2d => }/platform/linux/CCStdC.h (100%) rename cocos/{2d => }/platform/mac/CCApplication.h (97%) rename cocos/{2d => }/platform/mac/CCApplication.mm (99%) rename cocos/{2d => }/platform/mac/CCCommon.mm (98%) rename cocos/{2d => }/platform/mac/CCDevice.mm (99%) rename cocos/{2d => }/platform/mac/CCGL.h (100%) rename cocos/{2d => }/platform/mac/CCPlatformDefine.h (100%) rename cocos/{2d => }/platform/mac/CCStdC.h (100%) rename cocos/{2d => }/platform/win32/CCApplication.cpp (99%) rename cocos/{2d => }/platform/win32/CCApplication.h (97%) rename cocos/{2d => }/platform/win32/CCCommon.cpp (98%) rename cocos/{2d => }/platform/win32/CCDevice.cpp (99%) rename cocos/{2d => }/platform/win32/CCFileUtilsWin32.cpp (99%) rename cocos/{2d => }/platform/win32/CCFileUtilsWin32.h (99%) rename cocos/{2d => }/platform/win32/CCGL.h (100%) rename cocos/{2d => }/platform/win32/CCPlatformDefine.h (100%) rename cocos/{2d => }/platform/win32/CCStdC.cpp (100%) rename cocos/{2d => }/platform/win32/CCStdC.h (100%) rename cocos/{2d => }/platform/win32/compat/stdint.h (100%) rename cocos/{2d => }/platform/winrt/CCApplication.cpp (99%) rename cocos/{2d => }/platform/winrt/CCApplication.h (98%) rename cocos/{2d => }/platform/winrt/CCCommon.cpp (100%) rename cocos/{2d => }/platform/winrt/CCDevice.cpp (99%) rename cocos/{2d => }/platform/winrt/CCFileUtilsWinRT.cpp (100%) rename cocos/{2d => }/platform/winrt/CCFileUtilsWinRT.h (97%) rename cocos/{2d => }/platform/winrt/CCFreeTypeFont.cpp (99%) rename cocos/{2d => }/platform/winrt/CCFreeTypeFont.h (100%) rename cocos/{2d => }/platform/winrt/CCGL.h (100%) rename cocos/{2d => }/platform/winrt/CCGLView.cpp (98%) rename cocos/{2d => }/platform/winrt/CCGLView.h (97%) rename cocos/{2d => }/platform/winrt/CCGL_Angle.h (100%) rename cocos/{2d => }/platform/winrt/CCPThreadWinRT.cpp (92%) rename cocos/{2d => }/platform/winrt/CCPThreadWinRT.h (91%) rename cocos/{2d => }/platform/winrt/CCPlatformDefine.h (100%) rename cocos/{2d => }/platform/winrt/CCPrecompiledShaders.cpp (100%) rename cocos/{2d => }/platform/winrt/CCPrecompiledShaders.h (100%) rename cocos/{2d => }/platform/winrt/CCStdC.cpp (100%) rename cocos/{2d => }/platform/winrt/CCStdC.h (97%) rename cocos/{2d => }/platform/winrt/CCWinRTUtils.cpp (100%) rename cocos/{2d => }/platform/winrt/CCWinRTUtils.h (98%) rename cocos/{2d => }/platform/winrt/DirectXBase.cpp (99%) rename cocos/{2d => }/platform/winrt/DirectXBase.h (96%) rename cocos/{2d => }/platform/winrt/DirectXHelper.h (92%) rename cocos/{2d => }/platform/winrt/InputEvent.cpp (98%) rename cocos/{2d => }/platform/winrt/InputEvent.h (100%) rename cocos/{2d => }/platform/winrt/InputEventTypes.h (100%) rename cocos/{2d => }/platform/winrt/inet_ntop_winrt.cpp (100%) rename cocos/{2d => }/platform/winrt/inet_ntop_winrt.h (100%) rename cocos/{2d => }/platform/winrt/pch.cpp (100%) rename cocos/{2d => }/platform/winrt/pch.h (100%) rename cocos/{2d => }/platform/winrt/sha1.cpp (100%) rename cocos/{2d => }/platform/winrt/sha1.h (100%) rename cocos/{2d => }/platform/winrt/shaders/precompiledshaders.h (100%) rename cocos/{2d => }/platform/wp8-xaml/CopyTemplateFiles.vcxproj (100%) rename cocos/{2d => }/platform/wp8-xaml/CopyTemplateFiles.vcxproj.filters (100%) rename cocos/{2d => }/platform/wp8-xaml/cpp/Cocos2dRenderer.cpp (100%) rename cocos/{2d => }/platform/wp8-xaml/cpp/Cocos2dRenderer.h (100%) rename cocos/{2d => }/platform/wp8-xaml/cpp/Direct3DContentProvider.cpp (100%) rename cocos/{2d => }/platform/wp8-xaml/cpp/Direct3DContentProvider.h (100%) rename cocos/{2d => }/platform/wp8-xaml/cpp/Direct3DInterop.cpp (100%) rename cocos/{2d => }/platform/wp8-xaml/cpp/Direct3DInterop.h (100%) rename cocos/{2d => }/platform/wp8-xaml/cpp/DirectXBase.cpp (100%) rename cocos/{2d => }/platform/wp8-xaml/cpp/DirectXBase.h (100%) rename cocos/{2d => }/platform/wp8-xaml/cpp/DirectXHelper.h (100%) rename cocos/{2d => }/platform/wp8-xaml/cpp/EditBoxEvent.cpp (100%) rename cocos/{2d => }/platform/wp8-xaml/cpp/EditBoxEvent.h (100%) rename cocos/{2d => }/platform/wp8-xaml/xaml/App.xaml (100%) rename cocos/{2d => }/platform/wp8-xaml/xaml/App.xaml.cs (100%) rename cocos/{2d => }/platform/wp8-xaml/xaml/EditBox.xaml (100%) rename cocos/{2d => }/platform/wp8-xaml/xaml/EditBox.xaml.cs (100%) rename cocos/{2d => }/platform/wp8-xaml/xaml/MainPage.xaml (100%) rename cocos/{2d => }/platform/wp8-xaml/xaml/MainPage.xaml.cs (100%) rename cocos/{2d => }/platform/wp8/CCGLView.cpp (98%) rename cocos/{2d => }/platform/wp8/CCGLView.h (96%) rename cocos/{2d => }/platform/wp8/Direct3DBase.cpp (95%) rename cocos/{2d => }/platform/wp8/Direct3DBase.h (89%) rename cocos/{2d => }/platform/wp8/DirectXBase.cpp (100%) rename cocos/{2d => }/platform/wp8/DirectXBase.h (100%) rename cocos/{2d => }/platform/wp8/shaders/precompiledshaders.h (100%) rename cocos/{2d => renderer}/CCTexture2D.cpp (99%) rename cocos/{2d => renderer}/CCTexture2D.h (100%) rename cocos/{2d => renderer}/CCTextureAtlas.cpp (99%) rename cocos/{2d => renderer}/CCTextureAtlas.h (99%) rename cocos/{2d => renderer}/CCTextureCache.cpp (99%) rename cocos/{2d => renderer}/CCTextureCache.h (98%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 20e616e368..2a3663eba4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,6 +130,8 @@ endif() include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cocos + ${CMAKE_CURRENT_SOURCE_DIR}/cocos/platform/desktop + ${CMAKE_CURRENT_SOURCE_DIR}/cocos/platform/${PLATFORM_FOLDER} ${CMAKE_CURRENT_SOURCE_DIR}/cocos/audio/include ${CMAKE_CURRENT_SOURCE_DIR}/cocos/editor-support ${CMAKE_CURRENT_SOURCE_DIR}/cocos/scripting/lua-bindings/auto @@ -140,8 +142,6 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/external/unzip ${CMAKE_CURRENT_SOURCE_DIR}/external/edtaa3func ${CMAKE_CURRENT_SOURCE_DIR}/external/chipmunk/include/chipmunk - ${CMAKE_CURRENT_SOURCE_DIR}/cocos/2d/platform/desktop - ${CMAKE_CURRENT_SOURCE_DIR}/cocos/2d/platform/${PLATFORM_FOLDER} ${CMAKE_CURRENT_SOURCE_DIR}/external/jpeg/include/${PLATFORM_FOLDER} ${CMAKE_CURRENT_SOURCE_DIR}/external/png/include/${PLATFORM_FOLDER} ${CMAKE_CURRENT_SOURCE_DIR}/external/tiff/include/${PLATFORM_FOLDER} diff --git a/build/android-build.py b/build/android-build.py index ebef60cbe5..7dcd4a6872 100755 --- a/build/android-build.py +++ b/build/android-build.py @@ -116,7 +116,7 @@ def do_build(cocos_root, ndk_root, app_android_root, ndk_build_param,sdk_root,an raise Exception("Build dynamic library for project [ " + app_android_root + " ] fails!") elif android_platform is not None: sdk_tool_path = os.path.join(sdk_root, "tools/android") - cocoslib_path = os.path.join(cocos_root, "cocos/2d/platform/android/java") + cocoslib_path = os.path.join(cocos_root, "cocos/platform/android/java") command = '%s update lib-project -t %s -p %s' % (sdk_tool_path,android_platform,cocoslib_path) if os.system(command) != 0: raise Exception("update cocos lib-project [ " + cocoslib_path + " ] fails!") diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj index b7b9739561..cb9b553f43 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj @@ -92,9 +92,6 @@ 1A087AE91860400400196EF5 /* edtaa3func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A087AE61860400400196EF5 /* edtaa3func.cpp */; }; 1A087AEA1860400400196EF5 /* edtaa3func.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A087AE71860400400196EF5 /* edtaa3func.h */; }; 1A087AEB1860400400196EF5 /* edtaa3func.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A087AE71860400400196EF5 /* edtaa3func.h */; }; - 1A0DB7321823827C0025743D /* CCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0DB7301823827C0025743D /* CCGL.h */; }; - 1A0DB7331823827C0025743D /* CCEAGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0DB7311823827C0025743D /* CCEAGLView.h */; }; - 1A0DB7381823828F0025743D /* CCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0DB7351823828F0025743D /* CCGL.h */; }; 1A12775A18DFCC4F0005F345 /* CCTweenFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 2986667918B1B079000E39CA /* CCTweenFunction.h */; }; 1A12775B18DFCC540005F345 /* CCTweenFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 2986667918B1B079000E39CA /* CCTweenFunction.h */; }; 1A12775C18DFCC590005F345 /* CCTweenFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2986667818B1B079000E39CA /* CCTweenFunction.cpp */; }; @@ -278,10 +275,6 @@ 1A57022E180BCC1A0088DEC7 /* CCParticleSystemQuad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A57021F180BCC1A0088DEC7 /* CCParticleSystemQuad.cpp */; }; 1A57022F180BCC1A0088DEC7 /* CCParticleSystemQuad.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570220180BCC1A0088DEC7 /* CCParticleSystemQuad.h */; }; 1A570230180BCC1A0088DEC7 /* CCParticleSystemQuad.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570220180BCC1A0088DEC7 /* CCParticleSystemQuad.h */; }; - 1A570234180BCC4D0088DEC7 /* CCScriptSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570232180BCC4D0088DEC7 /* CCScriptSupport.cpp */; }; - 1A570235180BCC4D0088DEC7 /* CCScriptSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570232180BCC4D0088DEC7 /* CCScriptSupport.cpp */; }; - 1A570236180BCC4D0088DEC7 /* CCScriptSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570233180BCC4D0088DEC7 /* CCScriptSupport.h */; }; - 1A570237180BCC4D0088DEC7 /* CCScriptSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570233180BCC4D0088DEC7 /* CCScriptSupport.h */; }; 1A57027E180BCC900088DEC7 /* CCSprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570276180BCC900088DEC7 /* CCSprite.cpp */; }; 1A57027F180BCC900088DEC7 /* CCSprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570276180BCC900088DEC7 /* CCSprite.cpp */; }; 1A570280180BCC900088DEC7 /* CCSprite.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570277180BCC900088DEC7 /* CCSprite.h */; }; @@ -306,38 +299,10 @@ 1A570297180BCCAB0088DEC7 /* CCAnimationCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570290180BCCAB0088DEC7 /* CCAnimationCache.cpp */; }; 1A570298180BCCAB0088DEC7 /* CCAnimationCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570291180BCCAB0088DEC7 /* CCAnimationCache.h */; }; 1A570299180BCCAB0088DEC7 /* CCAnimationCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570291180BCCAB0088DEC7 /* CCAnimationCache.h */; }; - 1A5702AF180BCDBC0088DEC7 /* ccUTF8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702AD180BCDBC0088DEC7 /* ccUTF8.cpp */; }; - 1A5702B0180BCDBC0088DEC7 /* ccUTF8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702AD180BCDBC0088DEC7 /* ccUTF8.cpp */; }; - 1A5702B1180BCDBC0088DEC7 /* ccUTF8.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702AE180BCDBC0088DEC7 /* ccUTF8.h */; }; - 1A5702B2180BCDBC0088DEC7 /* ccUTF8.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702AE180BCDBC0088DEC7 /* ccUTF8.h */; }; - 1A5702B5180BCDF40088DEC7 /* CCVertex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702B3180BCDF40088DEC7 /* CCVertex.cpp */; }; - 1A5702B6180BCDF40088DEC7 /* CCVertex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702B3180BCDF40088DEC7 /* CCVertex.cpp */; }; - 1A5702B7180BCDF40088DEC7 /* CCVertex.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702B4180BCDF40088DEC7 /* CCVertex.h */; }; - 1A5702B8180BCDF40088DEC7 /* CCVertex.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702B4180BCDF40088DEC7 /* CCVertex.h */; }; - 1A5702BA180BCDFC0088DEC7 /* ccUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702B9180BCDFC0088DEC7 /* ccUtils.h */; }; - 1A5702BB180BCDFC0088DEC7 /* ccUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702B9180BCDFC0088DEC7 /* ccUtils.h */; }; - 1A5702C0180BCE2A0088DEC7 /* CCIMEDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702BD180BCE2A0088DEC7 /* CCIMEDelegate.h */; }; - 1A5702C1180BCE2A0088DEC7 /* CCIMEDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702BD180BCE2A0088DEC7 /* CCIMEDelegate.h */; }; - 1A5702C2180BCE2A0088DEC7 /* CCIMEDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702BE180BCE2A0088DEC7 /* CCIMEDispatcher.cpp */; }; - 1A5702C3180BCE2A0088DEC7 /* CCIMEDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702BE180BCE2A0088DEC7 /* CCIMEDispatcher.cpp */; }; - 1A5702C4180BCE2A0088DEC7 /* CCIMEDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702BF180BCE2A0088DEC7 /* CCIMEDispatcher.h */; }; - 1A5702C5180BCE2A0088DEC7 /* CCIMEDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702BF180BCE2A0088DEC7 /* CCIMEDispatcher.h */; }; 1A5702C8180BCE370088DEC7 /* CCTextFieldTTF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702C6180BCE370088DEC7 /* CCTextFieldTTF.cpp */; }; 1A5702C9180BCE370088DEC7 /* CCTextFieldTTF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702C6180BCE370088DEC7 /* CCTextFieldTTF.cpp */; }; 1A5702CA180BCE370088DEC7 /* CCTextFieldTTF.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702C7180BCE370088DEC7 /* CCTextFieldTTF.h */; }; 1A5702CB180BCE370088DEC7 /* CCTextFieldTTF.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702C7180BCE370088DEC7 /* CCTextFieldTTF.h */; }; - 1A5702D3180BCE570088DEC7 /* CCTexture2D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702CD180BCE560088DEC7 /* CCTexture2D.cpp */; }; - 1A5702D4180BCE570088DEC7 /* CCTexture2D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702CD180BCE560088DEC7 /* CCTexture2D.cpp */; }; - 1A5702D5180BCE570088DEC7 /* CCTexture2D.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702CE180BCE570088DEC7 /* CCTexture2D.h */; }; - 1A5702D6180BCE570088DEC7 /* CCTexture2D.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702CE180BCE570088DEC7 /* CCTexture2D.h */; }; - 1A5702D7180BCE570088DEC7 /* CCTextureAtlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702CF180BCE570088DEC7 /* CCTextureAtlas.cpp */; }; - 1A5702D8180BCE570088DEC7 /* CCTextureAtlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702CF180BCE570088DEC7 /* CCTextureAtlas.cpp */; }; - 1A5702D9180BCE570088DEC7 /* CCTextureAtlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702D0180BCE570088DEC7 /* CCTextureAtlas.h */; }; - 1A5702DA180BCE570088DEC7 /* CCTextureAtlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702D0180BCE570088DEC7 /* CCTextureAtlas.h */; }; - 1A5702DB180BCE570088DEC7 /* CCTextureCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702D1180BCE570088DEC7 /* CCTextureCache.cpp */; }; - 1A5702DC180BCE570088DEC7 /* CCTextureCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702D1180BCE570088DEC7 /* CCTextureCache.cpp */; }; - 1A5702DD180BCE570088DEC7 /* CCTextureCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702D2180BCE570088DEC7 /* CCTextureCache.h */; }; - 1A5702DE180BCE570088DEC7 /* CCTextureCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702D2180BCE570088DEC7 /* CCTextureCache.h */; }; 1A5702EA180BCE750088DEC7 /* CCTileMapAtlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702E0180BCE750088DEC7 /* CCTileMapAtlas.cpp */; }; 1A5702EB180BCE750088DEC7 /* CCTileMapAtlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702E0180BCE750088DEC7 /* CCTileMapAtlas.cpp */; }; 1A5702EC180BCE750088DEC7 /* CCTileMapAtlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702E1180BCE750088DEC7 /* CCTileMapAtlas.h */; }; @@ -362,8 +327,6 @@ 1A570301180BCE890088DEC7 /* CCParallaxNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5702FE180BCE890088DEC7 /* CCParallaxNode.cpp */; }; 1A570302180BCE890088DEC7 /* CCParallaxNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702FF180BCE890088DEC7 /* CCParallaxNode.h */; }; 1A570303180BCE890088DEC7 /* CCParallaxNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A5702FF180BCE890088DEC7 /* CCParallaxNode.h */; }; - 1A570305180BCED90088DEC7 /* ccUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570304180BCED90088DEC7 /* ccUtils.cpp */; }; - 1A570306180BCED90088DEC7 /* ccUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570304180BCED90088DEC7 /* ccUtils.cpp */; }; 1A57030C180BCF190088DEC7 /* CCComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570308180BCF190088DEC7 /* CCComponent.cpp */; }; 1A57030D180BCF190088DEC7 /* CCComponent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570308180BCF190088DEC7 /* CCComponent.cpp */; }; 1A57030E180BCF190088DEC7 /* CCComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570309180BCF190088DEC7 /* CCComponent.h */; }; @@ -372,26 +335,6 @@ 1A570311180BCF190088DEC7 /* CCComponentContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A57030A180BCF190088DEC7 /* CCComponentContainer.cpp */; }; 1A570312180BCF190088DEC7 /* CCComponentContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57030B180BCF190088DEC7 /* CCComponentContainer.h */; }; 1A570313180BCF190088DEC7 /* CCComponentContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57030B180BCF190088DEC7 /* CCComponentContainer.h */; }; - 1A570319180BCF430088DEC7 /* ccCArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570315180BCF430088DEC7 /* ccCArray.cpp */; }; - 1A57031A180BCF430088DEC7 /* ccCArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570315180BCF430088DEC7 /* ccCArray.cpp */; }; - 1A57031B180BCF430088DEC7 /* ccCArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570316180BCF430088DEC7 /* ccCArray.h */; }; - 1A57031C180BCF430088DEC7 /* ccCArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570316180BCF430088DEC7 /* ccCArray.h */; }; - 1A57031D180BCF430088DEC7 /* uthash.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570317180BCF430088DEC7 /* uthash.h */; }; - 1A57031E180BCF430088DEC7 /* uthash.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570317180BCF430088DEC7 /* uthash.h */; }; - 1A57031F180BCF430088DEC7 /* utlist.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570318180BCF430088DEC7 /* utlist.h */; }; - 1A570320180BCF430088DEC7 /* utlist.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570318180BCF430088DEC7 /* utlist.h */; }; - 1A570324180BCF660088DEC7 /* TGAlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570322180BCF660088DEC7 /* TGAlib.cpp */; }; - 1A570325180BCF660088DEC7 /* TGAlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570322180BCF660088DEC7 /* TGAlib.cpp */; }; - 1A570326180BCF660088DEC7 /* TGAlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570323180BCF660088DEC7 /* TGAlib.h */; }; - 1A570327180BCF660088DEC7 /* TGAlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A570323180BCF660088DEC7 /* TGAlib.h */; }; - 1A57032F180BCFD50088DEC7 /* CCUserDefault.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A57032B180BCFD50088DEC7 /* CCUserDefault.cpp */; }; - 1A570330180BCFD50088DEC7 /* CCUserDefault.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A57032B180BCFD50088DEC7 /* CCUserDefault.cpp */; }; - 1A570331180BCFD50088DEC7 /* CCUserDefault.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57032C180BCFD50088DEC7 /* CCUserDefault.h */; }; - 1A570332180BCFD50088DEC7 /* CCUserDefault.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57032C180BCFD50088DEC7 /* CCUserDefault.h */; }; - 1A570333180BCFD50088DEC7 /* CCUserDefault.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A57032D180BCFD50088DEC7 /* CCUserDefault.mm */; }; - 1A570334180BCFD50088DEC7 /* CCUserDefault.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A57032D180BCFD50088DEC7 /* CCUserDefault.mm */; }; - 1A570335180BCFD50088DEC7 /* CCUserDefaultAndroid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A57032E180BCFD50088DEC7 /* CCUserDefaultAndroid.cpp */; }; - 1A570336180BCFD50088DEC7 /* CCUserDefaultAndroid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A57032E180BCFD50088DEC7 /* CCUserDefaultAndroid.cpp */; }; 1A570347180BD0850088DEC7 /* libglfw3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A570346180BD0850088DEC7 /* libglfw3.a */; }; 1A57034B180BD09B0088DEC7 /* tinyxml2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570349180BD09B0088DEC7 /* tinyxml2.cpp */; }; 1A57034C180BD09B0088DEC7 /* tinyxml2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A570349180BD09B0088DEC7 /* tinyxml2.cpp */; }; @@ -542,18 +485,10 @@ 1A8C5A0F180E930E00EF57C3 /* DictionaryHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C598A180E930E00EF57C3 /* DictionaryHelper.h */; }; 1A8C5A10180E930E00EF57C3 /* DictionaryHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C598A180E930E00EF57C3 /* DictionaryHelper.h */; }; 1A94D35116C2072800D79D09 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1551A342158F2AB200E66CFE /* Foundation.framework */; }; - 1A9DCA23180E6955007A3AD4 /* ccFPSImages.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A9DCA00180E6955007A3AD4 /* ccFPSImages.c */; }; - 1A9DCA24180E6955007A3AD4 /* ccFPSImages.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A9DCA00180E6955007A3AD4 /* ccFPSImages.c */; }; - 1A9DCA25180E6955007A3AD4 /* ccFPSImages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9DCA01180E6955007A3AD4 /* ccFPSImages.h */; }; - 1A9DCA26180E6955007A3AD4 /* ccFPSImages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9DCA01180E6955007A3AD4 /* ccFPSImages.h */; }; 1A9DCA27180E6955007A3AD4 /* CCGLBufferedNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A9DCA02180E6955007A3AD4 /* CCGLBufferedNode.cpp */; }; 1A9DCA28180E6955007A3AD4 /* CCGLBufferedNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A9DCA02180E6955007A3AD4 /* CCGLBufferedNode.cpp */; }; 1A9DCA29180E6955007A3AD4 /* CCGLBufferedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9DCA03180E6955007A3AD4 /* CCGLBufferedNode.h */; }; 1A9DCA2A180E6955007A3AD4 /* CCGLBufferedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9DCA03180E6955007A3AD4 /* CCGLBufferedNode.h */; }; - 1A9DCA2D180E6955007A3AD4 /* CCProtocols.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9DCA05180E6955007A3AD4 /* CCProtocols.h */; }; - 1A9DCA2E180E6955007A3AD4 /* CCProtocols.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9DCA05180E6955007A3AD4 /* CCProtocols.h */; }; - 1A9DCA3B180E6955007A3AD4 /* firePngData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9DCA0C180E6955007A3AD4 /* firePngData.h */; }; - 1A9DCA3C180E6955007A3AD4 /* firePngData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9DCA0C180E6955007A3AD4 /* firePngData.h */; }; 1AAF528B180E2ECC000584C8 /* b2BroadPhase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A168B61807AF9C005B8026 /* b2BroadPhase.cpp */; }; 1AAF528C180E2ECC000584C8 /* b2BroadPhase.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A168B71807AF9C005B8026 /* b2BroadPhase.h */; }; 1AAF528D180E2ECC000584C8 /* b2CollideCircle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A168B81807AF9C005B8026 /* b2CollideCircle.cpp */; }; @@ -1039,14 +974,6 @@ 2905FA8D18CF08D100240AA3 /* UIWidget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2905FA1318CF08D100240AA3 /* UIWidget.cpp */; }; 2905FA8E18CF08D100240AA3 /* UIWidget.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1418CF08D100240AA3 /* UIWidget.h */; }; 2905FA8F18CF08D100240AA3 /* UIWidget.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905FA1418CF08D100240AA3 /* UIWidget.h */; }; - 296CAD221915EC8000C64FBF /* CCEventFocus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 296CAD201915EC8000C64FBF /* CCEventFocus.cpp */; }; - 296CAD231915EC8000C64FBF /* CCEventFocus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 296CAD201915EC8000C64FBF /* CCEventFocus.cpp */; }; - 296CAD241915EC8000C64FBF /* CCEventFocus.h in Headers */ = {isa = PBXBuildFile; fileRef = 296CAD211915EC8000C64FBF /* CCEventFocus.h */; }; - 296CAD251915EC8000C64FBF /* CCEventFocus.h in Headers */ = {isa = PBXBuildFile; fileRef = 296CAD211915EC8000C64FBF /* CCEventFocus.h */; }; - 296CAD281915EC9900C64FBF /* CCEventListenerFocus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 296CAD261915EC9900C64FBF /* CCEventListenerFocus.cpp */; }; - 296CAD291915EC9900C64FBF /* CCEventListenerFocus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 296CAD261915EC9900C64FBF /* CCEventListenerFocus.cpp */; }; - 296CAD2A1915EC9900C64FBF /* CCEventListenerFocus.h in Headers */ = {isa = PBXBuildFile; fileRef = 296CAD271915EC9900C64FBF /* CCEventListenerFocus.h */; }; - 296CAD2B1915EC9900C64FBF /* CCEventListenerFocus.h in Headers */ = {isa = PBXBuildFile; fileRef = 296CAD271915EC9900C64FBF /* CCEventListenerFocus.h */; }; 2986667F18B1B246000E39CA /* CCTweenFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2986667818B1B079000E39CA /* CCTweenFunction.cpp */; }; 2AC795DB1862870F005EC8E1 /* SkeletonBounds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D918628689005EC8E1 /* SkeletonBounds.cpp */; }; 2AC795DC1862870F005EC8E1 /* Event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AC795D51862867D005EC8E1 /* Event.cpp */; }; @@ -1066,9 +993,6 @@ 2AC795EA1862875D005EC8E1 /* BoundingBoxAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC795D418628672005EC8E1 /* BoundingBoxAttachment.h */; }; 373B9129187891F400198F86 /* CCComBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 373B910718787C0B00198F86 /* CCComBase.h */; }; 373B912A187891FB00198F86 /* CCComBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 373B910718787C0B00198F86 /* CCComBase.h */; }; - 3E26D40518ACB5D100834404 /* CCImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E26D40418ACB5D100834404 /* CCImage.cpp */; }; - 3E26D40618ACB5D100834404 /* CCImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E26D40418ACB5D100834404 /* CCImage.cpp */; }; - 3E26D40818ACB63900834404 /* CCDevice.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3E26D40718ACB63900834404 /* CCDevice.mm */; }; 3EA0FB6B191C841D00B170C8 /* UIVideoPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA0FB69191C841D00B170C8 /* UIVideoPlayer.h */; }; 3EA0FB6C191C841D00B170C8 /* UIVideoPlayerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0FB6A191C841D00B170C8 /* UIVideoPlayerIOS.mm */; }; 460E468118080832000CDD6D /* cocos-ext.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A167D21807AF4D005B8026 /* cocos-ext.h */; }; @@ -1187,61 +1111,6 @@ 46A160591807A5EB005B8026 /* SimpleAudioEngine.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A15FEB1807A56F005B8026 /* SimpleAudioEngine.mm */; }; 46A1605A1807A5EB005B8026 /* SimpleAudioEngine_objc.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A15FEC1807A56F005B8026 /* SimpleAudioEngine_objc.h */; }; 46A1605B1807A5EB005B8026 /* SimpleAudioEngine_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 46A15FED1807A56F005B8026 /* SimpleAudioEngine_objc.m */; }; - 46A170131807CBFC005B8026 /* CCFileUtilsApple.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A8F1807B038005B8026 /* CCFileUtilsApple.h */; }; - 46A170141807CBFC005B8026 /* CCFileUtilsApple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16A901807B038005B8026 /* CCFileUtilsApple.mm */; }; - 46A170151807CBFC005B8026 /* CCLock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A16A911807B038005B8026 /* CCLock.cpp */; }; - 46A170161807CBFC005B8026 /* CCLock.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A921807B038005B8026 /* CCLock.h */; }; - 46A170171807CBFC005B8026 /* CCThread.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16A931807B038005B8026 /* CCThread.mm */; }; - 46A170181807CBFC005B8026 /* CCApplicationProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A941807B038005B8026 /* CCApplicationProtocol.h */; }; - 46A170191807CBFC005B8026 /* CCCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A951807B038005B8026 /* CCCommon.h */; }; - 46A1701A1807CBFC005B8026 /* CCDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A961807B038005B8026 /* CCDevice.h */; }; - 46A1701B1807CBFC005B8026 /* CCGLViewProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A16A971807B038005B8026 /* CCGLViewProtocol.cpp */; }; - 46A1701C1807CBFC005B8026 /* CCGLViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A981807B038005B8026 /* CCGLViewProtocol.h */; }; - 46A1701D1807CBFC005B8026 /* CCFileUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A16A991807B038005B8026 /* CCFileUtils.cpp */; }; - 46A1701E1807CBFC005B8026 /* CCFileUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A9A1807B038005B8026 /* CCFileUtils.h */; }; - 46A1701F1807CBFC005B8026 /* CCImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A9B1807B038005B8026 /* CCImage.h */; }; - 46A170231807CBFC005B8026 /* CCSAXParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A16A9F1807B038005B8026 /* CCSAXParser.cpp */; }; - 46A170241807CBFC005B8026 /* CCSAXParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AA01807B038005B8026 /* CCSAXParser.h */; }; - 46A170251807CBFC005B8026 /* CCThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A16AA11807B038005B8026 /* CCThread.cpp */; }; - 46A170261807CBFC005B8026 /* CCThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AA21807B038005B8026 /* CCThread.h */; }; - 46A170271807CBFE005B8026 /* CCFileUtilsApple.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A8F1807B038005B8026 /* CCFileUtilsApple.h */; }; - 46A170281807CBFE005B8026 /* CCFileUtilsApple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16A901807B038005B8026 /* CCFileUtilsApple.mm */; }; - 46A170291807CBFE005B8026 /* CCLock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A16A911807B038005B8026 /* CCLock.cpp */; }; - 46A1702A1807CBFE005B8026 /* CCLock.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A921807B038005B8026 /* CCLock.h */; }; - 46A1702B1807CBFE005B8026 /* CCThread.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16A931807B038005B8026 /* CCThread.mm */; }; - 46A1702C1807CBFE005B8026 /* CCApplicationProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A941807B038005B8026 /* CCApplicationProtocol.h */; }; - 46A1702D1807CBFE005B8026 /* CCCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A951807B038005B8026 /* CCCommon.h */; }; - 46A1702E1807CBFE005B8026 /* CCDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A961807B038005B8026 /* CCDevice.h */; }; - 46A1702F1807CBFE005B8026 /* CCGLViewProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A16A971807B038005B8026 /* CCGLViewProtocol.cpp */; }; - 46A170301807CBFE005B8026 /* CCGLViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A981807B038005B8026 /* CCGLViewProtocol.h */; }; - 46A170311807CBFE005B8026 /* CCFileUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A16A991807B038005B8026 /* CCFileUtils.cpp */; }; - 46A170321807CBFE005B8026 /* CCFileUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A9A1807B038005B8026 /* CCFileUtils.h */; }; - 46A170331807CBFE005B8026 /* CCImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16A9B1807B038005B8026 /* CCImage.h */; }; - 46A170371807CBFE005B8026 /* CCSAXParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A16A9F1807B038005B8026 /* CCSAXParser.cpp */; }; - 46A170381807CBFE005B8026 /* CCSAXParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AA01807B038005B8026 /* CCSAXParser.h */; }; - 46A170391807CBFE005B8026 /* CCThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A16AA11807B038005B8026 /* CCThread.cpp */; }; - 46A1703A1807CBFE005B8026 /* CCThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AA21807B038005B8026 /* CCThread.h */; }; - 46A1703B1807CC07005B8026 /* CCApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AA41807B038005B8026 /* CCApplication.h */; }; - 46A1703C1807CC07005B8026 /* CCApplication.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16AA51807B038005B8026 /* CCApplication.mm */; }; - 46A1703D1807CC07005B8026 /* CCCommon.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16AA61807B038005B8026 /* CCCommon.mm */; }; - 46A1703E1807CC07005B8026 /* CCDevice.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16AA71807B038005B8026 /* CCDevice.mm */; }; - 46A1703F1807CC07005B8026 /* CCDirectorCaller.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AA81807B038005B8026 /* CCDirectorCaller.h */; }; - 46A170401807CC07005B8026 /* CCDirectorCaller.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16AA91807B038005B8026 /* CCDirectorCaller.mm */; }; - 46A170411807CC07005B8026 /* CCGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AAA1807B038005B8026 /* CCGLView.h */; }; - 46A170421807CC07005B8026 /* CCGLView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16AAB1807B038005B8026 /* CCGLView.mm */; }; - 46A170431807CC07005B8026 /* CCES2Renderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AAC1807B038005B8026 /* CCES2Renderer.h */; }; - 46A170441807CC07005B8026 /* CCES2Renderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 46A16AAD1807B038005B8026 /* CCES2Renderer.m */; }; - 46A170451807CC07005B8026 /* CCESRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AAE1807B038005B8026 /* CCESRenderer.h */; }; - 46A170471807CC07005B8026 /* CCImage.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16AB01807B038005B8026 /* CCImage.mm */; }; - 46A170481807CC07005B8026 /* CCPlatformDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AB11807B038005B8026 /* CCPlatformDefine.h */; }; - 46A170491807CC07005B8026 /* CCStdC.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AB21807B038005B8026 /* CCStdC.h */; }; - 46A1704B1807CC07005B8026 /* CCEAGLView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16AB41807B038005B8026 /* CCEAGLView.mm */; }; - 46A1704C1807CC07005B8026 /* OpenGL_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AB51807B038005B8026 /* OpenGL_Internal.h */; }; - 46A1704F1807CC1C005B8026 /* CCApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AC81807B038005B8026 /* CCApplication.h */; }; - 46A170501807CC1C005B8026 /* CCApplication.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16AC91807B038005B8026 /* CCApplication.mm */; }; - 46A170511807CC1C005B8026 /* CCCommon.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46A16ACA1807B038005B8026 /* CCCommon.mm */; }; - 46A1705B1807CC1C005B8026 /* CCPlatformDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AD41807B038005B8026 /* CCPlatformDefine.h */; }; - 46A1705C1807CC1C005B8026 /* CCStdC.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A16AD51807B038005B8026 /* CCStdC.h */; }; 46A170E61807CECA005B8026 /* CCPhysicsBody.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A1706E1807CE7A005B8026 /* CCPhysicsBody.cpp */; }; 46A170E71807CECA005B8026 /* CCPhysicsBody.h in Headers */ = {isa = PBXBuildFile; fileRef = 46A1706F1807CE7A005B8026 /* CCPhysicsBody.h */; }; 46A170E81807CECA005B8026 /* CCPhysicsContact.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46A170701807CE7A005B8026 /* CCPhysicsContact.cpp */; }; @@ -1376,198 +1245,10 @@ 46C02E0818E91123004B7456 /* xxhash.c in Sources */ = {isa = PBXBuildFile; fileRef = 46C02E0518E91123004B7456 /* xxhash.c */; }; 46C02E0918E91123004B7456 /* xxhash.h in Headers */ = {isa = PBXBuildFile; fileRef = 46C02E0618E91123004B7456 /* xxhash.h */; }; 46C02E0A18E91123004B7456 /* xxhash.h in Headers */ = {isa = PBXBuildFile; fileRef = 46C02E0618E91123004B7456 /* xxhash.h */; }; - 500DC8AA19105D41007B91BF /* CCBatchCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC89919105D41007B91BF /* CCBatchCommand.cpp */; }; - 500DC8AB19105D41007B91BF /* CCBatchCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC89919105D41007B91BF /* CCBatchCommand.cpp */; }; - 500DC8AC19105D41007B91BF /* CCBatchCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC89A19105D41007B91BF /* CCBatchCommand.h */; }; - 500DC8AD19105D41007B91BF /* CCBatchCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC89A19105D41007B91BF /* CCBatchCommand.h */; }; - 500DC8AE19105D41007B91BF /* CCCustomCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC89B19105D41007B91BF /* CCCustomCommand.cpp */; }; - 500DC8AF19105D41007B91BF /* CCCustomCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC89B19105D41007B91BF /* CCCustomCommand.cpp */; }; - 500DC8B019105D41007B91BF /* CCCustomCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC89C19105D41007B91BF /* CCCustomCommand.h */; }; - 500DC8B119105D41007B91BF /* CCCustomCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC89C19105D41007B91BF /* CCCustomCommand.h */; }; - 500DC8B219105D41007B91BF /* CCGroupCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC89D19105D41007B91BF /* CCGroupCommand.cpp */; }; - 500DC8B319105D41007B91BF /* CCGroupCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC89D19105D41007B91BF /* CCGroupCommand.cpp */; }; - 500DC8B419105D41007B91BF /* CCGroupCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC89E19105D41007B91BF /* CCGroupCommand.h */; }; - 500DC8B519105D41007B91BF /* CCGroupCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC89E19105D41007B91BF /* CCGroupCommand.h */; }; - 500DC8BA19105D41007B91BF /* CCQuadCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8A119105D41007B91BF /* CCQuadCommand.cpp */; }; - 500DC8BB19105D41007B91BF /* CCQuadCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8A119105D41007B91BF /* CCQuadCommand.cpp */; }; - 500DC8BC19105D41007B91BF /* CCQuadCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8A219105D41007B91BF /* CCQuadCommand.h */; }; - 500DC8BD19105D41007B91BF /* CCQuadCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8A219105D41007B91BF /* CCQuadCommand.h */; }; - 500DC8BE19105D41007B91BF /* CCRenderCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8A319105D41007B91BF /* CCRenderCommand.cpp */; }; - 500DC8BF19105D41007B91BF /* CCRenderCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8A319105D41007B91BF /* CCRenderCommand.cpp */; }; - 500DC8C019105D41007B91BF /* CCRenderCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8A419105D41007B91BF /* CCRenderCommand.h */; }; - 500DC8C119105D41007B91BF /* CCRenderCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8A419105D41007B91BF /* CCRenderCommand.h */; }; - 500DC8C219105D41007B91BF /* CCRenderCommandPool.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8A519105D41007B91BF /* CCRenderCommandPool.h */; }; - 500DC8C319105D41007B91BF /* CCRenderCommandPool.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8A519105D41007B91BF /* CCRenderCommandPool.h */; }; - 500DC8C419105D41007B91BF /* CCRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8A619105D41007B91BF /* CCRenderer.cpp */; }; - 500DC8C519105D41007B91BF /* CCRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8A619105D41007B91BF /* CCRenderer.cpp */; }; - 500DC8C619105D41007B91BF /* CCRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8A719105D41007B91BF /* CCRenderer.h */; }; - 500DC8C719105D41007B91BF /* CCRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8A719105D41007B91BF /* CCRenderer.h */; }; - 500DC8D119105F7D007B91BF /* CCAffineTransform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8CC19105F7D007B91BF /* CCAffineTransform.cpp */; }; - 500DC8D219105F7D007B91BF /* CCAffineTransform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8CC19105F7D007B91BF /* CCAffineTransform.cpp */; }; - 500DC8D319105F7D007B91BF /* CCAffineTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8CD19105F7D007B91BF /* CCAffineTransform.h */; }; - 500DC8D419105F7D007B91BF /* CCAffineTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8CD19105F7D007B91BF /* CCAffineTransform.h */; }; - 500DC8D519105F7D007B91BF /* CCGeometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8CE19105F7D007B91BF /* CCGeometry.cpp */; }; - 500DC8D619105F7D007B91BF /* CCGeometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8CE19105F7D007B91BF /* CCGeometry.cpp */; }; - 500DC8D719105F7D007B91BF /* CCGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8CF19105F7D007B91BF /* CCGeometry.h */; }; - 500DC8D819105F7D007B91BF /* CCGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8CF19105F7D007B91BF /* CCGeometry.h */; }; - 500DC8D919105F7D007B91BF /* CCMathBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8D019105F7D007B91BF /* CCMathBase.h */; }; - 500DC8DA19105F7D007B91BF /* CCMathBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8D019105F7D007B91BF /* CCMathBase.h */; }; - 500DC92A19106300007B91BF /* atitc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8E719106300007B91BF /* atitc.cpp */; }; - 500DC92B19106300007B91BF /* atitc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8E719106300007B91BF /* atitc.cpp */; }; - 500DC92C19106300007B91BF /* atitc.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8E819106300007B91BF /* atitc.h */; }; - 500DC92D19106300007B91BF /* atitc.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8E819106300007B91BF /* atitc.h */; }; - 500DC92E19106300007B91BF /* base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8E919106300007B91BF /* base64.cpp */; }; - 500DC92F19106300007B91BF /* base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8E919106300007B91BF /* base64.cpp */; }; - 500DC93019106300007B91BF /* base64.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8EA19106300007B91BF /* base64.h */; }; - 500DC93119106300007B91BF /* base64.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8EA19106300007B91BF /* base64.h */; }; - 500DC93219106300007B91BF /* CCAutoreleasePool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8EB19106300007B91BF /* CCAutoreleasePool.cpp */; }; - 500DC93319106300007B91BF /* CCAutoreleasePool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8EB19106300007B91BF /* CCAutoreleasePool.cpp */; }; - 500DC93419106300007B91BF /* CCAutoreleasePool.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8EC19106300007B91BF /* CCAutoreleasePool.h */; }; - 500DC93519106300007B91BF /* CCAutoreleasePool.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8EC19106300007B91BF /* CCAutoreleasePool.h */; }; - 500DC93619106300007B91BF /* ccConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8ED19106300007B91BF /* ccConfig.h */; }; - 500DC93719106300007B91BF /* ccConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8ED19106300007B91BF /* ccConfig.h */; }; - 500DC93819106300007B91BF /* CCConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8EE19106300007B91BF /* CCConfiguration.cpp */; }; - 500DC93919106300007B91BF /* CCConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8EE19106300007B91BF /* CCConfiguration.cpp */; }; - 500DC93A19106300007B91BF /* CCConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8EF19106300007B91BF /* CCConfiguration.h */; }; - 500DC93B19106300007B91BF /* CCConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8EF19106300007B91BF /* CCConfiguration.h */; }; - 500DC93C19106300007B91BF /* CCConsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8F019106300007B91BF /* CCConsole.cpp */; }; - 500DC93D19106300007B91BF /* CCConsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8F019106300007B91BF /* CCConsole.cpp */; }; - 500DC93E19106300007B91BF /* CCConsole.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8F119106300007B91BF /* CCConsole.h */; }; - 500DC93F19106300007B91BF /* CCConsole.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8F119106300007B91BF /* CCConsole.h */; }; - 500DC94019106300007B91BF /* CCData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8F219106300007B91BF /* CCData.cpp */; }; - 500DC94119106300007B91BF /* CCData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8F219106300007B91BF /* CCData.cpp */; }; - 500DC94219106300007B91BF /* CCData.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8F319106300007B91BF /* CCData.h */; }; - 500DC94319106300007B91BF /* CCData.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8F319106300007B91BF /* CCData.h */; }; - 500DC94419106300007B91BF /* CCDataVisitor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8F419106300007B91BF /* CCDataVisitor.cpp */; }; - 500DC94519106300007B91BF /* CCDataVisitor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8F419106300007B91BF /* CCDataVisitor.cpp */; }; - 500DC94619106300007B91BF /* CCDataVisitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8F519106300007B91BF /* CCDataVisitor.h */; }; - 500DC94719106300007B91BF /* CCDataVisitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8F519106300007B91BF /* CCDataVisitor.h */; }; - 500DC94819106300007B91BF /* CCDirector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8F619106300007B91BF /* CCDirector.cpp */; }; - 500DC94919106300007B91BF /* CCDirector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8F619106300007B91BF /* CCDirector.cpp */; }; - 500DC94A19106300007B91BF /* CCDirector.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8F719106300007B91BF /* CCDirector.h */; }; - 500DC94B19106300007B91BF /* CCDirector.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8F719106300007B91BF /* CCDirector.h */; }; - 500DC94C19106300007B91BF /* CCEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8F819106300007B91BF /* CCEvent.cpp */; }; - 500DC94D19106300007B91BF /* CCEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8F819106300007B91BF /* CCEvent.cpp */; }; - 500DC94E19106300007B91BF /* CCEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8F919106300007B91BF /* CCEvent.h */; }; - 500DC94F19106300007B91BF /* CCEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8F919106300007B91BF /* CCEvent.h */; }; - 500DC95019106300007B91BF /* CCEventAcceleration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8FA19106300007B91BF /* CCEventAcceleration.cpp */; }; - 500DC95119106300007B91BF /* CCEventAcceleration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8FA19106300007B91BF /* CCEventAcceleration.cpp */; }; - 500DC95219106300007B91BF /* CCEventAcceleration.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8FB19106300007B91BF /* CCEventAcceleration.h */; }; - 500DC95319106300007B91BF /* CCEventAcceleration.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8FB19106300007B91BF /* CCEventAcceleration.h */; }; - 500DC95419106300007B91BF /* CCEventCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8FC19106300007B91BF /* CCEventCustom.cpp */; }; - 500DC95519106300007B91BF /* CCEventCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8FC19106300007B91BF /* CCEventCustom.cpp */; }; - 500DC95619106300007B91BF /* CCEventCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8FD19106300007B91BF /* CCEventCustom.h */; }; - 500DC95719106300007B91BF /* CCEventCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8FD19106300007B91BF /* CCEventCustom.h */; }; - 500DC95819106300007B91BF /* CCEventDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8FE19106300007B91BF /* CCEventDispatcher.cpp */; }; - 500DC95919106300007B91BF /* CCEventDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC8FE19106300007B91BF /* CCEventDispatcher.cpp */; }; - 500DC95A19106300007B91BF /* CCEventDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8FF19106300007B91BF /* CCEventDispatcher.h */; }; - 500DC95B19106300007B91BF /* CCEventDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC8FF19106300007B91BF /* CCEventDispatcher.h */; }; - 500DC95C19106300007B91BF /* CCEventKeyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90019106300007B91BF /* CCEventKeyboard.cpp */; }; - 500DC95D19106300007B91BF /* CCEventKeyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90019106300007B91BF /* CCEventKeyboard.cpp */; }; - 500DC95E19106300007B91BF /* CCEventKeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90119106300007B91BF /* CCEventKeyboard.h */; }; - 500DC95F19106300007B91BF /* CCEventKeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90119106300007B91BF /* CCEventKeyboard.h */; }; - 500DC96019106300007B91BF /* CCEventListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90219106300007B91BF /* CCEventListener.cpp */; }; - 500DC96119106300007B91BF /* CCEventListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90219106300007B91BF /* CCEventListener.cpp */; }; - 500DC96219106300007B91BF /* CCEventListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90319106300007B91BF /* CCEventListener.h */; }; - 500DC96319106300007B91BF /* CCEventListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90319106300007B91BF /* CCEventListener.h */; }; - 500DC96419106300007B91BF /* CCEventListenerAcceleration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90419106300007B91BF /* CCEventListenerAcceleration.cpp */; }; - 500DC96519106300007B91BF /* CCEventListenerAcceleration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90419106300007B91BF /* CCEventListenerAcceleration.cpp */; }; - 500DC96619106300007B91BF /* CCEventListenerAcceleration.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90519106300007B91BF /* CCEventListenerAcceleration.h */; }; - 500DC96719106300007B91BF /* CCEventListenerAcceleration.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90519106300007B91BF /* CCEventListenerAcceleration.h */; }; - 500DC96819106300007B91BF /* CCEventListenerCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90619106300007B91BF /* CCEventListenerCustom.cpp */; }; - 500DC96919106300007B91BF /* CCEventListenerCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90619106300007B91BF /* CCEventListenerCustom.cpp */; }; - 500DC96A19106300007B91BF /* CCEventListenerCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90719106300007B91BF /* CCEventListenerCustom.h */; }; - 500DC96B19106300007B91BF /* CCEventListenerCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90719106300007B91BF /* CCEventListenerCustom.h */; }; - 500DC96C19106300007B91BF /* CCEventListenerKeyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90819106300007B91BF /* CCEventListenerKeyboard.cpp */; }; - 500DC96D19106300007B91BF /* CCEventListenerKeyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90819106300007B91BF /* CCEventListenerKeyboard.cpp */; }; - 500DC96E19106300007B91BF /* CCEventListenerKeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90919106300007B91BF /* CCEventListenerKeyboard.h */; }; - 500DC96F19106300007B91BF /* CCEventListenerKeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90919106300007B91BF /* CCEventListenerKeyboard.h */; }; - 500DC97019106300007B91BF /* CCEventListenerMouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90A19106300007B91BF /* CCEventListenerMouse.cpp */; }; - 500DC97119106300007B91BF /* CCEventListenerMouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90A19106300007B91BF /* CCEventListenerMouse.cpp */; }; - 500DC97219106300007B91BF /* CCEventListenerMouse.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90B19106300007B91BF /* CCEventListenerMouse.h */; }; - 500DC97319106300007B91BF /* CCEventListenerMouse.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90B19106300007B91BF /* CCEventListenerMouse.h */; }; - 500DC97419106300007B91BF /* CCEventListenerTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90C19106300007B91BF /* CCEventListenerTouch.cpp */; }; - 500DC97519106300007B91BF /* CCEventListenerTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90C19106300007B91BF /* CCEventListenerTouch.cpp */; }; - 500DC97619106300007B91BF /* CCEventListenerTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90D19106300007B91BF /* CCEventListenerTouch.h */; }; - 500DC97719106300007B91BF /* CCEventListenerTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90D19106300007B91BF /* CCEventListenerTouch.h */; }; - 500DC97819106300007B91BF /* CCEventMouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90E19106300007B91BF /* CCEventMouse.cpp */; }; - 500DC97919106300007B91BF /* CCEventMouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC90E19106300007B91BF /* CCEventMouse.cpp */; }; - 500DC97A19106300007B91BF /* CCEventMouse.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90F19106300007B91BF /* CCEventMouse.h */; }; - 500DC97B19106300007B91BF /* CCEventMouse.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC90F19106300007B91BF /* CCEventMouse.h */; }; - 500DC97C19106300007B91BF /* CCEventTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC91019106300007B91BF /* CCEventTouch.cpp */; }; - 500DC97D19106300007B91BF /* CCEventTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC91019106300007B91BF /* CCEventTouch.cpp */; }; - 500DC97E19106300007B91BF /* CCEventTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91119106300007B91BF /* CCEventTouch.h */; }; - 500DC97F19106300007B91BF /* CCEventTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91119106300007B91BF /* CCEventTouch.h */; }; - 500DC98019106300007B91BF /* CCEventType.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91219106300007B91BF /* CCEventType.h */; }; - 500DC98119106300007B91BF /* CCEventType.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91219106300007B91BF /* CCEventType.h */; }; - 500DC98219106300007B91BF /* ccMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91319106300007B91BF /* ccMacros.h */; }; - 500DC98319106300007B91BF /* ccMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91319106300007B91BF /* ccMacros.h */; }; - 500DC98419106300007B91BF /* CCMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91419106300007B91BF /* CCMap.h */; }; - 500DC98519106300007B91BF /* CCMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91419106300007B91BF /* CCMap.h */; }; - 500DC98619106300007B91BF /* CCNS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC91519106300007B91BF /* CCNS.cpp */; }; - 500DC98719106300007B91BF /* CCNS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC91519106300007B91BF /* CCNS.cpp */; }; - 500DC98819106300007B91BF /* CCNS.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91619106300007B91BF /* CCNS.h */; }; - 500DC98919106300007B91BF /* CCNS.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91619106300007B91BF /* CCNS.h */; }; - 500DC98A19106300007B91BF /* CCPlatformConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91719106300007B91BF /* CCPlatformConfig.h */; }; - 500DC98B19106300007B91BF /* CCPlatformConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91719106300007B91BF /* CCPlatformConfig.h */; }; - 500DC98C19106300007B91BF /* CCPlatformMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91819106300007B91BF /* CCPlatformMacros.h */; }; - 500DC98D19106300007B91BF /* CCPlatformMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91819106300007B91BF /* CCPlatformMacros.h */; }; - 500DC98E19106300007B91BF /* CCRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC91919106300007B91BF /* CCRef.cpp */; }; - 500DC98F19106300007B91BF /* CCRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC91919106300007B91BF /* CCRef.cpp */; }; - 500DC99019106300007B91BF /* CCRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91A19106300007B91BF /* CCRef.h */; }; - 500DC99119106300007B91BF /* CCRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91A19106300007B91BF /* CCRef.h */; }; - 500DC99219106300007B91BF /* CCRefPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91B19106300007B91BF /* CCRefPtr.h */; }; - 500DC99319106300007B91BF /* CCRefPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91B19106300007B91BF /* CCRefPtr.h */; }; - 500DC99419106300007B91BF /* CCScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC91C19106300007B91BF /* CCScheduler.cpp */; }; - 500DC99519106300007B91BF /* CCScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC91C19106300007B91BF /* CCScheduler.cpp */; }; - 500DC99619106300007B91BF /* CCScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91D19106300007B91BF /* CCScheduler.h */; }; - 500DC99719106300007B91BF /* CCScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91D19106300007B91BF /* CCScheduler.h */; }; - 500DC99819106300007B91BF /* ccTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC91E19106300007B91BF /* ccTypes.cpp */; }; - 500DC99919106300007B91BF /* ccTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC91E19106300007B91BF /* ccTypes.cpp */; }; - 500DC99A19106300007B91BF /* ccTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91F19106300007B91BF /* ccTypes.h */; }; - 500DC99B19106300007B91BF /* ccTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC91F19106300007B91BF /* ccTypes.h */; }; - 500DC99C19106300007B91BF /* CCValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC92019106300007B91BF /* CCValue.cpp */; }; - 500DC99D19106300007B91BF /* CCValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC92019106300007B91BF /* CCValue.cpp */; }; - 500DC99E19106300007B91BF /* CCValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC92119106300007B91BF /* CCValue.h */; }; - 500DC99F19106300007B91BF /* CCValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC92119106300007B91BF /* CCValue.h */; }; - 500DC9A019106300007B91BF /* CCVector.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC92219106300007B91BF /* CCVector.h */; }; - 500DC9A119106300007B91BF /* CCVector.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC92219106300007B91BF /* CCVector.h */; }; - 500DC9A219106300007B91BF /* etc1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC92419106300007B91BF /* etc1.cpp */; }; - 500DC9A319106300007B91BF /* etc1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC92419106300007B91BF /* etc1.cpp */; }; - 500DC9A419106300007B91BF /* etc1.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC92519106300007B91BF /* etc1.h */; }; - 500DC9A519106300007B91BF /* etc1.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC92519106300007B91BF /* etc1.h */; }; - 500DC9A619106300007B91BF /* s3tc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC92619106300007B91BF /* s3tc.cpp */; }; - 500DC9A719106300007B91BF /* s3tc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC92619106300007B91BF /* s3tc.cpp */; }; - 500DC9A819106300007B91BF /* s3tc.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC92719106300007B91BF /* s3tc.h */; }; - 500DC9A919106300007B91BF /* s3tc.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC92719106300007B91BF /* s3tc.h */; }; - 500DC9AA19106300007B91BF /* ZipUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC92819106300007B91BF /* ZipUtils.cpp */; }; - 500DC9AB19106300007B91BF /* ZipUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC92819106300007B91BF /* ZipUtils.cpp */; }; - 500DC9AC19106300007B91BF /* ZipUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC92919106300007B91BF /* ZipUtils.h */; }; - 500DC9AD19106300007B91BF /* ZipUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC92919106300007B91BF /* ZipUtils.h */; }; - 500DC9B01910633C007B91BF /* CCTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC9AE1910633C007B91BF /* CCTouch.cpp */; }; - 500DC9B11910633C007B91BF /* CCTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC9AE1910633C007B91BF /* CCTouch.cpp */; }; - 500DC9B21910633C007B91BF /* CCTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC9AF1910633C007B91BF /* CCTouch.h */; }; - 500DC9B31910633C007B91BF /* CCTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC9AF1910633C007B91BF /* CCTouch.h */; }; - 500DC9B619106E6D007B91BF /* TransformUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC9B419106E6D007B91BF /* TransformUtils.cpp */; }; - 500DC9B719106E6D007B91BF /* TransformUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC9B419106E6D007B91BF /* TransformUtils.cpp */; }; - 500DC9B819106E6D007B91BF /* TransformUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC9B519106E6D007B91BF /* TransformUtils.h */; }; - 500DC9B919106E6D007B91BF /* TransformUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC9B519106E6D007B91BF /* TransformUtils.h */; }; - 500DC9BC19106E89007B91BF /* CCProfiling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC9BA19106E89007B91BF /* CCProfiling.cpp */; }; - 500DC9BD19106E89007B91BF /* CCProfiling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 500DC9BA19106E89007B91BF /* CCProfiling.cpp */; }; - 500DC9BE19106E89007B91BF /* CCProfiling.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC9BB19106E89007B91BF /* CCProfiling.h */; }; - 500DC9BF19106E89007B91BF /* CCProfiling.h in Headers */ = {isa = PBXBuildFile; fileRef = 500DC9BB19106E89007B91BF /* CCProfiling.h */; }; 5027253A190BF1B900AAF4ED /* cocos2d.h in Headers */ = {isa = PBXBuildFile; fileRef = 50272538190BF1B900AAF4ED /* cocos2d.h */; }; 5027253B190BF1B900AAF4ED /* cocos2d.h in Headers */ = {isa = PBXBuildFile; fileRef = 50272538190BF1B900AAF4ED /* cocos2d.h */; }; 5027253C190BF1B900AAF4ED /* cocos2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50272539190BF1B900AAF4ED /* cocos2d.cpp */; }; 5027253D190BF1B900AAF4ED /* cocos2d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50272539190BF1B900AAF4ED /* cocos2d.cpp */; }; - 5034CA19191D591000CE6051 /* ccShaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9F7191D591000CE6051 /* ccShaders.h */; }; - 5034CA1A191D591100CE6051 /* ccShaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9F7191D591000CE6051 /* ccShaders.h */; }; - 5034CA1B191D591100CE6051 /* ccShaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034C9F8191D591000CE6051 /* ccShaders.cpp */; }; - 5034CA1C191D591100CE6051 /* ccShaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034C9F8191D591000CE6051 /* ccShaders.cpp */; }; - 5034CA1D191D591100CE6051 /* CCGLProgramCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9F9191D591000CE6051 /* CCGLProgramCache.h */; }; - 5034CA1E191D591100CE6051 /* CCGLProgramCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9F9191D591000CE6051 /* CCGLProgramCache.h */; }; - 5034CA1F191D591100CE6051 /* CCGLProgramCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034C9FA191D591000CE6051 /* CCGLProgramCache.cpp */; }; - 5034CA20191D591100CE6051 /* CCGLProgramCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034C9FA191D591000CE6051 /* CCGLProgramCache.cpp */; }; 5034CA21191D591100CE6051 /* ccShader_PositionTextureColorAlphaTest.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9FB191D591000CE6051 /* ccShader_PositionTextureColorAlphaTest.frag */; }; 5034CA22191D591100CE6051 /* ccShader_PositionTextureColorAlphaTest.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034C9FB191D591000CE6051 /* ccShader_PositionTextureColorAlphaTest.frag */; }; 5034CA2B191D591100CE6051 /* ccShader_PositionTextureA8Color.vert in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA00191D591000CE6051 /* ccShader_PositionTextureA8Color.vert */; }; @@ -1604,22 +1285,369 @@ 5034CA4A191D591100CE6051 /* ccShader_Label_df.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA0F191D591000CE6051 /* ccShader_Label_df.frag */; }; 5034CA4B191D591100CE6051 /* ccShader_Label_df_glow.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA10191D591000CE6051 /* ccShader_Label_df_glow.frag */; }; 5034CA4C191D591100CE6051 /* ccShader_Label_df_glow.frag in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA10191D591000CE6051 /* ccShader_Label_df_glow.frag */; }; - 5034CA4D191D591100CE6051 /* ccGLStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA11191D591000CE6051 /* ccGLStateCache.h */; }; - 5034CA4E191D591100CE6051 /* ccGLStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA11191D591000CE6051 /* ccGLStateCache.h */; }; - 5034CA4F191D591100CE6051 /* ccGLStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034CA12191D591000CE6051 /* ccGLStateCache.cpp */; }; - 5034CA50191D591100CE6051 /* ccGLStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034CA12191D591000CE6051 /* ccGLStateCache.cpp */; }; - 5034CA51191D591100CE6051 /* CCGLProgramStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA13191D591000CE6051 /* CCGLProgramStateCache.h */; }; - 5034CA52191D591100CE6051 /* CCGLProgramStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA13191D591000CE6051 /* CCGLProgramStateCache.h */; }; - 5034CA53191D591100CE6051 /* CCGLProgramStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034CA14191D591000CE6051 /* CCGLProgramStateCache.cpp */; }; - 5034CA54191D591100CE6051 /* CCGLProgramStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034CA14191D591000CE6051 /* CCGLProgramStateCache.cpp */; }; - 5034CA55191D591100CE6051 /* CCGLProgramState.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA15191D591000CE6051 /* CCGLProgramState.h */; }; - 5034CA56191D591100CE6051 /* CCGLProgramState.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA15191D591000CE6051 /* CCGLProgramState.h */; }; - 5034CA57191D591100CE6051 /* CCGLProgramState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034CA16191D591000CE6051 /* CCGLProgramState.cpp */; }; - 5034CA58191D591100CE6051 /* CCGLProgramState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034CA16191D591000CE6051 /* CCGLProgramState.cpp */; }; - 5034CA59191D591100CE6051 /* CCGLProgram.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA17191D591000CE6051 /* CCGLProgram.h */; }; - 5034CA5A191D591100CE6051 /* CCGLProgram.h in Headers */ = {isa = PBXBuildFile; fileRef = 5034CA17191D591000CE6051 /* CCGLProgram.h */; }; - 5034CA5B191D591100CE6051 /* CCGLProgram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034CA18191D591000CE6051 /* CCGLProgram.cpp */; }; - 5034CA5C191D591100CE6051 /* CCGLProgram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5034CA18191D591000CE6051 /* CCGLProgram.cpp */; }; + 503DD8E01926736A00CD74DD /* CCApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8CE1926736A00CD74DD /* CCApplication.h */; }; + 503DD8E11926736A00CD74DD /* CCApplication.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8CF1926736A00CD74DD /* CCApplication.mm */; }; + 503DD8E21926736A00CD74DD /* CCCommon.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8D01926736A00CD74DD /* CCCommon.mm */; }; + 503DD8E31926736A00CD74DD /* CCDevice.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8D11926736A00CD74DD /* CCDevice.mm */; }; + 503DD8E41926736A00CD74DD /* CCDirectorCaller.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8D21926736A00CD74DD /* CCDirectorCaller.h */; }; + 503DD8E51926736A00CD74DD /* CCDirectorCaller.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8D31926736A00CD74DD /* CCDirectorCaller.mm */; }; + 503DD8E61926736A00CD74DD /* CCEAGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8D41926736A00CD74DD /* CCEAGLView.h */; }; + 503DD8E71926736A00CD74DD /* CCEAGLView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8D51926736A00CD74DD /* CCEAGLView.mm */; }; + 503DD8E81926736A00CD74DD /* CCES2Renderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8D61926736A00CD74DD /* CCES2Renderer.h */; }; + 503DD8E91926736A00CD74DD /* CCES2Renderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8D71926736A00CD74DD /* CCES2Renderer.m */; }; + 503DD8EA1926736A00CD74DD /* CCESRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8D81926736A00CD74DD /* CCESRenderer.h */; }; + 503DD8EB1926736A00CD74DD /* CCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8D91926736A00CD74DD /* CCGL.h */; }; + 503DD8EC1926736A00CD74DD /* CCGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8DA1926736A00CD74DD /* CCGLView.h */; }; + 503DD8ED1926736A00CD74DD /* CCGLView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8DB1926736A00CD74DD /* CCGLView.mm */; }; + 503DD8EE1926736A00CD74DD /* CCImage.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8DC1926736A00CD74DD /* CCImage.mm */; }; + 503DD8EF1926736A00CD74DD /* CCPlatformDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8DD1926736A00CD74DD /* CCPlatformDefine.h */; }; + 503DD8F01926736A00CD74DD /* CCStdC.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8DE1926736A00CD74DD /* CCStdC.h */; }; + 503DD8F11926736A00CD74DD /* OpenGL_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8DF1926736A00CD74DD /* OpenGL_Internal.h */; }; + 503DD8F51926B0DB00CD74DD /* CCIMEDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8F21926B0DB00CD74DD /* CCIMEDelegate.h */; }; + 503DD8F61926B0DB00CD74DD /* CCIMEDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8F21926B0DB00CD74DD /* CCIMEDelegate.h */; }; + 503DD8F71926B0DB00CD74DD /* CCIMEDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8F31926B0DB00CD74DD /* CCIMEDispatcher.cpp */; }; + 503DD8F81926B0DB00CD74DD /* CCIMEDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 503DD8F31926B0DB00CD74DD /* CCIMEDispatcher.cpp */; }; + 503DD8F91926B0DB00CD74DD /* CCIMEDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8F41926B0DB00CD74DD /* CCIMEDispatcher.h */; }; + 503DD8FA1926B0DB00CD74DD /* CCIMEDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 503DD8F41926B0DB00CD74DD /* CCIMEDispatcher.h */; }; + 50ABBD381925AB0000A911A9 /* CCAffineTransform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD1B1925AB0000A911A9 /* CCAffineTransform.cpp */; }; + 50ABBD391925AB0000A911A9 /* CCAffineTransform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD1B1925AB0000A911A9 /* CCAffineTransform.cpp */; }; + 50ABBD3A1925AB0000A911A9 /* CCAffineTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD1C1925AB0000A911A9 /* CCAffineTransform.h */; }; + 50ABBD3B1925AB0000A911A9 /* CCAffineTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD1C1925AB0000A911A9 /* CCAffineTransform.h */; }; + 50ABBD3C1925AB0000A911A9 /* CCGeometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD1D1925AB0000A911A9 /* CCGeometry.cpp */; }; + 50ABBD3D1925AB0000A911A9 /* CCGeometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD1D1925AB0000A911A9 /* CCGeometry.cpp */; }; + 50ABBD3E1925AB0000A911A9 /* CCGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD1E1925AB0000A911A9 /* CCGeometry.h */; }; + 50ABBD3F1925AB0000A911A9 /* CCGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD1E1925AB0000A911A9 /* CCGeometry.h */; }; + 50ABBD401925AB0000A911A9 /* CCMath.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD1F1925AB0000A911A9 /* CCMath.h */; }; + 50ABBD411925AB0000A911A9 /* CCMath.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD1F1925AB0000A911A9 /* CCMath.h */; }; + 50ABBD421925AB0000A911A9 /* CCMathBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD201925AB0000A911A9 /* CCMathBase.h */; }; + 50ABBD431925AB0000A911A9 /* CCMathBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD201925AB0000A911A9 /* CCMathBase.h */; }; + 50ABBD441925AB0000A911A9 /* CCVertex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD211925AB0000A911A9 /* CCVertex.cpp */; }; + 50ABBD451925AB0000A911A9 /* CCVertex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD211925AB0000A911A9 /* CCVertex.cpp */; }; + 50ABBD461925AB0000A911A9 /* CCVertex.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD221925AB0000A911A9 /* CCVertex.h */; }; + 50ABBD471925AB0000A911A9 /* CCVertex.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD221925AB0000A911A9 /* CCVertex.h */; }; + 50ABBD481925AB0000A911A9 /* Mat4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD231925AB0000A911A9 /* Mat4.cpp */; }; + 50ABBD491925AB0000A911A9 /* Mat4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD231925AB0000A911A9 /* Mat4.cpp */; }; + 50ABBD4A1925AB0000A911A9 /* Mat4.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD241925AB0000A911A9 /* Mat4.h */; }; + 50ABBD4B1925AB0000A911A9 /* Mat4.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD241925AB0000A911A9 /* Mat4.h */; }; + 50ABBD4C1925AB0000A911A9 /* MathUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD261925AB0000A911A9 /* MathUtil.cpp */; }; + 50ABBD4D1925AB0000A911A9 /* MathUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD261925AB0000A911A9 /* MathUtil.cpp */; }; + 50ABBD4E1925AB0000A911A9 /* MathUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD271925AB0000A911A9 /* MathUtil.h */; }; + 50ABBD4F1925AB0000A911A9 /* MathUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD271925AB0000A911A9 /* MathUtil.h */; }; + 50ABBD501925AB0000A911A9 /* Quaternion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD2A1925AB0000A911A9 /* Quaternion.cpp */; }; + 50ABBD511925AB0000A911A9 /* Quaternion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD2A1925AB0000A911A9 /* Quaternion.cpp */; }; + 50ABBD521925AB0000A911A9 /* Quaternion.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD2B1925AB0000A911A9 /* Quaternion.h */; }; + 50ABBD531925AB0000A911A9 /* Quaternion.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD2B1925AB0000A911A9 /* Quaternion.h */; }; + 50ABBD541925AB0000A911A9 /* TransformUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD2D1925AB0000A911A9 /* TransformUtils.cpp */; }; + 50ABBD551925AB0000A911A9 /* TransformUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD2D1925AB0000A911A9 /* TransformUtils.cpp */; }; + 50ABBD561925AB0000A911A9 /* TransformUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD2E1925AB0000A911A9 /* TransformUtils.h */; }; + 50ABBD571925AB0000A911A9 /* TransformUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD2E1925AB0000A911A9 /* TransformUtils.h */; }; + 50ABBD581925AB0000A911A9 /* Vec2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD2F1925AB0000A911A9 /* Vec2.cpp */; }; + 50ABBD591925AB0000A911A9 /* Vec2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD2F1925AB0000A911A9 /* Vec2.cpp */; }; + 50ABBD5A1925AB0000A911A9 /* Vec2.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD301925AB0000A911A9 /* Vec2.h */; }; + 50ABBD5B1925AB0000A911A9 /* Vec2.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD301925AB0000A911A9 /* Vec2.h */; }; + 50ABBD5C1925AB0000A911A9 /* Vec3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD321925AB0000A911A9 /* Vec3.cpp */; }; + 50ABBD5D1925AB0000A911A9 /* Vec3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD321925AB0000A911A9 /* Vec3.cpp */; }; + 50ABBD5E1925AB0000A911A9 /* Vec3.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD331925AB0000A911A9 /* Vec3.h */; }; + 50ABBD5F1925AB0000A911A9 /* Vec3.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD331925AB0000A911A9 /* Vec3.h */; }; + 50ABBD601925AB0000A911A9 /* Vec4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD351925AB0000A911A9 /* Vec4.cpp */; }; + 50ABBD611925AB0000A911A9 /* Vec4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD351925AB0000A911A9 /* Vec4.cpp */; }; + 50ABBD621925AB0000A911A9 /* Vec4.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD361925AB0000A911A9 /* Vec4.h */; }; + 50ABBD631925AB0000A911A9 /* Vec4.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD361925AB0000A911A9 /* Vec4.h */; }; + 50ABBD831925AB4100A911A9 /* CCBatchCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD641925AB4100A911A9 /* CCBatchCommand.cpp */; }; + 50ABBD841925AB4100A911A9 /* CCBatchCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD641925AB4100A911A9 /* CCBatchCommand.cpp */; }; + 50ABBD851925AB4100A911A9 /* CCBatchCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD651925AB4100A911A9 /* CCBatchCommand.h */; }; + 50ABBD861925AB4100A911A9 /* CCBatchCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD651925AB4100A911A9 /* CCBatchCommand.h */; }; + 50ABBD871925AB4100A911A9 /* CCCustomCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD661925AB4100A911A9 /* CCCustomCommand.cpp */; }; + 50ABBD881925AB4100A911A9 /* CCCustomCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD661925AB4100A911A9 /* CCCustomCommand.cpp */; }; + 50ABBD891925AB4100A911A9 /* CCCustomCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD671925AB4100A911A9 /* CCCustomCommand.h */; }; + 50ABBD8A1925AB4100A911A9 /* CCCustomCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD671925AB4100A911A9 /* CCCustomCommand.h */; }; + 50ABBD8B1925AB4100A911A9 /* CCGLProgram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD681925AB4100A911A9 /* CCGLProgram.cpp */; }; + 50ABBD8C1925AB4100A911A9 /* CCGLProgram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD681925AB4100A911A9 /* CCGLProgram.cpp */; }; + 50ABBD8D1925AB4100A911A9 /* CCGLProgram.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD691925AB4100A911A9 /* CCGLProgram.h */; }; + 50ABBD8E1925AB4100A911A9 /* CCGLProgram.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD691925AB4100A911A9 /* CCGLProgram.h */; }; + 50ABBD8F1925AB4100A911A9 /* CCGLProgramCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD6A1925AB4100A911A9 /* CCGLProgramCache.cpp */; }; + 50ABBD901925AB4100A911A9 /* CCGLProgramCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD6A1925AB4100A911A9 /* CCGLProgramCache.cpp */; }; + 50ABBD911925AB4100A911A9 /* CCGLProgramCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD6B1925AB4100A911A9 /* CCGLProgramCache.h */; }; + 50ABBD921925AB4100A911A9 /* CCGLProgramCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD6B1925AB4100A911A9 /* CCGLProgramCache.h */; }; + 50ABBD931925AB4100A911A9 /* CCGLProgramState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD6C1925AB4100A911A9 /* CCGLProgramState.cpp */; }; + 50ABBD941925AB4100A911A9 /* CCGLProgramState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD6C1925AB4100A911A9 /* CCGLProgramState.cpp */; }; + 50ABBD951925AB4100A911A9 /* CCGLProgramState.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD6D1925AB4100A911A9 /* CCGLProgramState.h */; }; + 50ABBD961925AB4100A911A9 /* CCGLProgramState.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD6D1925AB4100A911A9 /* CCGLProgramState.h */; }; + 50ABBD971925AB4100A911A9 /* CCGLProgramStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD6E1925AB4100A911A9 /* CCGLProgramStateCache.cpp */; }; + 50ABBD981925AB4100A911A9 /* CCGLProgramStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD6E1925AB4100A911A9 /* CCGLProgramStateCache.cpp */; }; + 50ABBD991925AB4100A911A9 /* CCGLProgramStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD6F1925AB4100A911A9 /* CCGLProgramStateCache.h */; }; + 50ABBD9A1925AB4100A911A9 /* CCGLProgramStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD6F1925AB4100A911A9 /* CCGLProgramStateCache.h */; }; + 50ABBD9B1925AB4100A911A9 /* ccGLStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD701925AB4100A911A9 /* ccGLStateCache.cpp */; }; + 50ABBD9C1925AB4100A911A9 /* ccGLStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD701925AB4100A911A9 /* ccGLStateCache.cpp */; }; + 50ABBD9D1925AB4100A911A9 /* ccGLStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD711925AB4100A911A9 /* ccGLStateCache.h */; }; + 50ABBD9E1925AB4100A911A9 /* ccGLStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD711925AB4100A911A9 /* ccGLStateCache.h */; }; + 50ABBD9F1925AB4100A911A9 /* CCGroupCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD721925AB4100A911A9 /* CCGroupCommand.cpp */; }; + 50ABBDA01925AB4100A911A9 /* CCGroupCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD721925AB4100A911A9 /* CCGroupCommand.cpp */; }; + 50ABBDA11925AB4100A911A9 /* CCGroupCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD731925AB4100A911A9 /* CCGroupCommand.h */; }; + 50ABBDA21925AB4100A911A9 /* CCGroupCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD731925AB4100A911A9 /* CCGroupCommand.h */; }; + 50ABBDA31925AB4100A911A9 /* CCQuadCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD741925AB4100A911A9 /* CCQuadCommand.cpp */; }; + 50ABBDA41925AB4100A911A9 /* CCQuadCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD741925AB4100A911A9 /* CCQuadCommand.cpp */; }; + 50ABBDA51925AB4100A911A9 /* CCQuadCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD751925AB4100A911A9 /* CCQuadCommand.h */; }; + 50ABBDA61925AB4100A911A9 /* CCQuadCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD751925AB4100A911A9 /* CCQuadCommand.h */; }; + 50ABBDA71925AB4100A911A9 /* CCRenderCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD761925AB4100A911A9 /* CCRenderCommand.cpp */; }; + 50ABBDA81925AB4100A911A9 /* CCRenderCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD761925AB4100A911A9 /* CCRenderCommand.cpp */; }; + 50ABBDA91925AB4100A911A9 /* CCRenderCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD771925AB4100A911A9 /* CCRenderCommand.h */; }; + 50ABBDAA1925AB4100A911A9 /* CCRenderCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD771925AB4100A911A9 /* CCRenderCommand.h */; }; + 50ABBDAB1925AB4100A911A9 /* CCRenderCommandPool.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD781925AB4100A911A9 /* CCRenderCommandPool.h */; }; + 50ABBDAC1925AB4100A911A9 /* CCRenderCommandPool.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD781925AB4100A911A9 /* CCRenderCommandPool.h */; }; + 50ABBDAD1925AB4100A911A9 /* CCRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD791925AB4100A911A9 /* CCRenderer.cpp */; }; + 50ABBDAE1925AB4100A911A9 /* CCRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD791925AB4100A911A9 /* CCRenderer.cpp */; }; + 50ABBDAF1925AB4100A911A9 /* CCRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD7A1925AB4100A911A9 /* CCRenderer.h */; }; + 50ABBDB01925AB4100A911A9 /* CCRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD7A1925AB4100A911A9 /* CCRenderer.h */; }; + 50ABBDB11925AB4100A911A9 /* ccShaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD7B1925AB4100A911A9 /* ccShaders.cpp */; }; + 50ABBDB21925AB4100A911A9 /* ccShaders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD7B1925AB4100A911A9 /* ccShaders.cpp */; }; + 50ABBDB31925AB4100A911A9 /* ccShaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD7C1925AB4100A911A9 /* ccShaders.h */; }; + 50ABBDB41925AB4100A911A9 /* ccShaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD7C1925AB4100A911A9 /* ccShaders.h */; }; + 50ABBDB51925AB4100A911A9 /* CCTexture2D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD7D1925AB4100A911A9 /* CCTexture2D.cpp */; }; + 50ABBDB61925AB4100A911A9 /* CCTexture2D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD7D1925AB4100A911A9 /* CCTexture2D.cpp */; }; + 50ABBDB71925AB4100A911A9 /* CCTexture2D.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD7E1925AB4100A911A9 /* CCTexture2D.h */; }; + 50ABBDB81925AB4100A911A9 /* CCTexture2D.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD7E1925AB4100A911A9 /* CCTexture2D.h */; }; + 50ABBDB91925AB4100A911A9 /* CCTextureAtlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD7F1925AB4100A911A9 /* CCTextureAtlas.cpp */; }; + 50ABBDBA1925AB4100A911A9 /* CCTextureAtlas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD7F1925AB4100A911A9 /* CCTextureAtlas.cpp */; }; + 50ABBDBB1925AB4100A911A9 /* CCTextureAtlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD801925AB4100A911A9 /* CCTextureAtlas.h */; }; + 50ABBDBC1925AB4100A911A9 /* CCTextureAtlas.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD801925AB4100A911A9 /* CCTextureAtlas.h */; }; + 50ABBDBD1925AB4100A911A9 /* CCTextureCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD811925AB4100A911A9 /* CCTextureCache.cpp */; }; + 50ABBDBE1925AB4100A911A9 /* CCTextureCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD811925AB4100A911A9 /* CCTextureCache.cpp */; }; + 50ABBDBF1925AB4100A911A9 /* CCTextureCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD821925AB4100A911A9 /* CCTextureCache.h */; }; + 50ABBDC01925AB4100A911A9 /* CCTextureCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD821925AB4100A911A9 /* CCTextureCache.h */; }; + 50ABBE1F1925AB6F00A911A9 /* atitc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDC11925AB6E00A911A9 /* atitc.cpp */; }; + 50ABBE201925AB6F00A911A9 /* atitc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDC11925AB6E00A911A9 /* atitc.cpp */; }; + 50ABBE211925AB6F00A911A9 /* atitc.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDC21925AB6E00A911A9 /* atitc.h */; }; + 50ABBE221925AB6F00A911A9 /* atitc.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDC21925AB6E00A911A9 /* atitc.h */; }; + 50ABBE231925AB6F00A911A9 /* base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDC31925AB6E00A911A9 /* base64.cpp */; }; + 50ABBE241925AB6F00A911A9 /* base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDC31925AB6E00A911A9 /* base64.cpp */; }; + 50ABBE251925AB6F00A911A9 /* base64.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDC41925AB6E00A911A9 /* base64.h */; }; + 50ABBE261925AB6F00A911A9 /* base64.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDC41925AB6E00A911A9 /* base64.h */; }; + 50ABBE271925AB6F00A911A9 /* CCAutoreleasePool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDC51925AB6E00A911A9 /* CCAutoreleasePool.cpp */; }; + 50ABBE281925AB6F00A911A9 /* CCAutoreleasePool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDC51925AB6E00A911A9 /* CCAutoreleasePool.cpp */; }; + 50ABBE291925AB6F00A911A9 /* CCAutoreleasePool.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDC61925AB6E00A911A9 /* CCAutoreleasePool.h */; }; + 50ABBE2A1925AB6F00A911A9 /* CCAutoreleasePool.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDC61925AB6E00A911A9 /* CCAutoreleasePool.h */; }; + 50ABBE2B1925AB6F00A911A9 /* ccCArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDC71925AB6E00A911A9 /* ccCArray.cpp */; }; + 50ABBE2C1925AB6F00A911A9 /* ccCArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDC71925AB6E00A911A9 /* ccCArray.cpp */; }; + 50ABBE2D1925AB6F00A911A9 /* ccCArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDC81925AB6E00A911A9 /* ccCArray.h */; }; + 50ABBE2E1925AB6F00A911A9 /* ccCArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDC81925AB6E00A911A9 /* ccCArray.h */; }; + 50ABBE2F1925AB6F00A911A9 /* ccConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDC91925AB6E00A911A9 /* ccConfig.h */; }; + 50ABBE301925AB6F00A911A9 /* ccConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDC91925AB6E00A911A9 /* ccConfig.h */; }; + 50ABBE311925AB6F00A911A9 /* CCConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDCA1925AB6E00A911A9 /* CCConfiguration.cpp */; }; + 50ABBE321925AB6F00A911A9 /* CCConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDCA1925AB6E00A911A9 /* CCConfiguration.cpp */; }; + 50ABBE331925AB6F00A911A9 /* CCConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDCB1925AB6E00A911A9 /* CCConfiguration.h */; }; + 50ABBE341925AB6F00A911A9 /* CCConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDCB1925AB6E00A911A9 /* CCConfiguration.h */; }; + 50ABBE351925AB6F00A911A9 /* CCConsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDCC1925AB6E00A911A9 /* CCConsole.cpp */; }; + 50ABBE361925AB6F00A911A9 /* CCConsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDCC1925AB6E00A911A9 /* CCConsole.cpp */; }; + 50ABBE371925AB6F00A911A9 /* CCConsole.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDCD1925AB6E00A911A9 /* CCConsole.h */; }; + 50ABBE381925AB6F00A911A9 /* CCConsole.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDCD1925AB6E00A911A9 /* CCConsole.h */; }; + 50ABBE391925AB6F00A911A9 /* CCData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDCE1925AB6E00A911A9 /* CCData.cpp */; }; + 50ABBE3A1925AB6F00A911A9 /* CCData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDCE1925AB6E00A911A9 /* CCData.cpp */; }; + 50ABBE3B1925AB6F00A911A9 /* CCData.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDCF1925AB6E00A911A9 /* CCData.h */; }; + 50ABBE3C1925AB6F00A911A9 /* CCData.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDCF1925AB6E00A911A9 /* CCData.h */; }; + 50ABBE3D1925AB6F00A911A9 /* CCDataVisitor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDD01925AB6E00A911A9 /* CCDataVisitor.cpp */; }; + 50ABBE3E1925AB6F00A911A9 /* CCDataVisitor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDD01925AB6E00A911A9 /* CCDataVisitor.cpp */; }; + 50ABBE3F1925AB6F00A911A9 /* CCDataVisitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDD11925AB6E00A911A9 /* CCDataVisitor.h */; }; + 50ABBE401925AB6F00A911A9 /* CCDataVisitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDD11925AB6E00A911A9 /* CCDataVisitor.h */; }; + 50ABBE411925AB6F00A911A9 /* CCDirector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDD21925AB6E00A911A9 /* CCDirector.cpp */; }; + 50ABBE421925AB6F00A911A9 /* CCDirector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDD21925AB6E00A911A9 /* CCDirector.cpp */; }; + 50ABBE431925AB6F00A911A9 /* CCDirector.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDD31925AB6E00A911A9 /* CCDirector.h */; }; + 50ABBE441925AB6F00A911A9 /* CCDirector.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDD31925AB6E00A911A9 /* CCDirector.h */; }; + 50ABBE451925AB6F00A911A9 /* CCEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDD41925AB6E00A911A9 /* CCEvent.cpp */; }; + 50ABBE461925AB6F00A911A9 /* CCEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDD41925AB6E00A911A9 /* CCEvent.cpp */; }; + 50ABBE471925AB6F00A911A9 /* CCEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDD51925AB6E00A911A9 /* CCEvent.h */; }; + 50ABBE481925AB6F00A911A9 /* CCEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDD51925AB6E00A911A9 /* CCEvent.h */; }; + 50ABBE491925AB6F00A911A9 /* CCEventAcceleration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDD61925AB6E00A911A9 /* CCEventAcceleration.cpp */; }; + 50ABBE4A1925AB6F00A911A9 /* CCEventAcceleration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDD61925AB6E00A911A9 /* CCEventAcceleration.cpp */; }; + 50ABBE4B1925AB6F00A911A9 /* CCEventAcceleration.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDD71925AB6E00A911A9 /* CCEventAcceleration.h */; }; + 50ABBE4C1925AB6F00A911A9 /* CCEventAcceleration.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDD71925AB6E00A911A9 /* CCEventAcceleration.h */; }; + 50ABBE4D1925AB6F00A911A9 /* CCEventCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDD81925AB6E00A911A9 /* CCEventCustom.cpp */; }; + 50ABBE4E1925AB6F00A911A9 /* CCEventCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDD81925AB6E00A911A9 /* CCEventCustom.cpp */; }; + 50ABBE4F1925AB6F00A911A9 /* CCEventCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDD91925AB6E00A911A9 /* CCEventCustom.h */; }; + 50ABBE501925AB6F00A911A9 /* CCEventCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDD91925AB6E00A911A9 /* CCEventCustom.h */; }; + 50ABBE511925AB6F00A911A9 /* CCEventDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDDA1925AB6E00A911A9 /* CCEventDispatcher.cpp */; }; + 50ABBE521925AB6F00A911A9 /* CCEventDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDDA1925AB6E00A911A9 /* CCEventDispatcher.cpp */; }; + 50ABBE531925AB6F00A911A9 /* CCEventDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDDB1925AB6E00A911A9 /* CCEventDispatcher.h */; }; + 50ABBE541925AB6F00A911A9 /* CCEventDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDDB1925AB6E00A911A9 /* CCEventDispatcher.h */; }; + 50ABBE551925AB6F00A911A9 /* CCEventFocus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDDC1925AB6E00A911A9 /* CCEventFocus.cpp */; }; + 50ABBE561925AB6F00A911A9 /* CCEventFocus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDDC1925AB6E00A911A9 /* CCEventFocus.cpp */; }; + 50ABBE571925AB6F00A911A9 /* CCEventFocus.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDDD1925AB6E00A911A9 /* CCEventFocus.h */; }; + 50ABBE581925AB6F00A911A9 /* CCEventFocus.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDDD1925AB6E00A911A9 /* CCEventFocus.h */; }; + 50ABBE591925AB6F00A911A9 /* CCEventKeyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDDE1925AB6E00A911A9 /* CCEventKeyboard.cpp */; }; + 50ABBE5A1925AB6F00A911A9 /* CCEventKeyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDDE1925AB6E00A911A9 /* CCEventKeyboard.cpp */; }; + 50ABBE5B1925AB6F00A911A9 /* CCEventKeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDDF1925AB6E00A911A9 /* CCEventKeyboard.h */; }; + 50ABBE5C1925AB6F00A911A9 /* CCEventKeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDDF1925AB6E00A911A9 /* CCEventKeyboard.h */; }; + 50ABBE5D1925AB6F00A911A9 /* CCEventListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDE01925AB6E00A911A9 /* CCEventListener.cpp */; }; + 50ABBE5E1925AB6F00A911A9 /* CCEventListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDE01925AB6E00A911A9 /* CCEventListener.cpp */; }; + 50ABBE5F1925AB6F00A911A9 /* CCEventListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDE11925AB6E00A911A9 /* CCEventListener.h */; }; + 50ABBE601925AB6F00A911A9 /* CCEventListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDE11925AB6E00A911A9 /* CCEventListener.h */; }; + 50ABBE611925AB6F00A911A9 /* CCEventListenerAcceleration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDE21925AB6E00A911A9 /* CCEventListenerAcceleration.cpp */; }; + 50ABBE621925AB6F00A911A9 /* CCEventListenerAcceleration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDE21925AB6E00A911A9 /* CCEventListenerAcceleration.cpp */; }; + 50ABBE631925AB6F00A911A9 /* CCEventListenerAcceleration.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDE31925AB6E00A911A9 /* CCEventListenerAcceleration.h */; }; + 50ABBE641925AB6F00A911A9 /* CCEventListenerAcceleration.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDE31925AB6E00A911A9 /* CCEventListenerAcceleration.h */; }; + 50ABBE651925AB6F00A911A9 /* CCEventListenerCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDE41925AB6E00A911A9 /* CCEventListenerCustom.cpp */; }; + 50ABBE661925AB6F00A911A9 /* CCEventListenerCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDE41925AB6E00A911A9 /* CCEventListenerCustom.cpp */; }; + 50ABBE671925AB6F00A911A9 /* CCEventListenerCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDE51925AB6E00A911A9 /* CCEventListenerCustom.h */; }; + 50ABBE681925AB6F00A911A9 /* CCEventListenerCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDE51925AB6E00A911A9 /* CCEventListenerCustom.h */; }; + 50ABBE691925AB6F00A911A9 /* CCEventListenerFocus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDE61925AB6E00A911A9 /* CCEventListenerFocus.cpp */; }; + 50ABBE6A1925AB6F00A911A9 /* CCEventListenerFocus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDE61925AB6E00A911A9 /* CCEventListenerFocus.cpp */; }; + 50ABBE6B1925AB6F00A911A9 /* CCEventListenerFocus.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDE71925AB6E00A911A9 /* CCEventListenerFocus.h */; }; + 50ABBE6C1925AB6F00A911A9 /* CCEventListenerFocus.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDE71925AB6E00A911A9 /* CCEventListenerFocus.h */; }; + 50ABBE6D1925AB6F00A911A9 /* CCEventListenerKeyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDE81925AB6E00A911A9 /* CCEventListenerKeyboard.cpp */; }; + 50ABBE6E1925AB6F00A911A9 /* CCEventListenerKeyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDE81925AB6E00A911A9 /* CCEventListenerKeyboard.cpp */; }; + 50ABBE6F1925AB6F00A911A9 /* CCEventListenerKeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDE91925AB6E00A911A9 /* CCEventListenerKeyboard.h */; }; + 50ABBE701925AB6F00A911A9 /* CCEventListenerKeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDE91925AB6E00A911A9 /* CCEventListenerKeyboard.h */; }; + 50ABBE711925AB6F00A911A9 /* CCEventListenerMouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDEA1925AB6E00A911A9 /* CCEventListenerMouse.cpp */; }; + 50ABBE721925AB6F00A911A9 /* CCEventListenerMouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDEA1925AB6E00A911A9 /* CCEventListenerMouse.cpp */; }; + 50ABBE731925AB6F00A911A9 /* CCEventListenerMouse.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDEB1925AB6E00A911A9 /* CCEventListenerMouse.h */; }; + 50ABBE741925AB6F00A911A9 /* CCEventListenerMouse.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDEB1925AB6E00A911A9 /* CCEventListenerMouse.h */; }; + 50ABBE751925AB6F00A911A9 /* CCEventListenerTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDEC1925AB6E00A911A9 /* CCEventListenerTouch.cpp */; }; + 50ABBE761925AB6F00A911A9 /* CCEventListenerTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDEC1925AB6E00A911A9 /* CCEventListenerTouch.cpp */; }; + 50ABBE771925AB6F00A911A9 /* CCEventListenerTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDED1925AB6E00A911A9 /* CCEventListenerTouch.h */; }; + 50ABBE781925AB6F00A911A9 /* CCEventListenerTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDED1925AB6E00A911A9 /* CCEventListenerTouch.h */; }; + 50ABBE791925AB6F00A911A9 /* CCEventMouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDEE1925AB6E00A911A9 /* CCEventMouse.cpp */; }; + 50ABBE7A1925AB6F00A911A9 /* CCEventMouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDEE1925AB6E00A911A9 /* CCEventMouse.cpp */; }; + 50ABBE7B1925AB6F00A911A9 /* CCEventMouse.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDEF1925AB6E00A911A9 /* CCEventMouse.h */; }; + 50ABBE7C1925AB6F00A911A9 /* CCEventMouse.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDEF1925AB6E00A911A9 /* CCEventMouse.h */; }; + 50ABBE7D1925AB6F00A911A9 /* CCEventTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDF01925AB6E00A911A9 /* CCEventTouch.cpp */; }; + 50ABBE7E1925AB6F00A911A9 /* CCEventTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDF01925AB6E00A911A9 /* CCEventTouch.cpp */; }; + 50ABBE7F1925AB6F00A911A9 /* CCEventTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF11925AB6E00A911A9 /* CCEventTouch.h */; }; + 50ABBE801925AB6F00A911A9 /* CCEventTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF11925AB6E00A911A9 /* CCEventTouch.h */; }; + 50ABBE811925AB6F00A911A9 /* CCEventType.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF21925AB6E00A911A9 /* CCEventType.h */; }; + 50ABBE821925AB6F00A911A9 /* CCEventType.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF21925AB6E00A911A9 /* CCEventType.h */; }; + 50ABBE831925AB6F00A911A9 /* ccFPSImages.c in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDF31925AB6E00A911A9 /* ccFPSImages.c */; }; + 50ABBE841925AB6F00A911A9 /* ccFPSImages.c in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDF31925AB6E00A911A9 /* ccFPSImages.c */; }; + 50ABBE851925AB6F00A911A9 /* ccFPSImages.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF41925AB6E00A911A9 /* ccFPSImages.h */; }; + 50ABBE861925AB6F00A911A9 /* ccFPSImages.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF41925AB6E00A911A9 /* ccFPSImages.h */; }; + 50ABBE871925AB6F00A911A9 /* ccMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF51925AB6E00A911A9 /* ccMacros.h */; }; + 50ABBE881925AB6F00A911A9 /* ccMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF51925AB6E00A911A9 /* ccMacros.h */; }; + 50ABBE891925AB6F00A911A9 /* CCMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF61925AB6E00A911A9 /* CCMap.h */; }; + 50ABBE8A1925AB6F00A911A9 /* CCMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF61925AB6E00A911A9 /* CCMap.h */; }; + 50ABBE8B1925AB6F00A911A9 /* CCNS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDF71925AB6E00A911A9 /* CCNS.cpp */; }; + 50ABBE8C1925AB6F00A911A9 /* CCNS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDF71925AB6E00A911A9 /* CCNS.cpp */; }; + 50ABBE8D1925AB6F00A911A9 /* CCNS.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF81925AB6E00A911A9 /* CCNS.h */; }; + 50ABBE8E1925AB6F00A911A9 /* CCNS.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF81925AB6E00A911A9 /* CCNS.h */; }; + 50ABBE8F1925AB6F00A911A9 /* CCPlatformConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF91925AB6E00A911A9 /* CCPlatformConfig.h */; }; + 50ABBE901925AB6F00A911A9 /* CCPlatformConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDF91925AB6E00A911A9 /* CCPlatformConfig.h */; }; + 50ABBE911925AB6F00A911A9 /* CCPlatformMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDFA1925AB6E00A911A9 /* CCPlatformMacros.h */; }; + 50ABBE921925AB6F00A911A9 /* CCPlatformMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDFA1925AB6E00A911A9 /* CCPlatformMacros.h */; }; + 50ABBE931925AB6F00A911A9 /* CCProfiling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDFB1925AB6E00A911A9 /* CCProfiling.cpp */; }; + 50ABBE941925AB6F00A911A9 /* CCProfiling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDFB1925AB6E00A911A9 /* CCProfiling.cpp */; }; + 50ABBE951925AB6F00A911A9 /* CCProfiling.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDFC1925AB6E00A911A9 /* CCProfiling.h */; }; + 50ABBE961925AB6F00A911A9 /* CCProfiling.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDFC1925AB6E00A911A9 /* CCProfiling.h */; }; + 50ABBE971925AB6F00A911A9 /* CCProtocols.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDFD1925AB6E00A911A9 /* CCProtocols.h */; }; + 50ABBE981925AB6F00A911A9 /* CCProtocols.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDFD1925AB6E00A911A9 /* CCProtocols.h */; }; + 50ABBE991925AB6F00A911A9 /* CCRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDFE1925AB6E00A911A9 /* CCRef.cpp */; }; + 50ABBE9A1925AB6F00A911A9 /* CCRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBDFE1925AB6E00A911A9 /* CCRef.cpp */; }; + 50ABBE9B1925AB6F00A911A9 /* CCRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDFF1925AB6E00A911A9 /* CCRef.h */; }; + 50ABBE9C1925AB6F00A911A9 /* CCRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBDFF1925AB6E00A911A9 /* CCRef.h */; }; + 50ABBE9D1925AB6F00A911A9 /* CCRefPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE001925AB6E00A911A9 /* CCRefPtr.h */; }; + 50ABBE9E1925AB6F00A911A9 /* CCRefPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE001925AB6E00A911A9 /* CCRefPtr.h */; }; + 50ABBE9F1925AB6F00A911A9 /* CCScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE011925AB6E00A911A9 /* CCScheduler.cpp */; }; + 50ABBEA01925AB6F00A911A9 /* CCScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE011925AB6E00A911A9 /* CCScheduler.cpp */; }; + 50ABBEA11925AB6F00A911A9 /* CCScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE021925AB6E00A911A9 /* CCScheduler.h */; }; + 50ABBEA21925AB6F00A911A9 /* CCScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE021925AB6E00A911A9 /* CCScheduler.h */; }; + 50ABBEA31925AB6F00A911A9 /* CCScriptSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE031925AB6E00A911A9 /* CCScriptSupport.cpp */; }; + 50ABBEA41925AB6F00A911A9 /* CCScriptSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE031925AB6E00A911A9 /* CCScriptSupport.cpp */; }; + 50ABBEA51925AB6F00A911A9 /* CCScriptSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE041925AB6E00A911A9 /* CCScriptSupport.h */; }; + 50ABBEA61925AB6F00A911A9 /* CCScriptSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE041925AB6E00A911A9 /* CCScriptSupport.h */; }; + 50ABBEA71925AB6F00A911A9 /* CCTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE051925AB6E00A911A9 /* CCTouch.cpp */; }; + 50ABBEA81925AB6F00A911A9 /* CCTouch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE051925AB6E00A911A9 /* CCTouch.cpp */; }; + 50ABBEA91925AB6F00A911A9 /* CCTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE061925AB6E00A911A9 /* CCTouch.h */; }; + 50ABBEAA1925AB6F00A911A9 /* CCTouch.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE061925AB6E00A911A9 /* CCTouch.h */; }; + 50ABBEAB1925AB6F00A911A9 /* ccTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE071925AB6E00A911A9 /* ccTypes.cpp */; }; + 50ABBEAC1925AB6F00A911A9 /* ccTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE071925AB6E00A911A9 /* ccTypes.cpp */; }; + 50ABBEAD1925AB6F00A911A9 /* ccTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE081925AB6E00A911A9 /* ccTypes.h */; }; + 50ABBEAE1925AB6F00A911A9 /* ccTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE081925AB6E00A911A9 /* ccTypes.h */; }; + 50ABBEAF1925AB6F00A911A9 /* CCUserDefault.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE091925AB6E00A911A9 /* CCUserDefault.cpp */; }; + 50ABBEB01925AB6F00A911A9 /* CCUserDefault.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE091925AB6E00A911A9 /* CCUserDefault.cpp */; }; + 50ABBEB11925AB6F00A911A9 /* CCUserDefault.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE0A1925AB6E00A911A9 /* CCUserDefault.h */; }; + 50ABBEB21925AB6F00A911A9 /* CCUserDefault.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE0A1925AB6E00A911A9 /* CCUserDefault.h */; }; + 50ABBEB31925AB6F00A911A9 /* CCUserDefault.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0B1925AB6F00A911A9 /* CCUserDefault.mm */; }; + 50ABBEB41925AB6F00A911A9 /* CCUserDefault.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0B1925AB6F00A911A9 /* CCUserDefault.mm */; }; + 50ABBEB51925AB6F00A911A9 /* CCUserDefaultAndroid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0C1925AB6F00A911A9 /* CCUserDefaultAndroid.cpp */; }; + 50ABBEB61925AB6F00A911A9 /* CCUserDefaultAndroid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0C1925AB6F00A911A9 /* CCUserDefaultAndroid.cpp */; }; + 50ABBEB71925AB6F00A911A9 /* ccUTF8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0D1925AB6F00A911A9 /* ccUTF8.cpp */; }; + 50ABBEB81925AB6F00A911A9 /* ccUTF8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0D1925AB6F00A911A9 /* ccUTF8.cpp */; }; + 50ABBEB91925AB6F00A911A9 /* ccUTF8.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE0E1925AB6F00A911A9 /* ccUTF8.h */; }; + 50ABBEBA1925AB6F00A911A9 /* ccUTF8.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE0E1925AB6F00A911A9 /* ccUTF8.h */; }; + 50ABBEBB1925AB6F00A911A9 /* ccUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0F1925AB6F00A911A9 /* ccUtils.cpp */; }; + 50ABBEBC1925AB6F00A911A9 /* ccUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE0F1925AB6F00A911A9 /* ccUtils.cpp */; }; + 50ABBEBD1925AB6F00A911A9 /* ccUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE101925AB6F00A911A9 /* ccUtils.h */; }; + 50ABBEBE1925AB6F00A911A9 /* ccUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE101925AB6F00A911A9 /* ccUtils.h */; }; + 50ABBEBF1925AB6F00A911A9 /* CCValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE111925AB6F00A911A9 /* CCValue.cpp */; }; + 50ABBEC01925AB6F00A911A9 /* CCValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE111925AB6F00A911A9 /* CCValue.cpp */; }; + 50ABBEC11925AB6F00A911A9 /* CCValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE121925AB6F00A911A9 /* CCValue.h */; }; + 50ABBEC21925AB6F00A911A9 /* CCValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE121925AB6F00A911A9 /* CCValue.h */; }; + 50ABBEC31925AB6F00A911A9 /* CCVector.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE131925AB6F00A911A9 /* CCVector.h */; }; + 50ABBEC41925AB6F00A911A9 /* CCVector.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE131925AB6F00A911A9 /* CCVector.h */; }; + 50ABBEC51925AB6F00A911A9 /* etc1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE141925AB6F00A911A9 /* etc1.cpp */; }; + 50ABBEC61925AB6F00A911A9 /* etc1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE141925AB6F00A911A9 /* etc1.cpp */; }; + 50ABBEC71925AB6F00A911A9 /* etc1.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE151925AB6F00A911A9 /* etc1.h */; }; + 50ABBEC81925AB6F00A911A9 /* etc1.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE151925AB6F00A911A9 /* etc1.h */; }; + 50ABBEC91925AB6F00A911A9 /* firePngData.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE161925AB6F00A911A9 /* firePngData.h */; }; + 50ABBECA1925AB6F00A911A9 /* firePngData.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE161925AB6F00A911A9 /* firePngData.h */; }; + 50ABBECB1925AB6F00A911A9 /* s3tc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE171925AB6F00A911A9 /* s3tc.cpp */; }; + 50ABBECC1925AB6F00A911A9 /* s3tc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE171925AB6F00A911A9 /* s3tc.cpp */; }; + 50ABBECD1925AB6F00A911A9 /* s3tc.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE181925AB6F00A911A9 /* s3tc.h */; }; + 50ABBECE1925AB6F00A911A9 /* s3tc.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE181925AB6F00A911A9 /* s3tc.h */; }; + 50ABBECF1925AB6F00A911A9 /* TGAlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE191925AB6F00A911A9 /* TGAlib.cpp */; }; + 50ABBED01925AB6F00A911A9 /* TGAlib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE191925AB6F00A911A9 /* TGAlib.cpp */; }; + 50ABBED11925AB6F00A911A9 /* TGAlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE1A1925AB6F00A911A9 /* TGAlib.h */; }; + 50ABBED21925AB6F00A911A9 /* TGAlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE1A1925AB6F00A911A9 /* TGAlib.h */; }; + 50ABBED31925AB6F00A911A9 /* uthash.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE1B1925AB6F00A911A9 /* uthash.h */; }; + 50ABBED41925AB6F00A911A9 /* uthash.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE1B1925AB6F00A911A9 /* uthash.h */; }; + 50ABBED51925AB6F00A911A9 /* utlist.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE1C1925AB6F00A911A9 /* utlist.h */; }; + 50ABBED61925AB6F00A911A9 /* utlist.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE1C1925AB6F00A911A9 /* utlist.h */; }; + 50ABBED71925AB6F00A911A9 /* ZipUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE1D1925AB6F00A911A9 /* ZipUtils.cpp */; }; + 50ABBED81925AB6F00A911A9 /* ZipUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBE1D1925AB6F00A911A9 /* ZipUtils.cpp */; }; + 50ABBED91925AB6F00A911A9 /* ZipUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE1E1925AB6F00A911A9 /* ZipUtils.h */; }; + 50ABBEDA1925AB6F00A911A9 /* ZipUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBE1E1925AB6F00A911A9 /* ZipUtils.h */; }; + 50ABBFFD1926664800A911A9 /* CCFileUtilsApple.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF1B1926664700A911A9 /* CCFileUtilsApple.h */; }; + 50ABBFFE1926664800A911A9 /* CCFileUtilsApple.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF1B1926664700A911A9 /* CCFileUtilsApple.h */; }; + 50ABBFFF1926664800A911A9 /* CCFileUtilsApple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF1C1926664700A911A9 /* CCFileUtilsApple.mm */; }; + 50ABC0001926664800A911A9 /* CCFileUtilsApple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF1C1926664700A911A9 /* CCFileUtilsApple.mm */; }; + 50ABC0011926664800A911A9 /* CCLock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF1D1926664700A911A9 /* CCLock.cpp */; }; + 50ABC0021926664800A911A9 /* CCLock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF1D1926664700A911A9 /* CCLock.cpp */; }; + 50ABC0031926664800A911A9 /* CCLock.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF1E1926664700A911A9 /* CCLock.h */; }; + 50ABC0041926664800A911A9 /* CCLock.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF1E1926664700A911A9 /* CCLock.h */; }; + 50ABC0051926664800A911A9 /* CCThread.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF1F1926664700A911A9 /* CCThread.mm */; }; + 50ABC0061926664800A911A9 /* CCThread.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF1F1926664700A911A9 /* CCThread.mm */; }; + 50ABC0071926664800A911A9 /* CCApplicationProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF201926664700A911A9 /* CCApplicationProtocol.h */; }; + 50ABC0081926664800A911A9 /* CCApplicationProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF201926664700A911A9 /* CCApplicationProtocol.h */; }; + 50ABC0091926664800A911A9 /* CCCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF211926664700A911A9 /* CCCommon.h */; }; + 50ABC00A1926664800A911A9 /* CCCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF211926664700A911A9 /* CCCommon.h */; }; + 50ABC00B1926664800A911A9 /* CCDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF221926664700A911A9 /* CCDevice.h */; }; + 50ABC00C1926664800A911A9 /* CCDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF221926664700A911A9 /* CCDevice.h */; }; + 50ABC00D1926664800A911A9 /* CCFileUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF231926664700A911A9 /* CCFileUtils.cpp */; }; + 50ABC00E1926664800A911A9 /* CCFileUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF231926664700A911A9 /* CCFileUtils.cpp */; }; + 50ABC00F1926664800A911A9 /* CCFileUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF241926664700A911A9 /* CCFileUtils.h */; }; + 50ABC0101926664800A911A9 /* CCFileUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF241926664700A911A9 /* CCFileUtils.h */; }; + 50ABC0111926664800A911A9 /* CCGLViewProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF251926664700A911A9 /* CCGLViewProtocol.cpp */; }; + 50ABC0121926664800A911A9 /* CCGLViewProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF251926664700A911A9 /* CCGLViewProtocol.cpp */; }; + 50ABC0131926664800A911A9 /* CCGLViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF261926664700A911A9 /* CCGLViewProtocol.h */; }; + 50ABC0141926664800A911A9 /* CCGLViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF261926664700A911A9 /* CCGLViewProtocol.h */; }; + 50ABC0151926664800A911A9 /* CCImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF271926664700A911A9 /* CCImage.cpp */; }; + 50ABC0161926664800A911A9 /* CCImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF271926664700A911A9 /* CCImage.cpp */; }; + 50ABC0171926664800A911A9 /* CCImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF281926664700A911A9 /* CCImage.h */; }; + 50ABC0181926664800A911A9 /* CCImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF281926664700A911A9 /* CCImage.h */; }; + 50ABC0191926664800A911A9 /* CCSAXParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF291926664700A911A9 /* CCSAXParser.cpp */; }; + 50ABC01A1926664800A911A9 /* CCSAXParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF291926664700A911A9 /* CCSAXParser.cpp */; }; + 50ABC01B1926664800A911A9 /* CCSAXParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF2A1926664700A911A9 /* CCSAXParser.h */; }; + 50ABC01C1926664800A911A9 /* CCSAXParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF2A1926664700A911A9 /* CCSAXParser.h */; }; + 50ABC01D1926664800A911A9 /* CCThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF2B1926664700A911A9 /* CCThread.cpp */; }; + 50ABC01E1926664800A911A9 /* CCThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF2B1926664700A911A9 /* CCThread.cpp */; }; + 50ABC01F1926664800A911A9 /* CCThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF2C1926664700A911A9 /* CCThread.h */; }; + 50ABC0201926664800A911A9 /* CCThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF2C1926664700A911A9 /* CCThread.h */; }; + 50ABC0211926664800A911A9 /* CCGLView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF2E1926664700A911A9 /* CCGLView.cpp */; }; + 50ABC0231926664800A911A9 /* CCGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF2F1926664700A911A9 /* CCGLView.h */; }; + 50ABC05D1926664800A911A9 /* CCApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF4F1926664700A911A9 /* CCApplication.h */; }; + 50ABC05F1926664800A911A9 /* CCApplication.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF501926664700A911A9 /* CCApplication.mm */; }; + 50ABC0611926664800A911A9 /* CCCommon.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF511926664700A911A9 /* CCCommon.mm */; }; + 50ABC0631926664800A911A9 /* CCDevice.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBF521926664700A911A9 /* CCDevice.mm */; }; + 50ABC0651926664800A911A9 /* CCGL.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF531926664700A911A9 /* CCGL.h */; }; + 50ABC0671926664800A911A9 /* CCPlatformDefine.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF541926664700A911A9 /* CCPlatformDefine.h */; }; + 50ABC0691926664800A911A9 /* CCStdC.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBF551926664700A911A9 /* CCStdC.h */; }; 50E6D30E18DADB5D0051CA34 /* CCProtectedNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D30C18DADB5D0051CA34 /* CCProtectedNode.cpp */; }; 50E6D30F18DADB5D0051CA34 /* CCProtectedNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E6D30D18DADB5D0051CA34 /* CCProtectedNode.h */; }; 50E6D31018DAF01A0051CA34 /* CCProtectedNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50E6D30C18DADB5D0051CA34 /* CCProtectedNode.cpp */; }; @@ -1694,35 +1722,7 @@ 50FCEBCA18C72017004AD434 /* WidgetReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB9118C72017004AD434 /* WidgetReader.h */; }; 50FCEBCB18C72017004AD434 /* WidgetReaderProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB9218C72017004AD434 /* WidgetReaderProtocol.h */; }; 50FCEBCC18C72017004AD434 /* WidgetReaderProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50FCEB9218C72017004AD434 /* WidgetReaderProtocol.h */; }; - A04583F2189053B500E32FE8 /* CCGLView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A04583F0189053B500E32FE8 /* CCGLView.cpp */; }; - A04583F3189053B500E32FE8 /* CCGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = A04583F1189053B500E32FE8 /* CCGLView.h */; }; A07A4CAF1783777C0073F6A7 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1551A342158F2AB200E66CFE /* Foundation.framework */; }; - B2AF2F9518EBAEAE00C5807C /* MathUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AF2F8218EBAEAE00C5807C /* MathUtil.cpp */; }; - B2AF2F9618EBAEAE00C5807C /* MathUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AF2F8218EBAEAE00C5807C /* MathUtil.cpp */; }; - B2AF2F9718EBAEAE00C5807C /* MathUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2F8318EBAEAE00C5807C /* MathUtil.h */; }; - B2AF2F9818EBAEAE00C5807C /* MathUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2F8318EBAEAE00C5807C /* MathUtil.h */; }; - B2AF2F9918EBAEAE00C5807C /* Matrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AF2F8618EBAEAE00C5807C /* Matrix.cpp */; }; - B2AF2F9A18EBAEAE00C5807C /* Matrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AF2F8618EBAEAE00C5807C /* Matrix.cpp */; }; - B2AF2F9B18EBAEAE00C5807C /* Matrix.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2F8718EBAEAE00C5807C /* Matrix.h */; }; - B2AF2F9C18EBAEAE00C5807C /* Matrix.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2F8718EBAEAE00C5807C /* Matrix.h */; }; - B2AF2F9D18EBAEAE00C5807C /* Quaternion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AF2F8918EBAEAE00C5807C /* Quaternion.cpp */; }; - B2AF2F9E18EBAEAE00C5807C /* Quaternion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AF2F8918EBAEAE00C5807C /* Quaternion.cpp */; }; - B2AF2F9F18EBAEAE00C5807C /* Quaternion.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2F8A18EBAEAE00C5807C /* Quaternion.h */; }; - B2AF2FA018EBAEAE00C5807C /* Quaternion.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2F8A18EBAEAE00C5807C /* Quaternion.h */; }; - B2AF2FA118EBAEAE00C5807C /* Vector2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AF2F8C18EBAEAE00C5807C /* Vector2.cpp */; }; - B2AF2FA218EBAEAE00C5807C /* Vector2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AF2F8C18EBAEAE00C5807C /* Vector2.cpp */; }; - B2AF2FA318EBAEAE00C5807C /* Vector2.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2F8D18EBAEAE00C5807C /* Vector2.h */; }; - B2AF2FA418EBAEAE00C5807C /* Vector2.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2F8D18EBAEAE00C5807C /* Vector2.h */; }; - B2AF2FA518EBAEAE00C5807C /* Vector3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AF2F8F18EBAEAE00C5807C /* Vector3.cpp */; }; - B2AF2FA618EBAEAE00C5807C /* Vector3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AF2F8F18EBAEAE00C5807C /* Vector3.cpp */; }; - B2AF2FA718EBAEAE00C5807C /* Vector3.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2F9018EBAEAE00C5807C /* Vector3.h */; }; - B2AF2FA818EBAEAE00C5807C /* Vector3.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2F9018EBAEAE00C5807C /* Vector3.h */; }; - B2AF2FA918EBAEAE00C5807C /* Vector4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AF2F9218EBAEAE00C5807C /* Vector4.cpp */; }; - B2AF2FAA18EBAEAE00C5807C /* Vector4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2AF2F9218EBAEAE00C5807C /* Vector4.cpp */; }; - B2AF2FAB18EBAEAE00C5807C /* Vector4.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2F9318EBAEAE00C5807C /* Vector4.h */; }; - B2AF2FAC18EBAEAE00C5807C /* Vector4.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2F9318EBAEAE00C5807C /* Vector4.h */; }; - B2AF2FB118EBBDA100C5807C /* CCMath.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2FB018EBBDA100C5807C /* CCMath.h */; }; - B2AF2FB218EBBDA100C5807C /* CCMath.h in Headers */ = {isa = PBXBuildFile; fileRef = B2AF2FB018EBBDA100C5807C /* CCMath.h */; }; B37510711823AC9F00B3BA6A /* CCPhysicsBodyInfo_chipmunk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B37510451823AC7B00B3BA6A /* CCPhysicsBodyInfo_chipmunk.cpp */; }; B37510721823AC9F00B3BA6A /* CCPhysicsBodyInfo_chipmunk.h in Headers */ = {isa = PBXBuildFile; fileRef = B37510461823AC7B00B3BA6A /* CCPhysicsBodyInfo_chipmunk.h */; }; B37510731823AC9F00B3BA6A /* CCPhysicsContactInfo_chipmunk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B37510471823AC7B00B3BA6A /* CCPhysicsContactInfo_chipmunk.cpp */; }; @@ -1873,9 +1873,6 @@ 1A01C6A318F58F7500EFE3A6 /* CCNotificationCenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCNotificationCenter.h; sourceTree = ""; }; 1A087AE61860400400196EF5 /* edtaa3func.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = edtaa3func.cpp; sourceTree = ""; }; 1A087AE71860400400196EF5 /* edtaa3func.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = edtaa3func.h; sourceTree = ""; }; - 1A0DB7301823827C0025743D /* CCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGL.h; sourceTree = ""; }; - 1A0DB7311823827C0025743D /* CCEAGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEAGLView.h; sourceTree = ""; }; - 1A0DB7351823828F0025743D /* CCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGL.h; sourceTree = ""; }; 1A1645AE191B726C008C7C7F /* ConvertUTF.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ConvertUTF.c; sourceTree = ""; }; 1A1645AF191B726C008C7C7F /* ConvertUTFWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConvertUTFWrapper.cpp; sourceTree = ""; }; 1A570047180BC5A10088DEC7 /* CCAction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAction.cpp; sourceTree = ""; }; @@ -1966,8 +1963,6 @@ 1A57021E180BCC1A0088DEC7 /* CCParticleSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCParticleSystem.h; sourceTree = ""; }; 1A57021F180BCC1A0088DEC7 /* CCParticleSystemQuad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CCParticleSystemQuad.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; 1A570220180BCC1A0088DEC7 /* CCParticleSystemQuad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCParticleSystemQuad.h; sourceTree = ""; }; - 1A570232180BCC4D0088DEC7 /* CCScriptSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCScriptSupport.cpp; sourceTree = ""; }; - 1A570233180BCC4D0088DEC7 /* CCScriptSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCScriptSupport.h; sourceTree = ""; }; 1A570276180BCC900088DEC7 /* CCSprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CCSprite.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; 1A570277180BCC900088DEC7 /* CCSprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSprite.h; sourceTree = ""; }; 1A570278180BCC900088DEC7 /* CCSpriteBatchNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCSpriteBatchNode.cpp; sourceTree = ""; }; @@ -1980,22 +1975,8 @@ 1A57028F180BCCAB0088DEC7 /* CCAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAnimation.h; sourceTree = ""; }; 1A570290180BCCAB0088DEC7 /* CCAnimationCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAnimationCache.cpp; sourceTree = ""; }; 1A570291180BCCAB0088DEC7 /* CCAnimationCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAnimationCache.h; sourceTree = ""; }; - 1A5702AD180BCDBC0088DEC7 /* ccUTF8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccUTF8.cpp; sourceTree = ""; }; - 1A5702AE180BCDBC0088DEC7 /* ccUTF8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccUTF8.h; sourceTree = ""; }; - 1A5702B3180BCDF40088DEC7 /* CCVertex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCVertex.cpp; sourceTree = ""; }; - 1A5702B4180BCDF40088DEC7 /* CCVertex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCVertex.h; sourceTree = ""; }; - 1A5702B9180BCDFC0088DEC7 /* ccUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccUtils.h; sourceTree = ""; }; - 1A5702BD180BCE2A0088DEC7 /* CCIMEDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCIMEDelegate.h; sourceTree = ""; }; - 1A5702BE180BCE2A0088DEC7 /* CCIMEDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCIMEDispatcher.cpp; sourceTree = ""; }; - 1A5702BF180BCE2A0088DEC7 /* CCIMEDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCIMEDispatcher.h; sourceTree = ""; }; 1A5702C6180BCE370088DEC7 /* CCTextFieldTTF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CCTextFieldTTF.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; 1A5702C7180BCE370088DEC7 /* CCTextFieldTTF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTextFieldTTF.h; sourceTree = ""; }; - 1A5702CD180BCE560088DEC7 /* CCTexture2D.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTexture2D.cpp; sourceTree = ""; }; - 1A5702CE180BCE570088DEC7 /* CCTexture2D.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTexture2D.h; sourceTree = ""; }; - 1A5702CF180BCE570088DEC7 /* CCTextureAtlas.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTextureAtlas.cpp; sourceTree = ""; }; - 1A5702D0180BCE570088DEC7 /* CCTextureAtlas.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTextureAtlas.h; sourceTree = ""; }; - 1A5702D1180BCE570088DEC7 /* CCTextureCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTextureCache.cpp; sourceTree = ""; }; - 1A5702D2180BCE570088DEC7 /* CCTextureCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTextureCache.h; sourceTree = ""; }; 1A5702E0180BCE750088DEC7 /* CCTileMapAtlas.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTileMapAtlas.cpp; sourceTree = ""; }; 1A5702E1180BCE750088DEC7 /* CCTileMapAtlas.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTileMapAtlas.h; sourceTree = ""; }; 1A5702E2180BCE750088DEC7 /* CCTMXLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CCTMXLayer.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; @@ -2008,21 +1989,10 @@ 1A5702E9180BCE750088DEC7 /* CCTMXXMLParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = CCTMXXMLParser.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 1A5702FE180BCE890088DEC7 /* CCParallaxNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCParallaxNode.cpp; sourceTree = ""; }; 1A5702FF180BCE890088DEC7 /* CCParallaxNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCParallaxNode.h; sourceTree = ""; }; - 1A570304180BCED90088DEC7 /* ccUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccUtils.cpp; sourceTree = ""; }; 1A570308180BCF190088DEC7 /* CCComponent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCComponent.cpp; sourceTree = ""; }; 1A570309180BCF190088DEC7 /* CCComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCComponent.h; sourceTree = ""; }; 1A57030A180BCF190088DEC7 /* CCComponentContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCComponentContainer.cpp; sourceTree = ""; }; 1A57030B180BCF190088DEC7 /* CCComponentContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCComponentContainer.h; sourceTree = ""; }; - 1A570315180BCF430088DEC7 /* ccCArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccCArray.cpp; sourceTree = ""; }; - 1A570316180BCF430088DEC7 /* ccCArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccCArray.h; sourceTree = ""; }; - 1A570317180BCF430088DEC7 /* uthash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uthash.h; sourceTree = ""; }; - 1A570318180BCF430088DEC7 /* utlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utlist.h; sourceTree = ""; }; - 1A570322180BCF660088DEC7 /* TGAlib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TGAlib.cpp; sourceTree = ""; }; - 1A570323180BCF660088DEC7 /* TGAlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TGAlib.h; sourceTree = ""; }; - 1A57032B180BCFD50088DEC7 /* CCUserDefault.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCUserDefault.cpp; sourceTree = ""; }; - 1A57032C180BCFD50088DEC7 /* CCUserDefault.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCUserDefault.h; sourceTree = ""; }; - 1A57032D180BCFD50088DEC7 /* CCUserDefault.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCUserDefault.mm; sourceTree = ""; }; - 1A57032E180BCFD50088DEC7 /* CCUserDefaultAndroid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCUserDefaultAndroid.cpp; sourceTree = ""; }; 1A570346180BD0850088DEC7 /* libglfw3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libglfw3.a; path = ../external/glfw3/prebuilt/mac/libglfw3.a; sourceTree = ""; }; 1A570349180BD09B0088DEC7 /* tinyxml2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinyxml2.cpp; sourceTree = ""; }; 1A57034A180BD09B0088DEC7 /* tinyxml2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tinyxml2.h; sourceTree = ""; }; @@ -2104,12 +2074,8 @@ 1A8C5986180E930E00EF57C3 /* CocoStudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CocoStudio.h; sourceTree = ""; }; 1A8C5989180E930E00EF57C3 /* DictionaryHelper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DictionaryHelper.cpp; sourceTree = ""; }; 1A8C598A180E930E00EF57C3 /* DictionaryHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DictionaryHelper.h; sourceTree = ""; }; - 1A9DCA00180E6955007A3AD4 /* ccFPSImages.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ccFPSImages.c; sourceTree = ""; }; - 1A9DCA01180E6955007A3AD4 /* ccFPSImages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccFPSImages.h; sourceTree = ""; }; 1A9DCA02180E6955007A3AD4 /* CCGLBufferedNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLBufferedNode.cpp; sourceTree = ""; }; 1A9DCA03180E6955007A3AD4 /* CCGLBufferedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLBufferedNode.h; sourceTree = ""; }; - 1A9DCA05180E6955007A3AD4 /* CCProtocols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCProtocols.h; sourceTree = ""; }; - 1A9DCA0C180E6955007A3AD4 /* firePngData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = firePngData.h; sourceTree = ""; }; 1AAF5351180E3060000584C8 /* AssetsManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AssetsManager.cpp; sourceTree = ""; }; 1AAF5352180E3060000584C8 /* AssetsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AssetsManager.h; sourceTree = ""; }; 1AAF5362180E3374000584C8 /* HttpClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HttpClient.cpp; sourceTree = ""; }; @@ -2265,10 +2231,6 @@ 2905FA1318CF08D100240AA3 /* UIWidget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIWidget.cpp; sourceTree = ""; }; 2905FA1418CF08D100240AA3 /* UIWidget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIWidget.h; sourceTree = ""; }; 29080DEB191B82CE0066F8DF /* UIDeprecated.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UIDeprecated.h; sourceTree = ""; }; - 296CAD201915EC8000C64FBF /* CCEventFocus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventFocus.cpp; path = ../base/CCEventFocus.cpp; sourceTree = ""; }; - 296CAD211915EC8000C64FBF /* CCEventFocus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventFocus.h; path = ../base/CCEventFocus.h; sourceTree = ""; }; - 296CAD261915EC9900C64FBF /* CCEventListenerFocus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerFocus.cpp; path = ../base/CCEventListenerFocus.cpp; sourceTree = ""; }; - 296CAD271915EC9900C64FBF /* CCEventListenerFocus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerFocus.h; path = ../base/CCEventListenerFocus.h; sourceTree = ""; }; 2986667818B1B079000E39CA /* CCTweenFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTweenFunction.cpp; sourceTree = ""; }; 2986667918B1B079000E39CA /* CCTweenFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTweenFunction.h; sourceTree = ""; }; 2AC795D318628672005EC8E1 /* BoundingBoxAttachment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BoundingBoxAttachment.cpp; sourceTree = ""; }; @@ -2290,8 +2252,6 @@ 37936A3C1869B76800E974DD /* reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = reader.h; sourceTree = ""; }; 37936A3D1869B76800E974DD /* stringbuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stringbuffer.h; sourceTree = ""; }; 37936A3E1869B76800E974DD /* writer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = writer.h; sourceTree = ""; }; - 3E26D40418ACB5D100834404 /* CCImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCImage.cpp; sourceTree = ""; }; - 3E26D40718ACB63900834404 /* CCDevice.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCDevice.mm; sourceTree = ""; }; 3EA0FB69191C841D00B170C8 /* UIVideoPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIVideoPlayer.h; sourceTree = ""; }; 3EA0FB6A191C841D00B170C8 /* UIVideoPlayerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UIVideoPlayerIOS.mm; sourceTree = ""; }; 46A15FCC1807A544005B8026 /* AUTHORS */ = {isa = PBXFileReference; lastKnownFileType = text; name = AUTHORS; path = ../AUTHORS; sourceTree = ""; }; @@ -2513,44 +2473,6 @@ 46A169981807AFD6005B8026 /* cpSweep1D.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = cpSweep1D.c; sourceTree = ""; }; 46A169991807AFD6005B8026 /* cpVect.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = cpVect.c; sourceTree = ""; }; 46A1699A1807AFD6005B8026 /* prime.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = prime.h; sourceTree = ""; }; - 46A16A8F1807B038005B8026 /* CCFileUtilsApple.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCFileUtilsApple.h; sourceTree = ""; }; - 46A16A901807B038005B8026 /* CCFileUtilsApple.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CCFileUtilsApple.mm; sourceTree = ""; }; - 46A16A911807B038005B8026 /* CCLock.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCLock.cpp; sourceTree = ""; }; - 46A16A921807B038005B8026 /* CCLock.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCLock.h; sourceTree = ""; }; - 46A16A931807B038005B8026 /* CCThread.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CCThread.mm; sourceTree = ""; }; - 46A16A941807B038005B8026 /* CCApplicationProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCApplicationProtocol.h; sourceTree = ""; }; - 46A16A951807B038005B8026 /* CCCommon.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCCommon.h; sourceTree = ""; }; - 46A16A961807B038005B8026 /* CCDevice.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCDevice.h; sourceTree = ""; }; - 46A16A971807B038005B8026 /* CCGLViewProtocol.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CCGLViewProtocol.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; - 46A16A981807B038005B8026 /* CCGLViewProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = CCGLViewProtocol.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - 46A16A991807B038005B8026 /* CCFileUtils.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCFileUtils.cpp; sourceTree = ""; }; - 46A16A9A1807B038005B8026 /* CCFileUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCFileUtils.h; sourceTree = ""; }; - 46A16A9B1807B038005B8026 /* CCImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCImage.h; sourceTree = ""; }; - 46A16A9F1807B038005B8026 /* CCSAXParser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCSAXParser.cpp; sourceTree = ""; }; - 46A16AA01807B038005B8026 /* CCSAXParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCSAXParser.h; sourceTree = ""; }; - 46A16AA11807B038005B8026 /* CCThread.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCThread.cpp; sourceTree = ""; }; - 46A16AA21807B038005B8026 /* CCThread.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCThread.h; sourceTree = ""; }; - 46A16AA41807B038005B8026 /* CCApplication.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCApplication.h; sourceTree = ""; }; - 46A16AA51807B038005B8026 /* CCApplication.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CCApplication.mm; sourceTree = ""; }; - 46A16AA61807B038005B8026 /* CCCommon.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CCCommon.mm; sourceTree = ""; }; - 46A16AA71807B038005B8026 /* CCDevice.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CCDevice.mm; sourceTree = ""; }; - 46A16AA81807B038005B8026 /* CCDirectorCaller.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCDirectorCaller.h; sourceTree = ""; }; - 46A16AA91807B038005B8026 /* CCDirectorCaller.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CCDirectorCaller.mm; sourceTree = ""; }; - 46A16AAA1807B038005B8026 /* CCGLView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = CCGLView.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - 46A16AAB1807B038005B8026 /* CCGLView.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = CCGLView.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - 46A16AAC1807B038005B8026 /* CCES2Renderer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCES2Renderer.h; sourceTree = ""; }; - 46A16AAD1807B038005B8026 /* CCES2Renderer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CCES2Renderer.m; sourceTree = ""; }; - 46A16AAE1807B038005B8026 /* CCESRenderer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCESRenderer.h; sourceTree = ""; }; - 46A16AB01807B038005B8026 /* CCImage.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CCImage.mm; sourceTree = ""; }; - 46A16AB11807B038005B8026 /* CCPlatformDefine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = ""; }; - 46A16AB21807B038005B8026 /* CCStdC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = ""; }; - 46A16AB41807B038005B8026 /* CCEAGLView.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CCEAGLView.mm; sourceTree = ""; }; - 46A16AB51807B038005B8026 /* OpenGL_Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OpenGL_Internal.h; sourceTree = ""; }; - 46A16AC81807B038005B8026 /* CCApplication.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = CCApplication.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - 46A16AC91807B038005B8026 /* CCApplication.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = CCApplication.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - 46A16ACA1807B038005B8026 /* CCCommon.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = CCCommon.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; - 46A16AD41807B038005B8026 /* CCPlatformDefine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = ""; }; - 46A16AD51807B038005B8026 /* CCStdC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = ""; }; 46A16E1B1807C948005B8026 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../cocos/2d/platform/third_party/ios/libraries/libcurl.a; sourceTree = ""; }; 46A16E1C1807C948005B8026 /* libfreetype.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfreetype.a; path = ../cocos/2d/platform/third_party/ios/libraries/libfreetype.a; sourceTree = ""; }; 46A16E1D1807C948005B8026 /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = ../cocos/2d/platform/third_party/ios/libraries/libjpeg.a; sourceTree = ""; }; @@ -2577,103 +2499,8 @@ 46A170781807CE7A005B8026 /* CCPhysicsWorld.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCPhysicsWorld.h; sourceTree = ""; }; 46C02E0518E91123004B7456 /* xxhash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xxhash.c; sourceTree = ""; }; 46C02E0618E91123004B7456 /* xxhash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xxhash.h; sourceTree = ""; }; - 500DC89919105D41007B91BF /* CCBatchCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCBatchCommand.cpp; sourceTree = ""; }; - 500DC89A19105D41007B91BF /* CCBatchCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBatchCommand.h; sourceTree = ""; }; - 500DC89B19105D41007B91BF /* CCCustomCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCCustomCommand.cpp; sourceTree = ""; }; - 500DC89C19105D41007B91BF /* CCCustomCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCCustomCommand.h; sourceTree = ""; }; - 500DC89D19105D41007B91BF /* CCGroupCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGroupCommand.cpp; sourceTree = ""; }; - 500DC89E19105D41007B91BF /* CCGroupCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGroupCommand.h; sourceTree = ""; }; - 500DC8A119105D41007B91BF /* CCQuadCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCQuadCommand.cpp; sourceTree = ""; }; - 500DC8A219105D41007B91BF /* CCQuadCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCQuadCommand.h; sourceTree = ""; }; - 500DC8A319105D41007B91BF /* CCRenderCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCRenderCommand.cpp; sourceTree = ""; }; - 500DC8A419105D41007B91BF /* CCRenderCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRenderCommand.h; sourceTree = ""; }; - 500DC8A519105D41007B91BF /* CCRenderCommandPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRenderCommandPool.h; sourceTree = ""; }; - 500DC8A619105D41007B91BF /* CCRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCRenderer.cpp; sourceTree = ""; }; - 500DC8A719105D41007B91BF /* CCRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRenderer.h; sourceTree = ""; }; - 500DC8CC19105F7D007B91BF /* CCAffineTransform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAffineTransform.cpp; sourceTree = ""; }; - 500DC8CD19105F7D007B91BF /* CCAffineTransform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAffineTransform.h; sourceTree = ""; }; - 500DC8CE19105F7D007B91BF /* CCGeometry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGeometry.cpp; sourceTree = ""; }; - 500DC8CF19105F7D007B91BF /* CCGeometry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGeometry.h; sourceTree = ""; }; - 500DC8D019105F7D007B91BF /* CCMathBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCMathBase.h; sourceTree = ""; }; - 500DC8E719106300007B91BF /* atitc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = atitc.cpp; path = ../base/atitc.cpp; sourceTree = ""; }; - 500DC8E819106300007B91BF /* atitc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = atitc.h; path = ../base/atitc.h; sourceTree = ""; }; - 500DC8E919106300007B91BF /* base64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = base64.cpp; path = ../base/base64.cpp; sourceTree = ""; }; - 500DC8EA19106300007B91BF /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = base64.h; path = ../base/base64.h; sourceTree = ""; }; - 500DC8EB19106300007B91BF /* CCAutoreleasePool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCAutoreleasePool.cpp; path = ../base/CCAutoreleasePool.cpp; sourceTree = ""; }; - 500DC8EC19106300007B91BF /* CCAutoreleasePool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCAutoreleasePool.h; path = ../base/CCAutoreleasePool.h; sourceTree = ""; }; - 500DC8ED19106300007B91BF /* ccConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ccConfig.h; path = ../base/ccConfig.h; sourceTree = ""; }; - 500DC8EE19106300007B91BF /* CCConfiguration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCConfiguration.cpp; path = ../base/CCConfiguration.cpp; sourceTree = ""; }; - 500DC8EF19106300007B91BF /* CCConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCConfiguration.h; path = ../base/CCConfiguration.h; sourceTree = ""; }; - 500DC8F019106300007B91BF /* CCConsole.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCConsole.cpp; path = ../base/CCConsole.cpp; sourceTree = ""; }; - 500DC8F119106300007B91BF /* CCConsole.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCConsole.h; path = ../base/CCConsole.h; sourceTree = ""; }; - 500DC8F219106300007B91BF /* CCData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCData.cpp; path = ../base/CCData.cpp; sourceTree = ""; }; - 500DC8F319106300007B91BF /* CCData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCData.h; path = ../base/CCData.h; sourceTree = ""; }; - 500DC8F419106300007B91BF /* CCDataVisitor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCDataVisitor.cpp; path = ../base/CCDataVisitor.cpp; sourceTree = ""; }; - 500DC8F519106300007B91BF /* CCDataVisitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCDataVisitor.h; path = ../base/CCDataVisitor.h; sourceTree = ""; }; - 500DC8F619106300007B91BF /* CCDirector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCDirector.cpp; path = ../base/CCDirector.cpp; sourceTree = ""; }; - 500DC8F719106300007B91BF /* CCDirector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCDirector.h; path = ../base/CCDirector.h; sourceTree = ""; }; - 500DC8F819106300007B91BF /* CCEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEvent.cpp; path = ../base/CCEvent.cpp; sourceTree = ""; }; - 500DC8F919106300007B91BF /* CCEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEvent.h; path = ../base/CCEvent.h; sourceTree = ""; }; - 500DC8FA19106300007B91BF /* CCEventAcceleration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventAcceleration.cpp; path = ../base/CCEventAcceleration.cpp; sourceTree = ""; }; - 500DC8FB19106300007B91BF /* CCEventAcceleration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventAcceleration.h; path = ../base/CCEventAcceleration.h; sourceTree = ""; }; - 500DC8FC19106300007B91BF /* CCEventCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventCustom.cpp; path = ../base/CCEventCustom.cpp; sourceTree = ""; }; - 500DC8FD19106300007B91BF /* CCEventCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventCustom.h; path = ../base/CCEventCustom.h; sourceTree = ""; }; - 500DC8FE19106300007B91BF /* CCEventDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventDispatcher.cpp; path = ../base/CCEventDispatcher.cpp; sourceTree = ""; }; - 500DC8FF19106300007B91BF /* CCEventDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventDispatcher.h; path = ../base/CCEventDispatcher.h; sourceTree = ""; }; - 500DC90019106300007B91BF /* CCEventKeyboard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventKeyboard.cpp; path = ../base/CCEventKeyboard.cpp; sourceTree = ""; }; - 500DC90119106300007B91BF /* CCEventKeyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventKeyboard.h; path = ../base/CCEventKeyboard.h; sourceTree = ""; }; - 500DC90219106300007B91BF /* CCEventListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListener.cpp; path = ../base/CCEventListener.cpp; sourceTree = ""; }; - 500DC90319106300007B91BF /* CCEventListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListener.h; path = ../base/CCEventListener.h; sourceTree = ""; }; - 500DC90419106300007B91BF /* CCEventListenerAcceleration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerAcceleration.cpp; path = ../base/CCEventListenerAcceleration.cpp; sourceTree = ""; }; - 500DC90519106300007B91BF /* CCEventListenerAcceleration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerAcceleration.h; path = ../base/CCEventListenerAcceleration.h; sourceTree = ""; }; - 500DC90619106300007B91BF /* CCEventListenerCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerCustom.cpp; path = ../base/CCEventListenerCustom.cpp; sourceTree = ""; }; - 500DC90719106300007B91BF /* CCEventListenerCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerCustom.h; path = ../base/CCEventListenerCustom.h; sourceTree = ""; }; - 500DC90819106300007B91BF /* CCEventListenerKeyboard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerKeyboard.cpp; path = ../base/CCEventListenerKeyboard.cpp; sourceTree = ""; }; - 500DC90919106300007B91BF /* CCEventListenerKeyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerKeyboard.h; path = ../base/CCEventListenerKeyboard.h; sourceTree = ""; }; - 500DC90A19106300007B91BF /* CCEventListenerMouse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerMouse.cpp; path = ../base/CCEventListenerMouse.cpp; sourceTree = ""; }; - 500DC90B19106300007B91BF /* CCEventListenerMouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerMouse.h; path = ../base/CCEventListenerMouse.h; sourceTree = ""; }; - 500DC90C19106300007B91BF /* CCEventListenerTouch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerTouch.cpp; path = ../base/CCEventListenerTouch.cpp; sourceTree = ""; }; - 500DC90D19106300007B91BF /* CCEventListenerTouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerTouch.h; path = ../base/CCEventListenerTouch.h; sourceTree = ""; }; - 500DC90E19106300007B91BF /* CCEventMouse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventMouse.cpp; path = ../base/CCEventMouse.cpp; sourceTree = ""; }; - 500DC90F19106300007B91BF /* CCEventMouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventMouse.h; path = ../base/CCEventMouse.h; sourceTree = ""; }; - 500DC91019106300007B91BF /* CCEventTouch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventTouch.cpp; path = ../base/CCEventTouch.cpp; sourceTree = ""; }; - 500DC91119106300007B91BF /* CCEventTouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventTouch.h; path = ../base/CCEventTouch.h; sourceTree = ""; }; - 500DC91219106300007B91BF /* CCEventType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventType.h; path = ../base/CCEventType.h; sourceTree = ""; }; - 500DC91319106300007B91BF /* ccMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ccMacros.h; path = ../base/ccMacros.h; sourceTree = ""; }; - 500DC91419106300007B91BF /* CCMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCMap.h; path = ../base/CCMap.h; sourceTree = ""; }; - 500DC91519106300007B91BF /* CCNS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCNS.cpp; path = ../base/CCNS.cpp; sourceTree = ""; }; - 500DC91619106300007B91BF /* CCNS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCNS.h; path = ../base/CCNS.h; sourceTree = ""; }; - 500DC91719106300007B91BF /* CCPlatformConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCPlatformConfig.h; path = ../base/CCPlatformConfig.h; sourceTree = ""; }; - 500DC91819106300007B91BF /* CCPlatformMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCPlatformMacros.h; path = ../base/CCPlatformMacros.h; sourceTree = ""; }; - 500DC91919106300007B91BF /* CCRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCRef.cpp; path = ../base/CCRef.cpp; sourceTree = ""; }; - 500DC91A19106300007B91BF /* CCRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCRef.h; path = ../base/CCRef.h; sourceTree = ""; }; - 500DC91B19106300007B91BF /* CCRefPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCRefPtr.h; path = ../base/CCRefPtr.h; sourceTree = ""; }; - 500DC91C19106300007B91BF /* CCScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCScheduler.cpp; path = ../base/CCScheduler.cpp; sourceTree = ""; }; - 500DC91D19106300007B91BF /* CCScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCScheduler.h; path = ../base/CCScheduler.h; sourceTree = ""; }; - 500DC91E19106300007B91BF /* ccTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ccTypes.cpp; path = ../base/ccTypes.cpp; sourceTree = ""; }; - 500DC91F19106300007B91BF /* ccTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ccTypes.h; path = ../base/ccTypes.h; sourceTree = ""; }; - 500DC92019106300007B91BF /* CCValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCValue.cpp; path = ../base/CCValue.cpp; sourceTree = ""; }; - 500DC92119106300007B91BF /* CCValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCValue.h; path = ../base/CCValue.h; sourceTree = ""; }; - 500DC92219106300007B91BF /* CCVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCVector.h; path = ../base/CCVector.h; sourceTree = ""; }; - 500DC92319106300007B91BF /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CMakeLists.txt; path = ../base/CMakeLists.txt; sourceTree = ""; }; - 500DC92419106300007B91BF /* etc1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = etc1.cpp; path = ../base/etc1.cpp; sourceTree = ""; }; - 500DC92519106300007B91BF /* etc1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = etc1.h; path = ../base/etc1.h; sourceTree = ""; }; - 500DC92619106300007B91BF /* s3tc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = s3tc.cpp; path = ../base/s3tc.cpp; sourceTree = ""; }; - 500DC92719106300007B91BF /* s3tc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = s3tc.h; path = ../base/s3tc.h; sourceTree = ""; }; - 500DC92819106300007B91BF /* ZipUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZipUtils.cpp; path = ../base/ZipUtils.cpp; sourceTree = ""; }; - 500DC92919106300007B91BF /* ZipUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZipUtils.h; path = ../base/ZipUtils.h; sourceTree = ""; }; - 500DC9AE1910633C007B91BF /* CCTouch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCTouch.cpp; path = ../base/CCTouch.cpp; sourceTree = ""; }; - 500DC9AF1910633C007B91BF /* CCTouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCTouch.h; path = ../base/CCTouch.h; sourceTree = ""; }; - 500DC9B419106E6D007B91BF /* TransformUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TransformUtils.cpp; sourceTree = ""; }; - 500DC9B519106E6D007B91BF /* TransformUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransformUtils.h; sourceTree = ""; }; - 500DC9BA19106E89007B91BF /* CCProfiling.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCProfiling.cpp; path = ../base/CCProfiling.cpp; sourceTree = ""; }; - 500DC9BB19106E89007B91BF /* CCProfiling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCProfiling.h; path = ../base/CCProfiling.h; sourceTree = ""; }; 50272538190BF1B900AAF4ED /* cocos2d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cocos2d.h; path = ../cocos/cocos2d.h; sourceTree = ""; }; 50272539190BF1B900AAF4ED /* cocos2d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cocos2d.cpp; path = ../cocos/cocos2d.cpp; sourceTree = ""; }; - 5034C9F7191D591000CE6051 /* ccShaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShaders.h; sourceTree = ""; }; - 5034C9F8191D591000CE6051 /* ccShaders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccShaders.cpp; sourceTree = ""; }; - 5034C9F9191D591000CE6051 /* CCGLProgramCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgramCache.h; sourceTree = ""; }; - 5034C9FA191D591000CE6051 /* CCGLProgramCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgramCache.cpp; sourceTree = ""; }; 5034C9FB191D591000CE6051 /* ccShader_PositionTextureColorAlphaTest.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureColorAlphaTest.frag; sourceTree = ""; }; 5034CA00191D591000CE6051 /* ccShader_PositionTextureA8Color.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureA8Color.vert; sourceTree = ""; }; 5034CA01191D591000CE6051 /* ccShader_PositionTextureA8Color.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureA8Color.frag; sourceTree = ""; }; @@ -2692,18 +2519,212 @@ 5034CA0E191D591000CE6051 /* ccShader_Label_normal.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_Label_normal.frag; sourceTree = ""; }; 5034CA0F191D591000CE6051 /* ccShader_Label_df.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_Label_df.frag; sourceTree = ""; }; 5034CA10191D591000CE6051 /* ccShader_Label_df_glow.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_Label_df_glow.frag; sourceTree = ""; }; - 5034CA11191D591000CE6051 /* ccGLStateCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccGLStateCache.h; sourceTree = ""; }; - 5034CA12191D591000CE6051 /* ccGLStateCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccGLStateCache.cpp; sourceTree = ""; }; - 5034CA13191D591000CE6051 /* CCGLProgramStateCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgramStateCache.h; sourceTree = ""; }; - 5034CA14191D591000CE6051 /* CCGLProgramStateCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgramStateCache.cpp; sourceTree = ""; }; - 5034CA15191D591000CE6051 /* CCGLProgramState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgramState.h; sourceTree = ""; }; - 5034CA16191D591000CE6051 /* CCGLProgramState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgramState.cpp; sourceTree = ""; }; - 5034CA17191D591000CE6051 /* CCGLProgram.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgram.h; sourceTree = ""; }; - 5034CA18191D591000CE6051 /* CCGLProgram.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgram.cpp; sourceTree = ""; }; 5034CA60191D91CF00CE6051 /* ccShader_PositionTextureColor.vert */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureColor.vert; sourceTree = ""; }; 5034CA61191D91CF00CE6051 /* ccShader_PositionTextureColor.frag */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureColor.frag; sourceTree = ""; }; 5034CA62191D91CF00CE6051 /* ccShader_PositionTextureColor_noMVP.vert */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureColor_noMVP.vert; sourceTree = ""; }; 5034CA63191D91CF00CE6051 /* ccShader_PositionTextureColor_noMVP.frag */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.glsl; path = ccShader_PositionTextureColor_noMVP.frag; sourceTree = ""; }; + 503DD8CE1926736A00CD74DD /* CCApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCApplication.h; sourceTree = ""; }; + 503DD8CF1926736A00CD74DD /* CCApplication.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCApplication.mm; sourceTree = ""; }; + 503DD8D01926736A00CD74DD /* CCCommon.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCCommon.mm; sourceTree = ""; }; + 503DD8D11926736A00CD74DD /* CCDevice.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCDevice.mm; sourceTree = ""; }; + 503DD8D21926736A00CD74DD /* CCDirectorCaller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCDirectorCaller.h; sourceTree = ""; }; + 503DD8D31926736A00CD74DD /* CCDirectorCaller.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCDirectorCaller.mm; sourceTree = ""; }; + 503DD8D41926736A00CD74DD /* CCEAGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEAGLView.h; sourceTree = ""; }; + 503DD8D51926736A00CD74DD /* CCEAGLView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCEAGLView.mm; sourceTree = ""; }; + 503DD8D61926736A00CD74DD /* CCES2Renderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCES2Renderer.h; sourceTree = ""; }; + 503DD8D71926736A00CD74DD /* CCES2Renderer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCES2Renderer.m; sourceTree = ""; }; + 503DD8D81926736A00CD74DD /* CCESRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCESRenderer.h; sourceTree = ""; }; + 503DD8D91926736A00CD74DD /* CCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGL.h; sourceTree = ""; }; + 503DD8DA1926736A00CD74DD /* CCGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLView.h; sourceTree = ""; }; + 503DD8DB1926736A00CD74DD /* CCGLView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCGLView.mm; sourceTree = ""; }; + 503DD8DC1926736A00CD74DD /* CCImage.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCImage.mm; sourceTree = ""; }; + 503DD8DD1926736A00CD74DD /* CCPlatformDefine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = ""; }; + 503DD8DE1926736A00CD74DD /* CCStdC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = ""; }; + 503DD8DF1926736A00CD74DD /* OpenGL_Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenGL_Internal.h; sourceTree = ""; }; + 503DD8F21926B0DB00CD74DD /* CCIMEDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCIMEDelegate.h; path = ../base/CCIMEDelegate.h; sourceTree = ""; }; + 503DD8F31926B0DB00CD74DD /* CCIMEDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCIMEDispatcher.cpp; path = ../base/CCIMEDispatcher.cpp; sourceTree = ""; }; + 503DD8F41926B0DB00CD74DD /* CCIMEDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCIMEDispatcher.h; path = ../base/CCIMEDispatcher.h; sourceTree = ""; }; + 50ABBD1B1925AB0000A911A9 /* CCAffineTransform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAffineTransform.cpp; sourceTree = ""; }; + 50ABBD1C1925AB0000A911A9 /* CCAffineTransform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAffineTransform.h; sourceTree = ""; }; + 50ABBD1D1925AB0000A911A9 /* CCGeometry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGeometry.cpp; sourceTree = ""; }; + 50ABBD1E1925AB0000A911A9 /* CCGeometry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGeometry.h; sourceTree = ""; }; + 50ABBD1F1925AB0000A911A9 /* CCMath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCMath.h; sourceTree = ""; }; + 50ABBD201925AB0000A911A9 /* CCMathBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCMathBase.h; sourceTree = ""; }; + 50ABBD211925AB0000A911A9 /* CCVertex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCVertex.cpp; sourceTree = ""; }; + 50ABBD221925AB0000A911A9 /* CCVertex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCVertex.h; sourceTree = ""; }; + 50ABBD231925AB0000A911A9 /* Mat4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Mat4.cpp; sourceTree = ""; }; + 50ABBD241925AB0000A911A9 /* Mat4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Mat4.h; sourceTree = ""; }; + 50ABBD251925AB0000A911A9 /* Mat4.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Mat4.inl; sourceTree = ""; }; + 50ABBD261925AB0000A911A9 /* MathUtil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathUtil.cpp; sourceTree = ""; }; + 50ABBD271925AB0000A911A9 /* MathUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathUtil.h; sourceTree = ""; }; + 50ABBD281925AB0000A911A9 /* MathUtil.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MathUtil.inl; sourceTree = ""; }; + 50ABBD291925AB0000A911A9 /* MathUtilNeon.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MathUtilNeon.inl; sourceTree = ""; }; + 50ABBD2A1925AB0000A911A9 /* Quaternion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Quaternion.cpp; sourceTree = ""; }; + 50ABBD2B1925AB0000A911A9 /* Quaternion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Quaternion.h; sourceTree = ""; }; + 50ABBD2C1925AB0000A911A9 /* Quaternion.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Quaternion.inl; sourceTree = ""; }; + 50ABBD2D1925AB0000A911A9 /* TransformUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TransformUtils.cpp; sourceTree = ""; }; + 50ABBD2E1925AB0000A911A9 /* TransformUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransformUtils.h; sourceTree = ""; }; + 50ABBD2F1925AB0000A911A9 /* Vec2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Vec2.cpp; sourceTree = ""; }; + 50ABBD301925AB0000A911A9 /* Vec2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Vec2.h; sourceTree = ""; }; + 50ABBD311925AB0000A911A9 /* Vec2.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Vec2.inl; sourceTree = ""; }; + 50ABBD321925AB0000A911A9 /* Vec3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Vec3.cpp; sourceTree = ""; }; + 50ABBD331925AB0000A911A9 /* Vec3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Vec3.h; sourceTree = ""; }; + 50ABBD341925AB0000A911A9 /* Vec3.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Vec3.inl; sourceTree = ""; }; + 50ABBD351925AB0000A911A9 /* Vec4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Vec4.cpp; sourceTree = ""; }; + 50ABBD361925AB0000A911A9 /* Vec4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Vec4.h; sourceTree = ""; }; + 50ABBD371925AB0000A911A9 /* Vec4.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Vec4.inl; sourceTree = ""; }; + 50ABBD641925AB4100A911A9 /* CCBatchCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCBatchCommand.cpp; sourceTree = ""; }; + 50ABBD651925AB4100A911A9 /* CCBatchCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBatchCommand.h; sourceTree = ""; }; + 50ABBD661925AB4100A911A9 /* CCCustomCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCCustomCommand.cpp; sourceTree = ""; }; + 50ABBD671925AB4100A911A9 /* CCCustomCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCCustomCommand.h; sourceTree = ""; }; + 50ABBD681925AB4100A911A9 /* CCGLProgram.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgram.cpp; sourceTree = ""; }; + 50ABBD691925AB4100A911A9 /* CCGLProgram.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgram.h; sourceTree = ""; }; + 50ABBD6A1925AB4100A911A9 /* CCGLProgramCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgramCache.cpp; sourceTree = ""; }; + 50ABBD6B1925AB4100A911A9 /* CCGLProgramCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgramCache.h; sourceTree = ""; }; + 50ABBD6C1925AB4100A911A9 /* CCGLProgramState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgramState.cpp; sourceTree = ""; }; + 50ABBD6D1925AB4100A911A9 /* CCGLProgramState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgramState.h; sourceTree = ""; }; + 50ABBD6E1925AB4100A911A9 /* CCGLProgramStateCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgramStateCache.cpp; sourceTree = ""; }; + 50ABBD6F1925AB4100A911A9 /* CCGLProgramStateCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgramStateCache.h; sourceTree = ""; }; + 50ABBD701925AB4100A911A9 /* ccGLStateCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccGLStateCache.cpp; sourceTree = ""; }; + 50ABBD711925AB4100A911A9 /* ccGLStateCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccGLStateCache.h; sourceTree = ""; }; + 50ABBD721925AB4100A911A9 /* CCGroupCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGroupCommand.cpp; sourceTree = ""; }; + 50ABBD731925AB4100A911A9 /* CCGroupCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGroupCommand.h; sourceTree = ""; }; + 50ABBD741925AB4100A911A9 /* CCQuadCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCQuadCommand.cpp; sourceTree = ""; }; + 50ABBD751925AB4100A911A9 /* CCQuadCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCQuadCommand.h; sourceTree = ""; }; + 50ABBD761925AB4100A911A9 /* CCRenderCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCRenderCommand.cpp; sourceTree = ""; }; + 50ABBD771925AB4100A911A9 /* CCRenderCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRenderCommand.h; sourceTree = ""; }; + 50ABBD781925AB4100A911A9 /* CCRenderCommandPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRenderCommandPool.h; sourceTree = ""; }; + 50ABBD791925AB4100A911A9 /* CCRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCRenderer.cpp; sourceTree = ""; }; + 50ABBD7A1925AB4100A911A9 /* CCRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRenderer.h; sourceTree = ""; }; + 50ABBD7B1925AB4100A911A9 /* ccShaders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccShaders.cpp; sourceTree = ""; }; + 50ABBD7C1925AB4100A911A9 /* ccShaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccShaders.h; sourceTree = ""; }; + 50ABBD7D1925AB4100A911A9 /* CCTexture2D.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTexture2D.cpp; sourceTree = ""; }; + 50ABBD7E1925AB4100A911A9 /* CCTexture2D.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTexture2D.h; sourceTree = ""; }; + 50ABBD7F1925AB4100A911A9 /* CCTextureAtlas.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTextureAtlas.cpp; sourceTree = ""; }; + 50ABBD801925AB4100A911A9 /* CCTextureAtlas.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTextureAtlas.h; sourceTree = ""; }; + 50ABBD811925AB4100A911A9 /* CCTextureCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTextureCache.cpp; sourceTree = ""; }; + 50ABBD821925AB4100A911A9 /* CCTextureCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTextureCache.h; sourceTree = ""; }; + 50ABBDC11925AB6E00A911A9 /* atitc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = atitc.cpp; path = ../base/atitc.cpp; sourceTree = ""; }; + 50ABBDC21925AB6E00A911A9 /* atitc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = atitc.h; path = ../base/atitc.h; sourceTree = ""; }; + 50ABBDC31925AB6E00A911A9 /* base64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = base64.cpp; path = ../base/base64.cpp; sourceTree = ""; }; + 50ABBDC41925AB6E00A911A9 /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = base64.h; path = ../base/base64.h; sourceTree = ""; }; + 50ABBDC51925AB6E00A911A9 /* CCAutoreleasePool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCAutoreleasePool.cpp; path = ../base/CCAutoreleasePool.cpp; sourceTree = ""; }; + 50ABBDC61925AB6E00A911A9 /* CCAutoreleasePool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCAutoreleasePool.h; path = ../base/CCAutoreleasePool.h; sourceTree = ""; }; + 50ABBDC71925AB6E00A911A9 /* ccCArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ccCArray.cpp; path = ../base/ccCArray.cpp; sourceTree = ""; }; + 50ABBDC81925AB6E00A911A9 /* ccCArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ccCArray.h; path = ../base/ccCArray.h; sourceTree = ""; }; + 50ABBDC91925AB6E00A911A9 /* ccConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ccConfig.h; path = ../base/ccConfig.h; sourceTree = ""; }; + 50ABBDCA1925AB6E00A911A9 /* CCConfiguration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCConfiguration.cpp; path = ../base/CCConfiguration.cpp; sourceTree = ""; }; + 50ABBDCB1925AB6E00A911A9 /* CCConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCConfiguration.h; path = ../base/CCConfiguration.h; sourceTree = ""; }; + 50ABBDCC1925AB6E00A911A9 /* CCConsole.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCConsole.cpp; path = ../base/CCConsole.cpp; sourceTree = ""; }; + 50ABBDCD1925AB6E00A911A9 /* CCConsole.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCConsole.h; path = ../base/CCConsole.h; sourceTree = ""; }; + 50ABBDCE1925AB6E00A911A9 /* CCData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCData.cpp; path = ../base/CCData.cpp; sourceTree = ""; }; + 50ABBDCF1925AB6E00A911A9 /* CCData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCData.h; path = ../base/CCData.h; sourceTree = ""; }; + 50ABBDD01925AB6E00A911A9 /* CCDataVisitor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCDataVisitor.cpp; path = ../base/CCDataVisitor.cpp; sourceTree = ""; }; + 50ABBDD11925AB6E00A911A9 /* CCDataVisitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCDataVisitor.h; path = ../base/CCDataVisitor.h; sourceTree = ""; }; + 50ABBDD21925AB6E00A911A9 /* CCDirector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCDirector.cpp; path = ../base/CCDirector.cpp; sourceTree = ""; }; + 50ABBDD31925AB6E00A911A9 /* CCDirector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCDirector.h; path = ../base/CCDirector.h; sourceTree = ""; }; + 50ABBDD41925AB6E00A911A9 /* CCEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEvent.cpp; path = ../base/CCEvent.cpp; sourceTree = ""; }; + 50ABBDD51925AB6E00A911A9 /* CCEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEvent.h; path = ../base/CCEvent.h; sourceTree = ""; }; + 50ABBDD61925AB6E00A911A9 /* CCEventAcceleration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventAcceleration.cpp; path = ../base/CCEventAcceleration.cpp; sourceTree = ""; }; + 50ABBDD71925AB6E00A911A9 /* CCEventAcceleration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventAcceleration.h; path = ../base/CCEventAcceleration.h; sourceTree = ""; }; + 50ABBDD81925AB6E00A911A9 /* CCEventCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventCustom.cpp; path = ../base/CCEventCustom.cpp; sourceTree = ""; }; + 50ABBDD91925AB6E00A911A9 /* CCEventCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventCustom.h; path = ../base/CCEventCustom.h; sourceTree = ""; }; + 50ABBDDA1925AB6E00A911A9 /* CCEventDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventDispatcher.cpp; path = ../base/CCEventDispatcher.cpp; sourceTree = ""; }; + 50ABBDDB1925AB6E00A911A9 /* CCEventDispatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventDispatcher.h; path = ../base/CCEventDispatcher.h; sourceTree = ""; }; + 50ABBDDC1925AB6E00A911A9 /* CCEventFocus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventFocus.cpp; path = ../base/CCEventFocus.cpp; sourceTree = ""; }; + 50ABBDDD1925AB6E00A911A9 /* CCEventFocus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventFocus.h; path = ../base/CCEventFocus.h; sourceTree = ""; }; + 50ABBDDE1925AB6E00A911A9 /* CCEventKeyboard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventKeyboard.cpp; path = ../base/CCEventKeyboard.cpp; sourceTree = ""; }; + 50ABBDDF1925AB6E00A911A9 /* CCEventKeyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventKeyboard.h; path = ../base/CCEventKeyboard.h; sourceTree = ""; }; + 50ABBDE01925AB6E00A911A9 /* CCEventListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListener.cpp; path = ../base/CCEventListener.cpp; sourceTree = ""; }; + 50ABBDE11925AB6E00A911A9 /* CCEventListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListener.h; path = ../base/CCEventListener.h; sourceTree = ""; }; + 50ABBDE21925AB6E00A911A9 /* CCEventListenerAcceleration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerAcceleration.cpp; path = ../base/CCEventListenerAcceleration.cpp; sourceTree = ""; }; + 50ABBDE31925AB6E00A911A9 /* CCEventListenerAcceleration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerAcceleration.h; path = ../base/CCEventListenerAcceleration.h; sourceTree = ""; }; + 50ABBDE41925AB6E00A911A9 /* CCEventListenerCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerCustom.cpp; path = ../base/CCEventListenerCustom.cpp; sourceTree = ""; }; + 50ABBDE51925AB6E00A911A9 /* CCEventListenerCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerCustom.h; path = ../base/CCEventListenerCustom.h; sourceTree = ""; }; + 50ABBDE61925AB6E00A911A9 /* CCEventListenerFocus.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerFocus.cpp; path = ../base/CCEventListenerFocus.cpp; sourceTree = ""; }; + 50ABBDE71925AB6E00A911A9 /* CCEventListenerFocus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerFocus.h; path = ../base/CCEventListenerFocus.h; sourceTree = ""; }; + 50ABBDE81925AB6E00A911A9 /* CCEventListenerKeyboard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerKeyboard.cpp; path = ../base/CCEventListenerKeyboard.cpp; sourceTree = ""; }; + 50ABBDE91925AB6E00A911A9 /* CCEventListenerKeyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerKeyboard.h; path = ../base/CCEventListenerKeyboard.h; sourceTree = ""; }; + 50ABBDEA1925AB6E00A911A9 /* CCEventListenerMouse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerMouse.cpp; path = ../base/CCEventListenerMouse.cpp; sourceTree = ""; }; + 50ABBDEB1925AB6E00A911A9 /* CCEventListenerMouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerMouse.h; path = ../base/CCEventListenerMouse.h; sourceTree = ""; }; + 50ABBDEC1925AB6E00A911A9 /* CCEventListenerTouch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventListenerTouch.cpp; path = ../base/CCEventListenerTouch.cpp; sourceTree = ""; }; + 50ABBDED1925AB6E00A911A9 /* CCEventListenerTouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventListenerTouch.h; path = ../base/CCEventListenerTouch.h; sourceTree = ""; }; + 50ABBDEE1925AB6E00A911A9 /* CCEventMouse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventMouse.cpp; path = ../base/CCEventMouse.cpp; sourceTree = ""; }; + 50ABBDEF1925AB6E00A911A9 /* CCEventMouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventMouse.h; path = ../base/CCEventMouse.h; sourceTree = ""; }; + 50ABBDF01925AB6E00A911A9 /* CCEventTouch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventTouch.cpp; path = ../base/CCEventTouch.cpp; sourceTree = ""; }; + 50ABBDF11925AB6E00A911A9 /* CCEventTouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventTouch.h; path = ../base/CCEventTouch.h; sourceTree = ""; }; + 50ABBDF21925AB6E00A911A9 /* CCEventType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventType.h; path = ../base/CCEventType.h; sourceTree = ""; }; + 50ABBDF31925AB6E00A911A9 /* ccFPSImages.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ccFPSImages.c; path = ../base/ccFPSImages.c; sourceTree = ""; }; + 50ABBDF41925AB6E00A911A9 /* ccFPSImages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ccFPSImages.h; path = ../base/ccFPSImages.h; sourceTree = ""; }; + 50ABBDF51925AB6E00A911A9 /* ccMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ccMacros.h; path = ../base/ccMacros.h; sourceTree = ""; }; + 50ABBDF61925AB6E00A911A9 /* CCMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCMap.h; path = ../base/CCMap.h; sourceTree = ""; }; + 50ABBDF71925AB6E00A911A9 /* CCNS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCNS.cpp; path = ../base/CCNS.cpp; sourceTree = ""; }; + 50ABBDF81925AB6E00A911A9 /* CCNS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCNS.h; path = ../base/CCNS.h; sourceTree = ""; }; + 50ABBDF91925AB6E00A911A9 /* CCPlatformConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCPlatformConfig.h; path = ../base/CCPlatformConfig.h; sourceTree = ""; }; + 50ABBDFA1925AB6E00A911A9 /* CCPlatformMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCPlatformMacros.h; path = ../base/CCPlatformMacros.h; sourceTree = ""; }; + 50ABBDFB1925AB6E00A911A9 /* CCProfiling.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCProfiling.cpp; path = ../base/CCProfiling.cpp; sourceTree = ""; }; + 50ABBDFC1925AB6E00A911A9 /* CCProfiling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCProfiling.h; path = ../base/CCProfiling.h; sourceTree = ""; }; + 50ABBDFD1925AB6E00A911A9 /* CCProtocols.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCProtocols.h; path = ../base/CCProtocols.h; sourceTree = ""; }; + 50ABBDFE1925AB6E00A911A9 /* CCRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCRef.cpp; path = ../base/CCRef.cpp; sourceTree = ""; }; + 50ABBDFF1925AB6E00A911A9 /* CCRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCRef.h; path = ../base/CCRef.h; sourceTree = ""; }; + 50ABBE001925AB6E00A911A9 /* CCRefPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCRefPtr.h; path = ../base/CCRefPtr.h; sourceTree = ""; }; + 50ABBE011925AB6E00A911A9 /* CCScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCScheduler.cpp; path = ../base/CCScheduler.cpp; sourceTree = ""; }; + 50ABBE021925AB6E00A911A9 /* CCScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCScheduler.h; path = ../base/CCScheduler.h; sourceTree = ""; }; + 50ABBE031925AB6E00A911A9 /* CCScriptSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCScriptSupport.cpp; path = ../base/CCScriptSupport.cpp; sourceTree = ""; }; + 50ABBE041925AB6E00A911A9 /* CCScriptSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCScriptSupport.h; path = ../base/CCScriptSupport.h; sourceTree = ""; }; + 50ABBE051925AB6E00A911A9 /* CCTouch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCTouch.cpp; path = ../base/CCTouch.cpp; sourceTree = ""; }; + 50ABBE061925AB6E00A911A9 /* CCTouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCTouch.h; path = ../base/CCTouch.h; sourceTree = ""; }; + 50ABBE071925AB6E00A911A9 /* ccTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ccTypes.cpp; path = ../base/ccTypes.cpp; sourceTree = ""; }; + 50ABBE081925AB6E00A911A9 /* ccTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ccTypes.h; path = ../base/ccTypes.h; sourceTree = ""; }; + 50ABBE091925AB6E00A911A9 /* CCUserDefault.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCUserDefault.cpp; path = ../base/CCUserDefault.cpp; sourceTree = ""; }; + 50ABBE0A1925AB6E00A911A9 /* CCUserDefault.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCUserDefault.h; path = ../base/CCUserDefault.h; sourceTree = ""; }; + 50ABBE0B1925AB6F00A911A9 /* CCUserDefault.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = CCUserDefault.mm; path = ../base/CCUserDefault.mm; sourceTree = ""; }; + 50ABBE0C1925AB6F00A911A9 /* CCUserDefaultAndroid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCUserDefaultAndroid.cpp; path = ../base/CCUserDefaultAndroid.cpp; sourceTree = ""; }; + 50ABBE0D1925AB6F00A911A9 /* ccUTF8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ccUTF8.cpp; path = ../base/ccUTF8.cpp; sourceTree = ""; }; + 50ABBE0E1925AB6F00A911A9 /* ccUTF8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ccUTF8.h; path = ../base/ccUTF8.h; sourceTree = ""; }; + 50ABBE0F1925AB6F00A911A9 /* ccUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ccUtils.cpp; path = ../base/ccUtils.cpp; sourceTree = ""; }; + 50ABBE101925AB6F00A911A9 /* ccUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ccUtils.h; path = ../base/ccUtils.h; sourceTree = ""; }; + 50ABBE111925AB6F00A911A9 /* CCValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCValue.cpp; path = ../base/CCValue.cpp; sourceTree = ""; }; + 50ABBE121925AB6F00A911A9 /* CCValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCValue.h; path = ../base/CCValue.h; sourceTree = ""; }; + 50ABBE131925AB6F00A911A9 /* CCVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCVector.h; path = ../base/CCVector.h; sourceTree = ""; }; + 50ABBE141925AB6F00A911A9 /* etc1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = etc1.cpp; path = ../base/etc1.cpp; sourceTree = ""; }; + 50ABBE151925AB6F00A911A9 /* etc1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = etc1.h; path = ../base/etc1.h; sourceTree = ""; }; + 50ABBE161925AB6F00A911A9 /* firePngData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = firePngData.h; path = ../base/firePngData.h; sourceTree = ""; }; + 50ABBE171925AB6F00A911A9 /* s3tc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = s3tc.cpp; path = ../base/s3tc.cpp; sourceTree = ""; }; + 50ABBE181925AB6F00A911A9 /* s3tc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = s3tc.h; path = ../base/s3tc.h; sourceTree = ""; }; + 50ABBE191925AB6F00A911A9 /* TGAlib.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TGAlib.cpp; path = ../base/TGAlib.cpp; sourceTree = ""; }; + 50ABBE1A1925AB6F00A911A9 /* TGAlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TGAlib.h; path = ../base/TGAlib.h; sourceTree = ""; }; + 50ABBE1B1925AB6F00A911A9 /* uthash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = uthash.h; path = ../base/uthash.h; sourceTree = ""; }; + 50ABBE1C1925AB6F00A911A9 /* utlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = utlist.h; path = ../base/utlist.h; sourceTree = ""; }; + 50ABBE1D1925AB6F00A911A9 /* ZipUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ZipUtils.cpp; path = ../base/ZipUtils.cpp; sourceTree = ""; }; + 50ABBE1E1925AB6F00A911A9 /* ZipUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ZipUtils.h; path = ../base/ZipUtils.h; sourceTree = ""; }; + 50ABBF1B1926664700A911A9 /* CCFileUtilsApple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCFileUtilsApple.h; sourceTree = ""; }; + 50ABBF1C1926664700A911A9 /* CCFileUtilsApple.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCFileUtilsApple.mm; sourceTree = ""; }; + 50ABBF1D1926664700A911A9 /* CCLock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCLock.cpp; sourceTree = ""; }; + 50ABBF1E1926664700A911A9 /* CCLock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCLock.h; sourceTree = ""; }; + 50ABBF1F1926664700A911A9 /* CCThread.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCThread.mm; sourceTree = ""; }; + 50ABBF201926664700A911A9 /* CCApplicationProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCApplicationProtocol.h; sourceTree = ""; }; + 50ABBF211926664700A911A9 /* CCCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCCommon.h; sourceTree = ""; }; + 50ABBF221926664700A911A9 /* CCDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCDevice.h; sourceTree = ""; }; + 50ABBF231926664700A911A9 /* CCFileUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCFileUtils.cpp; sourceTree = ""; }; + 50ABBF241926664700A911A9 /* CCFileUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCFileUtils.h; sourceTree = ""; }; + 50ABBF251926664700A911A9 /* CCGLViewProtocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLViewProtocol.cpp; sourceTree = ""; }; + 50ABBF261926664700A911A9 /* CCGLViewProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLViewProtocol.h; sourceTree = ""; }; + 50ABBF271926664700A911A9 /* CCImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCImage.cpp; sourceTree = ""; }; + 50ABBF281926664700A911A9 /* CCImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCImage.h; sourceTree = ""; }; + 50ABBF291926664700A911A9 /* CCSAXParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCSAXParser.cpp; sourceTree = ""; }; + 50ABBF2A1926664700A911A9 /* CCSAXParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSAXParser.h; sourceTree = ""; }; + 50ABBF2B1926664700A911A9 /* CCThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCThread.cpp; sourceTree = ""; }; + 50ABBF2C1926664700A911A9 /* CCThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCThread.h; sourceTree = ""; }; + 50ABBF2E1926664700A911A9 /* CCGLView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLView.cpp; sourceTree = ""; }; + 50ABBF2F1926664700A911A9 /* CCGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLView.h; sourceTree = ""; }; + 50ABBF4F1926664700A911A9 /* CCApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCApplication.h; sourceTree = ""; }; + 50ABBF501926664700A911A9 /* CCApplication.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCApplication.mm; sourceTree = ""; }; + 50ABBF511926664700A911A9 /* CCCommon.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCCommon.mm; sourceTree = ""; }; + 50ABBF521926664700A911A9 /* CCDevice.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCDevice.mm; sourceTree = ""; }; + 50ABBF531926664700A911A9 /* CCGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGL.h; sourceTree = ""; }; + 50ABBF541926664700A911A9 /* CCPlatformDefine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = ""; }; + 50ABBF551926664700A911A9 /* CCStdC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = ""; }; 50DC5180187B817900A9C23F /* RELEASE_NOTES.md */ = {isa = PBXFileReference; lastKnownFileType = text; name = RELEASE_NOTES.md; path = ../docs/RELEASE_NOTES.md; sourceTree = ""; }; 50E6D30C18DADB5D0051CA34 /* CCProtectedNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCProtectedNode.cpp; sourceTree = ""; }; 50E6D30D18DADB5D0051CA34 /* CCProtectedNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCProtectedNode.h; sourceTree = ""; }; @@ -2742,69 +2763,15 @@ 50FCEB9018C72017004AD434 /* WidgetReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WidgetReader.cpp; sourceTree = ""; }; 50FCEB9118C72017004AD434 /* WidgetReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WidgetReader.h; sourceTree = ""; }; 50FCEB9218C72017004AD434 /* WidgetReaderProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WidgetReaderProtocol.h; sourceTree = ""; }; - A0053F46189B2BEA0035A564 /* Android.mk */ = {isa = PBXFileReference; lastKnownFileType = text; path = Android.mk; sourceTree = ""; }; - A0053F47189B2BEA0035A564 /* CCApplication.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCApplication.cpp; sourceTree = ""; }; - A0053F48189B2BEA0035A564 /* CCApplication.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCApplication.h; sourceTree = ""; }; - A0053F49189B2BEA0035A564 /* CCCommon.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCCommon.cpp; sourceTree = ""; }; - A0053F4A189B2BEA0035A564 /* CCDevice.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCDevice.cpp; sourceTree = ""; }; - A0053F4B189B2BEA0035A564 /* CCFileUtilsAndroid.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCFileUtilsAndroid.cpp; sourceTree = ""; }; - A0053F4C189B2BEA0035A564 /* CCFileUtilsAndroid.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCFileUtilsAndroid.h; sourceTree = ""; }; - A0053F4D189B2BEA0035A564 /* CCGL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCGL.h; sourceTree = ""; }; - A0053F4E189B2BEA0035A564 /* CCGLView.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLView.cpp; sourceTree = ""; }; - A0053F4F189B2BEA0035A564 /* CCGLView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCGLView.h; sourceTree = ""; }; - A0053F51189B2BEA0035A564 /* CCPlatformDefine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = ""; }; - A0053F52189B2BEA0035A564 /* CCStdC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = ""; }; - A0053FA8189B2BEA0035A564 /* CCApplication.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCApplication.cpp; sourceTree = ""; }; - A0053FA9189B2BEA0035A564 /* CCApplication.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCApplication.h; sourceTree = ""; }; - A0053FAA189B2BEA0035A564 /* CCCommon.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCCommon.cpp; sourceTree = ""; }; - A0053FAB189B2BEA0035A564 /* CCDevice.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCDevice.cpp; sourceTree = ""; }; - A0053FAC189B2BEA0035A564 /* CCFileUtilsWin32.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCFileUtilsWin32.cpp; sourceTree = ""; }; - A0053FAD189B2BEA0035A564 /* CCFileUtilsWin32.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCFileUtilsWin32.h; sourceTree = ""; }; - A0053FAE189B2BEA0035A564 /* CCGL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCGL.h; sourceTree = ""; }; - A0053FB0189B2BEA0035A564 /* CCPlatformDefine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = ""; }; - A0053FB1189B2BEA0035A564 /* CCStdC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCStdC.cpp; sourceTree = ""; }; - A0053FB2189B2BEA0035A564 /* CCStdC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = ""; }; - A0053FB6189B2BEA0035A564 /* CCApplication.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCApplication.cpp; sourceTree = ""; }; - A0053FB7189B2BEA0035A564 /* CCApplication.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCApplication.h; sourceTree = ""; }; - A0053FB8189B2BEA0035A564 /* CCCommon.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCCommon.cpp; sourceTree = ""; }; - A0053FB9189B2BEA0035A564 /* CCDevice.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCDevice.cpp; sourceTree = ""; }; - A0053FBA189B2BEA0035A564 /* CCFileUtilsLinux.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCFileUtilsLinux.cpp; sourceTree = ""; }; - A0053FBB189B2BEA0035A564 /* CCFileUtilsLinux.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCFileUtilsLinux.h; sourceTree = ""; }; - A0053FBC189B2BEA0035A564 /* CCGL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCGL.h; sourceTree = ""; }; - A0053FBE189B2BEA0035A564 /* CCPlatformDefine.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCPlatformDefine.h; sourceTree = ""; }; - A0053FBF189B2BEA0035A564 /* CCStdC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCStdC.cpp; sourceTree = ""; }; - A0053FC0189B2BEA0035A564 /* CCStdC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCStdC.h; sourceTree = ""; }; A03F2CB81780BD04006731B9 /* libchipmunk Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libchipmunk Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A03F2D9B1780BDF7006731B9 /* libbox2d Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libbox2d Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A03F2ED617814268006731B9 /* libCocosDenshion Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libCocosDenshion Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A03F2FD617814595006731B9 /* libcocos2dx-extensions Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2dx-extensions Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - A04583F0189053B500E32FE8 /* CCGLView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = CCGLView.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; - A04583F1189053B500E32FE8 /* CCGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = CCGLView.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; A07A4D641783777C0073F6A7 /* libcocos2dx iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2dx iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A07A4EFC1783867C0073F6A7 /* libcocos2dx-extensions iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2dx-extensions iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A07A4F3B178387670073F6A7 /* libchipmunk iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libchipmunk iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A07A4F9E1783876B0073F6A7 /* libbox2d iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libbox2d iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A07A4FB4178387730073F6A7 /* libCocosDenshion iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libCocosDenshion iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - B2AF2F8218EBAEAE00C5807C /* MathUtil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MathUtil.cpp; sourceTree = ""; }; - B2AF2F8318EBAEAE00C5807C /* MathUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MathUtil.h; sourceTree = ""; }; - B2AF2F8418EBAEAE00C5807C /* MathUtil.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MathUtil.inl; sourceTree = ""; }; - B2AF2F8518EBAEAE00C5807C /* MathUtilNeon.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MathUtilNeon.inl; sourceTree = ""; }; - B2AF2F8618EBAEAE00C5807C /* Matrix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Matrix.cpp; sourceTree = ""; }; - B2AF2F8718EBAEAE00C5807C /* Matrix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Matrix.h; sourceTree = ""; }; - B2AF2F8818EBAEAE00C5807C /* Matrix.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Matrix.inl; sourceTree = ""; }; - B2AF2F8918EBAEAE00C5807C /* Quaternion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Quaternion.cpp; sourceTree = ""; }; - B2AF2F8A18EBAEAE00C5807C /* Quaternion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Quaternion.h; sourceTree = ""; }; - B2AF2F8B18EBAEAE00C5807C /* Quaternion.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Quaternion.inl; sourceTree = ""; }; - B2AF2F8C18EBAEAE00C5807C /* Vector2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Vector2.cpp; sourceTree = ""; }; - B2AF2F8D18EBAEAE00C5807C /* Vector2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Vector2.h; sourceTree = ""; }; - B2AF2F8E18EBAEAE00C5807C /* Vector2.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Vector2.inl; sourceTree = ""; }; - B2AF2F8F18EBAEAE00C5807C /* Vector3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Vector3.cpp; sourceTree = ""; }; - B2AF2F9018EBAEAE00C5807C /* Vector3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Vector3.h; sourceTree = ""; }; - B2AF2F9118EBAEAE00C5807C /* Vector3.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Vector3.inl; sourceTree = ""; }; - B2AF2F9218EBAEAE00C5807C /* Vector4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Vector4.cpp; sourceTree = ""; }; - B2AF2F9318EBAEAE00C5807C /* Vector4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Vector4.h; sourceTree = ""; }; - B2AF2F9418EBAEAE00C5807C /* Vector4.inl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Vector4.inl; sourceTree = ""; }; - B2AF2FB018EBBDA100C5807C /* CCMath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCMath.h; sourceTree = ""; }; B37510451823AC7B00B3BA6A /* CCPhysicsBodyInfo_chipmunk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCPhysicsBodyInfo_chipmunk.cpp; sourceTree = ""; }; B37510461823AC7B00B3BA6A /* CCPhysicsBodyInfo_chipmunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPhysicsBodyInfo_chipmunk.h; sourceTree = ""; }; B37510471823AC7B00B3BA6A /* CCPhysicsContactInfo_chipmunk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCPhysicsContactInfo_chipmunk.cpp; sourceTree = ""; }; @@ -2922,6 +2889,7 @@ 46A15FCE1807A544005B8026 /* README.md */, 50DC5180187B817900A9C23F /* RELEASE_NOTES.md */, 46A169A11807B037005B8026 /* 2d */, + 50ABBEDB1926664700A911A9 /* platform */, 46A15FD01807A56F005B8026 /* audio */, 1A5700A2180BC5E60088DEC7 /* base */, 1A01C67518F57BE800EFE3A6 /* deprecated */, @@ -3051,81 +3019,103 @@ 1A5700A2180BC5E60088DEC7 /* base */ = { isa = PBXGroup; children = ( - 500DC8E719106300007B91BF /* atitc.cpp */, - 500DC8E819106300007B91BF /* atitc.h */, - 500DC8E919106300007B91BF /* base64.cpp */, - 500DC8EA19106300007B91BF /* base64.h */, - 500DC8EB19106300007B91BF /* CCAutoreleasePool.cpp */, - 500DC8EC19106300007B91BF /* CCAutoreleasePool.h */, - 500DC8ED19106300007B91BF /* ccConfig.h */, - 500DC8EE19106300007B91BF /* CCConfiguration.cpp */, - 500DC8EF19106300007B91BF /* CCConfiguration.h */, - 500DC8F019106300007B91BF /* CCConsole.cpp */, - 500DC8F119106300007B91BF /* CCConsole.h */, - 500DC8F219106300007B91BF /* CCData.cpp */, - 500DC8F319106300007B91BF /* CCData.h */, - 500DC8F419106300007B91BF /* CCDataVisitor.cpp */, - 500DC8F519106300007B91BF /* CCDataVisitor.h */, - 500DC8F619106300007B91BF /* CCDirector.cpp */, - 500DC8F719106300007B91BF /* CCDirector.h */, - 500DC8F819106300007B91BF /* CCEvent.cpp */, - 500DC8F919106300007B91BF /* CCEvent.h */, - 500DC8FA19106300007B91BF /* CCEventAcceleration.cpp */, - 500DC8FB19106300007B91BF /* CCEventAcceleration.h */, - 500DC8FC19106300007B91BF /* CCEventCustom.cpp */, - 500DC8FD19106300007B91BF /* CCEventCustom.h */, - 500DC8FE19106300007B91BF /* CCEventDispatcher.cpp */, - 500DC8FF19106300007B91BF /* CCEventDispatcher.h */, - 500DC90019106300007B91BF /* CCEventKeyboard.cpp */, - 500DC90119106300007B91BF /* CCEventKeyboard.h */, - 500DC90219106300007B91BF /* CCEventListener.cpp */, - 500DC90319106300007B91BF /* CCEventListener.h */, - 500DC90419106300007B91BF /* CCEventListenerAcceleration.cpp */, - 500DC90519106300007B91BF /* CCEventListenerAcceleration.h */, - 500DC90619106300007B91BF /* CCEventListenerCustom.cpp */, - 500DC90719106300007B91BF /* CCEventListenerCustom.h */, - 500DC90819106300007B91BF /* CCEventListenerKeyboard.cpp */, - 500DC90919106300007B91BF /* CCEventListenerKeyboard.h */, - 500DC90A19106300007B91BF /* CCEventListenerMouse.cpp */, - 500DC90B19106300007B91BF /* CCEventListenerMouse.h */, - 500DC90C19106300007B91BF /* CCEventListenerTouch.cpp */, - 500DC90D19106300007B91BF /* CCEventListenerTouch.h */, - 500DC90E19106300007B91BF /* CCEventMouse.cpp */, - 500DC90F19106300007B91BF /* CCEventMouse.h */, - 500DC91019106300007B91BF /* CCEventTouch.cpp */, - 500DC91119106300007B91BF /* CCEventTouch.h */, - 500DC91219106300007B91BF /* CCEventType.h */, - 500DC91319106300007B91BF /* ccMacros.h */, - 500DC91419106300007B91BF /* CCMap.h */, - 500DC91519106300007B91BF /* CCNS.cpp */, - 500DC91619106300007B91BF /* CCNS.h */, - 500DC91719106300007B91BF /* CCPlatformConfig.h */, - 500DC91819106300007B91BF /* CCPlatformMacros.h */, - 500DC9BA19106E89007B91BF /* CCProfiling.cpp */, - 500DC9BB19106E89007B91BF /* CCProfiling.h */, - 500DC91919106300007B91BF /* CCRef.cpp */, - 500DC91A19106300007B91BF /* CCRef.h */, - 500DC91B19106300007B91BF /* CCRefPtr.h */, - 500DC91C19106300007B91BF /* CCScheduler.cpp */, - 500DC91D19106300007B91BF /* CCScheduler.h */, - 500DC9AE1910633C007B91BF /* CCTouch.cpp */, - 500DC9AF1910633C007B91BF /* CCTouch.h */, - 500DC91E19106300007B91BF /* ccTypes.cpp */, - 500DC91F19106300007B91BF /* ccTypes.h */, - 500DC92019106300007B91BF /* CCValue.cpp */, - 500DC92119106300007B91BF /* CCValue.h */, - 500DC92219106300007B91BF /* CCVector.h */, - 500DC92319106300007B91BF /* CMakeLists.txt */, - 500DC92419106300007B91BF /* etc1.cpp */, - 500DC92519106300007B91BF /* etc1.h */, - 500DC92619106300007B91BF /* s3tc.cpp */, - 500DC92719106300007B91BF /* s3tc.h */, - 500DC92819106300007B91BF /* ZipUtils.cpp */, - 500DC92919106300007B91BF /* ZipUtils.h */, - 296CAD201915EC8000C64FBF /* CCEventFocus.cpp */, - 296CAD211915EC8000C64FBF /* CCEventFocus.h */, - 296CAD261915EC9900C64FBF /* CCEventListenerFocus.cpp */, - 296CAD271915EC9900C64FBF /* CCEventListenerFocus.h */, + 50ABBDC11925AB6E00A911A9 /* atitc.cpp */, + 50ABBDC21925AB6E00A911A9 /* atitc.h */, + 50ABBDC31925AB6E00A911A9 /* base64.cpp */, + 50ABBDC41925AB6E00A911A9 /* base64.h */, + 50ABBDC51925AB6E00A911A9 /* CCAutoreleasePool.cpp */, + 50ABBDC61925AB6E00A911A9 /* CCAutoreleasePool.h */, + 50ABBDC71925AB6E00A911A9 /* ccCArray.cpp */, + 50ABBDC81925AB6E00A911A9 /* ccCArray.h */, + 50ABBDC91925AB6E00A911A9 /* ccConfig.h */, + 50ABBDCA1925AB6E00A911A9 /* CCConfiguration.cpp */, + 50ABBDCB1925AB6E00A911A9 /* CCConfiguration.h */, + 50ABBDCC1925AB6E00A911A9 /* CCConsole.cpp */, + 50ABBDCD1925AB6E00A911A9 /* CCConsole.h */, + 50ABBDCE1925AB6E00A911A9 /* CCData.cpp */, + 50ABBDCF1925AB6E00A911A9 /* CCData.h */, + 50ABBDD01925AB6E00A911A9 /* CCDataVisitor.cpp */, + 50ABBDD11925AB6E00A911A9 /* CCDataVisitor.h */, + 50ABBDD21925AB6E00A911A9 /* CCDirector.cpp */, + 50ABBDD31925AB6E00A911A9 /* CCDirector.h */, + 50ABBDD41925AB6E00A911A9 /* CCEvent.cpp */, + 50ABBDD51925AB6E00A911A9 /* CCEvent.h */, + 50ABBDD61925AB6E00A911A9 /* CCEventAcceleration.cpp */, + 50ABBDD71925AB6E00A911A9 /* CCEventAcceleration.h */, + 50ABBDD81925AB6E00A911A9 /* CCEventCustom.cpp */, + 50ABBDD91925AB6E00A911A9 /* CCEventCustom.h */, + 50ABBDDA1925AB6E00A911A9 /* CCEventDispatcher.cpp */, + 50ABBDDB1925AB6E00A911A9 /* CCEventDispatcher.h */, + 50ABBDDC1925AB6E00A911A9 /* CCEventFocus.cpp */, + 50ABBDDD1925AB6E00A911A9 /* CCEventFocus.h */, + 50ABBDDE1925AB6E00A911A9 /* CCEventKeyboard.cpp */, + 50ABBDDF1925AB6E00A911A9 /* CCEventKeyboard.h */, + 50ABBDE01925AB6E00A911A9 /* CCEventListener.cpp */, + 50ABBDE11925AB6E00A911A9 /* CCEventListener.h */, + 50ABBDE21925AB6E00A911A9 /* CCEventListenerAcceleration.cpp */, + 50ABBDE31925AB6E00A911A9 /* CCEventListenerAcceleration.h */, + 50ABBDE41925AB6E00A911A9 /* CCEventListenerCustom.cpp */, + 50ABBDE51925AB6E00A911A9 /* CCEventListenerCustom.h */, + 50ABBDE61925AB6E00A911A9 /* CCEventListenerFocus.cpp */, + 50ABBDE71925AB6E00A911A9 /* CCEventListenerFocus.h */, + 50ABBDE81925AB6E00A911A9 /* CCEventListenerKeyboard.cpp */, + 50ABBDE91925AB6E00A911A9 /* CCEventListenerKeyboard.h */, + 50ABBDEA1925AB6E00A911A9 /* CCEventListenerMouse.cpp */, + 50ABBDEB1925AB6E00A911A9 /* CCEventListenerMouse.h */, + 50ABBDEC1925AB6E00A911A9 /* CCEventListenerTouch.cpp */, + 50ABBDED1925AB6E00A911A9 /* CCEventListenerTouch.h */, + 50ABBDEE1925AB6E00A911A9 /* CCEventMouse.cpp */, + 50ABBDEF1925AB6E00A911A9 /* CCEventMouse.h */, + 50ABBDF01925AB6E00A911A9 /* CCEventTouch.cpp */, + 50ABBDF11925AB6E00A911A9 /* CCEventTouch.h */, + 50ABBDF21925AB6E00A911A9 /* CCEventType.h */, + 50ABBDF31925AB6E00A911A9 /* ccFPSImages.c */, + 50ABBDF41925AB6E00A911A9 /* ccFPSImages.h */, + 503DD8F21926B0DB00CD74DD /* CCIMEDelegate.h */, + 503DD8F31926B0DB00CD74DD /* CCIMEDispatcher.cpp */, + 503DD8F41926B0DB00CD74DD /* CCIMEDispatcher.h */, + 50ABBDF51925AB6E00A911A9 /* ccMacros.h */, + 50ABBDF61925AB6E00A911A9 /* CCMap.h */, + 50ABBDF71925AB6E00A911A9 /* CCNS.cpp */, + 50ABBDF81925AB6E00A911A9 /* CCNS.h */, + 50ABBDF91925AB6E00A911A9 /* CCPlatformConfig.h */, + 50ABBDFA1925AB6E00A911A9 /* CCPlatformMacros.h */, + 50ABBDFB1925AB6E00A911A9 /* CCProfiling.cpp */, + 50ABBDFC1925AB6E00A911A9 /* CCProfiling.h */, + 50ABBDFD1925AB6E00A911A9 /* CCProtocols.h */, + 50ABBDFE1925AB6E00A911A9 /* CCRef.cpp */, + 50ABBDFF1925AB6E00A911A9 /* CCRef.h */, + 50ABBE001925AB6E00A911A9 /* CCRefPtr.h */, + 50ABBE011925AB6E00A911A9 /* CCScheduler.cpp */, + 50ABBE021925AB6E00A911A9 /* CCScheduler.h */, + 50ABBE031925AB6E00A911A9 /* CCScriptSupport.cpp */, + 50ABBE041925AB6E00A911A9 /* CCScriptSupport.h */, + 50ABBE051925AB6E00A911A9 /* CCTouch.cpp */, + 50ABBE061925AB6E00A911A9 /* CCTouch.h */, + 50ABBE071925AB6E00A911A9 /* ccTypes.cpp */, + 50ABBE081925AB6E00A911A9 /* ccTypes.h */, + 50ABBE091925AB6E00A911A9 /* CCUserDefault.cpp */, + 50ABBE0A1925AB6E00A911A9 /* CCUserDefault.h */, + 50ABBE0B1925AB6F00A911A9 /* CCUserDefault.mm */, + 50ABBE0C1925AB6F00A911A9 /* CCUserDefaultAndroid.cpp */, + 50ABBE0D1925AB6F00A911A9 /* ccUTF8.cpp */, + 50ABBE0E1925AB6F00A911A9 /* ccUTF8.h */, + 50ABBE0F1925AB6F00A911A9 /* ccUtils.cpp */, + 50ABBE101925AB6F00A911A9 /* ccUtils.h */, + 50ABBE111925AB6F00A911A9 /* CCValue.cpp */, + 50ABBE121925AB6F00A911A9 /* CCValue.h */, + 50ABBE131925AB6F00A911A9 /* CCVector.h */, + 50ABBE141925AB6F00A911A9 /* etc1.cpp */, + 50ABBE151925AB6F00A911A9 /* etc1.h */, + 50ABBE161925AB6F00A911A9 /* firePngData.h */, + 50ABBE171925AB6F00A911A9 /* s3tc.cpp */, + 50ABBE181925AB6F00A911A9 /* s3tc.h */, + 50ABBE191925AB6F00A911A9 /* TGAlib.cpp */, + 50ABBE1A1925AB6F00A911A9 /* TGAlib.h */, + 50ABBE1B1925AB6F00A911A9 /* uthash.h */, + 50ABBE1C1925AB6F00A911A9 /* utlist.h */, + 50ABBE1D1925AB6F00A911A9 /* ZipUtils.cpp */, + 50ABBE1E1925AB6F00A911A9 /* ZipUtils.h */, ); name = base; path = ../cocos/2d; @@ -3242,15 +3232,6 @@ name = "particle-nodes"; sourceTree = ""; }; - 1A570231180BCC380088DEC7 /* script-support */ = { - isa = PBXGroup; - children = ( - 1A570232180BCC4D0088DEC7 /* CCScriptSupport.cpp */, - 1A570233180BCC4D0088DEC7 /* CCScriptSupport.h */, - ); - name = "script-support"; - sourceTree = ""; - }; 1A570275180BCC840088DEC7 /* sprite-nodes */ = { isa = PBXGroup; children = ( @@ -3273,16 +3254,10 @@ 1A57029A180BCD4F0088DEC7 /* support */ = { isa = PBXGroup; children = ( - 1A57032A180BCFBC0088DEC7 /* user-default */, - 1A570321180BCF580088DEC7 /* image-support */, - 1A570314180BCF1C0088DEC7 /* data-support */, - 1A570307180BCEFB0088DEC7 /* component */, - 1A5702AD180BCDBC0088DEC7 /* ccUTF8.cpp */, - 1A5702AE180BCDBC0088DEC7 /* ccUTF8.h */, - 1A570304180BCED90088DEC7 /* ccUtils.cpp */, - 1A5702B9180BCDFC0088DEC7 /* ccUtils.h */, - 1A5702B3180BCDF40088DEC7 /* CCVertex.cpp */, - 1A5702B4180BCDF40088DEC7 /* CCVertex.h */, + 1A570308180BCF190088DEC7 /* CCComponent.cpp */, + 1A570309180BCF190088DEC7 /* CCComponent.h */, + 1A57030A180BCF190088DEC7 /* CCComponentContainer.cpp */, + 1A57030B180BCF190088DEC7 /* CCComponentContainer.h */, ); name = support; sourceTree = ""; @@ -3292,9 +3267,6 @@ children = ( 1A5702C6180BCE370088DEC7 /* CCTextFieldTTF.cpp */, 1A5702C7180BCE370088DEC7 /* CCTextFieldTTF.h */, - 1A5702BD180BCE2A0088DEC7 /* CCIMEDelegate.h */, - 1A5702BE180BCE2A0088DEC7 /* CCIMEDispatcher.cpp */, - 1A5702BF180BCE2A0088DEC7 /* CCIMEDispatcher.h */, ); name = "text-input-node"; sourceTree = ""; @@ -3302,12 +3274,6 @@ 1A5702CC180BCE410088DEC7 /* textures */ = { isa = PBXGroup; children = ( - 1A5702CD180BCE560088DEC7 /* CCTexture2D.cpp */, - 1A5702CE180BCE570088DEC7 /* CCTexture2D.h */, - 1A5702CF180BCE570088DEC7 /* CCTextureAtlas.cpp */, - 1A5702D0180BCE570088DEC7 /* CCTextureAtlas.h */, - 1A5702D1180BCE570088DEC7 /* CCTextureCache.cpp */, - 1A5702D2180BCE570088DEC7 /* CCTextureCache.h */, ); name = textures; sourceTree = ""; @@ -3331,48 +3297,6 @@ name = "tilemap-parallax-nodes"; sourceTree = ""; }; - 1A570307180BCEFB0088DEC7 /* component */ = { - isa = PBXGroup; - children = ( - 1A570308180BCF190088DEC7 /* CCComponent.cpp */, - 1A570309180BCF190088DEC7 /* CCComponent.h */, - 1A57030A180BCF190088DEC7 /* CCComponentContainer.cpp */, - 1A57030B180BCF190088DEC7 /* CCComponentContainer.h */, - ); - name = component; - sourceTree = ""; - }; - 1A570314180BCF1C0088DEC7 /* data-support */ = { - isa = PBXGroup; - children = ( - 1A570315180BCF430088DEC7 /* ccCArray.cpp */, - 1A570316180BCF430088DEC7 /* ccCArray.h */, - 1A570317180BCF430088DEC7 /* uthash.h */, - 1A570318180BCF430088DEC7 /* utlist.h */, - ); - name = "data-support"; - sourceTree = ""; - }; - 1A570321180BCF580088DEC7 /* image-support */ = { - isa = PBXGroup; - children = ( - 1A570322180BCF660088DEC7 /* TGAlib.cpp */, - 1A570323180BCF660088DEC7 /* TGAlib.h */, - ); - name = "image-support"; - sourceTree = ""; - }; - 1A57032A180BCFBC0088DEC7 /* user-default */ = { - isa = PBXGroup; - children = ( - 1A57032B180BCFD50088DEC7 /* CCUserDefault.cpp */, - 1A57032C180BCFD50088DEC7 /* CCUserDefault.h */, - 1A57032D180BCFD50088DEC7 /* CCUserDefault.mm */, - 1A57032E180BCFD50088DEC7 /* CCUserDefaultAndroid.cpp */, - ); - name = "user-default"; - sourceTree = ""; - }; 1A57033E180BD0490088DEC7 /* external */ = { isa = PBXGroup; children = ( @@ -4432,12 +4356,8 @@ 46A169A11807B037005B8026 /* 2d */ = { isa = PBXGroup; children = ( - 1A9DCA00180E6955007A3AD4 /* ccFPSImages.c */, - 1A9DCA01180E6955007A3AD4 /* ccFPSImages.h */, 1A9DCA02180E6955007A3AD4 /* CCGLBufferedNode.cpp */, 1A9DCA03180E6955007A3AD4 /* CCGLBufferedNode.h */, - 1A9DCA05180E6955007A3AD4 /* CCProtocols.h */, - 1A9DCA0C180E6955007A3AD4 /* firePngData.h */, 1A570046180BC59A0088DEC7 /* actions */, 1A570095180BC5B00088DEC7 /* base-nodes */, 1A570109180BC8DC0088DEC7 /* draw-nodes */, @@ -4447,8 +4367,6 @@ 1A5701F2180BCB970088DEC7 /* menu-nodes */, 1A5701FF180BCBBD0088DEC7 /* misc-nodes */, 1A570218180BCC000088DEC7 /* particle-nodes */, - 46A16A5A1807B038005B8026 /* platform */, - 1A570231180BCC380088DEC7 /* script-support */, 1A570275180BCC840088DEC7 /* sprite-nodes */, 1A57029A180BCD4F0088DEC7 /* support */, 1A5702BC180BCE0A0088DEC7 /* text-input-node */, @@ -4459,84 +4377,6 @@ path = ../cocos/2d; sourceTree = ""; }; - 46A16A5A1807B038005B8026 /* platform */ = { - isa = PBXGroup; - children = ( - A0053F45189B2BEA0035A564 /* android */, - 46A16A8E1807B038005B8026 /* apple */, - 46A16A941807B038005B8026 /* CCApplicationProtocol.h */, - 46A16A951807B038005B8026 /* CCCommon.h */, - 46A16A961807B038005B8026 /* CCDevice.h */, - 46A16A991807B038005B8026 /* CCFileUtils.cpp */, - 46A16A9A1807B038005B8026 /* CCFileUtils.h */, - 46A16A971807B038005B8026 /* CCGLViewProtocol.cpp */, - 46A16A981807B038005B8026 /* CCGLViewProtocol.h */, - 3E26D40418ACB5D100834404 /* CCImage.cpp */, - 46A16A9B1807B038005B8026 /* CCImage.h */, - 46A16A9F1807B038005B8026 /* CCSAXParser.cpp */, - 46A16AA01807B038005B8026 /* CCSAXParser.h */, - 46A16AA11807B038005B8026 /* CCThread.cpp */, - 46A16AA21807B038005B8026 /* CCThread.h */, - A04583EF189053B500E32FE8 /* desktop */, - 46A16AA31807B038005B8026 /* ios */, - A0053FB5189B2BEA0035A564 /* linux */, - 46A16AC71807B038005B8026 /* mac */, - A0053FA7189B2BEA0035A564 /* win32 */, - ); - path = platform; - sourceTree = ""; - }; - 46A16A8E1807B038005B8026 /* apple */ = { - isa = PBXGroup; - children = ( - 46A16A8F1807B038005B8026 /* CCFileUtilsApple.h */, - 46A16A901807B038005B8026 /* CCFileUtilsApple.mm */, - 46A16A911807B038005B8026 /* CCLock.cpp */, - 46A16A921807B038005B8026 /* CCLock.h */, - 46A16A931807B038005B8026 /* CCThread.mm */, - ); - path = apple; - sourceTree = ""; - }; - 46A16AA31807B038005B8026 /* ios */ = { - isa = PBXGroup; - children = ( - 46A16AA41807B038005B8026 /* CCApplication.h */, - 46A16AA51807B038005B8026 /* CCApplication.mm */, - 46A16AA61807B038005B8026 /* CCCommon.mm */, - 46A16AA71807B038005B8026 /* CCDevice.mm */, - 46A16AA81807B038005B8026 /* CCDirectorCaller.h */, - 46A16AA91807B038005B8026 /* CCDirectorCaller.mm */, - 46A16AAA1807B038005B8026 /* CCGLView.h */, - 46A16AAB1807B038005B8026 /* CCGLView.mm */, - 46A16AAC1807B038005B8026 /* CCES2Renderer.h */, - 46A16AAD1807B038005B8026 /* CCES2Renderer.m */, - 46A16AAE1807B038005B8026 /* CCESRenderer.h */, - 1A0DB7301823827C0025743D /* CCGL.h */, - 46A16AB01807B038005B8026 /* CCImage.mm */, - 46A16AB11807B038005B8026 /* CCPlatformDefine.h */, - 46A16AB21807B038005B8026 /* CCStdC.h */, - 1A0DB7311823827C0025743D /* CCEAGLView.h */, - 46A16AB41807B038005B8026 /* CCEAGLView.mm */, - 46A16AB51807B038005B8026 /* OpenGL_Internal.h */, - ); - path = ios; - sourceTree = ""; - }; - 46A16AC71807B038005B8026 /* mac */ = { - isa = PBXGroup; - children = ( - 3E26D40718ACB63900834404 /* CCDevice.mm */, - 46A16AC81807B038005B8026 /* CCApplication.h */, - 46A16AC91807B038005B8026 /* CCApplication.mm */, - 46A16ACA1807B038005B8026 /* CCCommon.mm */, - 1A0DB7351823828F0025743D /* CCGL.h */, - 46A16AD41807B038005B8026 /* CCPlatformDefine.h */, - 46A16AD51807B038005B8026 /* CCStdC.h */, - ); - path = mac; - sourceTree = ""; - }; 46A170611807CE7A005B8026 /* physics */ = { isa = PBXGroup; children = ( @@ -4577,33 +4417,35 @@ 46A170851807CE87005B8026 /* math */ = { isa = PBXGroup; children = ( - 500DC8CC19105F7D007B91BF /* CCAffineTransform.cpp */, - 500DC8CD19105F7D007B91BF /* CCAffineTransform.h */, - 500DC8CE19105F7D007B91BF /* CCGeometry.cpp */, - 500DC8CF19105F7D007B91BF /* CCGeometry.h */, - 500DC8D019105F7D007B91BF /* CCMathBase.h */, - B2AF2FB018EBBDA100C5807C /* CCMath.h */, - B2AF2F8218EBAEAE00C5807C /* MathUtil.cpp */, - B2AF2F8318EBAEAE00C5807C /* MathUtil.h */, - B2AF2F8418EBAEAE00C5807C /* MathUtil.inl */, - B2AF2F8518EBAEAE00C5807C /* MathUtilNeon.inl */, - B2AF2F8618EBAEAE00C5807C /* Matrix.cpp */, - B2AF2F8718EBAEAE00C5807C /* Matrix.h */, - B2AF2F8818EBAEAE00C5807C /* Matrix.inl */, - B2AF2F8918EBAEAE00C5807C /* Quaternion.cpp */, - B2AF2F8A18EBAEAE00C5807C /* Quaternion.h */, - B2AF2F8B18EBAEAE00C5807C /* Quaternion.inl */, - 500DC9B419106E6D007B91BF /* TransformUtils.cpp */, - 500DC9B519106E6D007B91BF /* TransformUtils.h */, - B2AF2F8C18EBAEAE00C5807C /* Vector2.cpp */, - B2AF2F8D18EBAEAE00C5807C /* Vector2.h */, - B2AF2F8E18EBAEAE00C5807C /* Vector2.inl */, - B2AF2F8F18EBAEAE00C5807C /* Vector3.cpp */, - B2AF2F9018EBAEAE00C5807C /* Vector3.h */, - B2AF2F9118EBAEAE00C5807C /* Vector3.inl */, - B2AF2F9218EBAEAE00C5807C /* Vector4.cpp */, - B2AF2F9318EBAEAE00C5807C /* Vector4.h */, - B2AF2F9418EBAEAE00C5807C /* Vector4.inl */, + 50ABBD1B1925AB0000A911A9 /* CCAffineTransform.cpp */, + 50ABBD1C1925AB0000A911A9 /* CCAffineTransform.h */, + 50ABBD1D1925AB0000A911A9 /* CCGeometry.cpp */, + 50ABBD1E1925AB0000A911A9 /* CCGeometry.h */, + 50ABBD1F1925AB0000A911A9 /* CCMath.h */, + 50ABBD201925AB0000A911A9 /* CCMathBase.h */, + 50ABBD211925AB0000A911A9 /* CCVertex.cpp */, + 50ABBD221925AB0000A911A9 /* CCVertex.h */, + 50ABBD231925AB0000A911A9 /* Mat4.cpp */, + 50ABBD241925AB0000A911A9 /* Mat4.h */, + 50ABBD251925AB0000A911A9 /* Mat4.inl */, + 50ABBD261925AB0000A911A9 /* MathUtil.cpp */, + 50ABBD271925AB0000A911A9 /* MathUtil.h */, + 50ABBD281925AB0000A911A9 /* MathUtil.inl */, + 50ABBD291925AB0000A911A9 /* MathUtilNeon.inl */, + 50ABBD2A1925AB0000A911A9 /* Quaternion.cpp */, + 50ABBD2B1925AB0000A911A9 /* Quaternion.h */, + 50ABBD2C1925AB0000A911A9 /* Quaternion.inl */, + 50ABBD2D1925AB0000A911A9 /* TransformUtils.cpp */, + 50ABBD2E1925AB0000A911A9 /* TransformUtils.h */, + 50ABBD2F1925AB0000A911A9 /* Vec2.cpp */, + 50ABBD301925AB0000A911A9 /* Vec2.h */, + 50ABBD311925AB0000A911A9 /* Vec2.inl */, + 50ABBD321925AB0000A911A9 /* Vec3.cpp */, + 50ABBD331925AB0000A911A9 /* Vec3.h */, + 50ABBD341925AB0000A911A9 /* Vec3.inl */, + 50ABBD351925AB0000A911A9 /* Vec4.cpp */, + 50ABBD361925AB0000A911A9 /* Vec4.h */, + 50ABBD371925AB0000A911A9 /* Vec4.inl */, ); name = math; path = ../cocos/math; @@ -4623,31 +4465,37 @@ isa = PBXGroup; children = ( 5034CA5D191D591900CE6051 /* shaders */, - 5034C9F7191D591000CE6051 /* ccShaders.h */, - 5034C9F8191D591000CE6051 /* ccShaders.cpp */, - 5034C9F9191D591000CE6051 /* CCGLProgramCache.h */, - 5034C9FA191D591000CE6051 /* CCGLProgramCache.cpp */, - 5034CA11191D591000CE6051 /* ccGLStateCache.h */, - 5034CA12191D591000CE6051 /* ccGLStateCache.cpp */, - 5034CA13191D591000CE6051 /* CCGLProgramStateCache.h */, - 5034CA14191D591000CE6051 /* CCGLProgramStateCache.cpp */, - 5034CA15191D591000CE6051 /* CCGLProgramState.h */, - 5034CA16191D591000CE6051 /* CCGLProgramState.cpp */, - 5034CA17191D591000CE6051 /* CCGLProgram.h */, - 5034CA18191D591000CE6051 /* CCGLProgram.cpp */, - 500DC89919105D41007B91BF /* CCBatchCommand.cpp */, - 500DC89A19105D41007B91BF /* CCBatchCommand.h */, - 500DC89B19105D41007B91BF /* CCCustomCommand.cpp */, - 500DC89C19105D41007B91BF /* CCCustomCommand.h */, - 500DC89D19105D41007B91BF /* CCGroupCommand.cpp */, - 500DC89E19105D41007B91BF /* CCGroupCommand.h */, - 500DC8A119105D41007B91BF /* CCQuadCommand.cpp */, - 500DC8A219105D41007B91BF /* CCQuadCommand.h */, - 500DC8A319105D41007B91BF /* CCRenderCommand.cpp */, - 500DC8A419105D41007B91BF /* CCRenderCommand.h */, - 500DC8A519105D41007B91BF /* CCRenderCommandPool.h */, - 500DC8A619105D41007B91BF /* CCRenderer.cpp */, - 500DC8A719105D41007B91BF /* CCRenderer.h */, + 50ABBD641925AB4100A911A9 /* CCBatchCommand.cpp */, + 50ABBD651925AB4100A911A9 /* CCBatchCommand.h */, + 50ABBD661925AB4100A911A9 /* CCCustomCommand.cpp */, + 50ABBD671925AB4100A911A9 /* CCCustomCommand.h */, + 50ABBD681925AB4100A911A9 /* CCGLProgram.cpp */, + 50ABBD691925AB4100A911A9 /* CCGLProgram.h */, + 50ABBD6A1925AB4100A911A9 /* CCGLProgramCache.cpp */, + 50ABBD6B1925AB4100A911A9 /* CCGLProgramCache.h */, + 50ABBD6C1925AB4100A911A9 /* CCGLProgramState.cpp */, + 50ABBD6D1925AB4100A911A9 /* CCGLProgramState.h */, + 50ABBD6E1925AB4100A911A9 /* CCGLProgramStateCache.cpp */, + 50ABBD6F1925AB4100A911A9 /* CCGLProgramStateCache.h */, + 50ABBD701925AB4100A911A9 /* ccGLStateCache.cpp */, + 50ABBD711925AB4100A911A9 /* ccGLStateCache.h */, + 50ABBD721925AB4100A911A9 /* CCGroupCommand.cpp */, + 50ABBD731925AB4100A911A9 /* CCGroupCommand.h */, + 50ABBD741925AB4100A911A9 /* CCQuadCommand.cpp */, + 50ABBD751925AB4100A911A9 /* CCQuadCommand.h */, + 50ABBD761925AB4100A911A9 /* CCRenderCommand.cpp */, + 50ABBD771925AB4100A911A9 /* CCRenderCommand.h */, + 50ABBD781925AB4100A911A9 /* CCRenderCommandPool.h */, + 50ABBD791925AB4100A911A9 /* CCRenderer.cpp */, + 50ABBD7A1925AB4100A911A9 /* CCRenderer.h */, + 50ABBD7B1925AB4100A911A9 /* ccShaders.cpp */, + 50ABBD7C1925AB4100A911A9 /* ccShaders.h */, + 50ABBD7D1925AB4100A911A9 /* CCTexture2D.cpp */, + 50ABBD7E1925AB4100A911A9 /* CCTexture2D.h */, + 50ABBD7F1925AB4100A911A9 /* CCTextureAtlas.cpp */, + 50ABBD801925AB4100A911A9 /* CCTextureAtlas.h */, + 50ABBD811925AB4100A911A9 /* CCTextureCache.cpp */, + 50ABBD821925AB4100A911A9 /* CCTextureCache.h */, ); name = renderer; path = ../cocos/renderer; @@ -4682,6 +4530,91 @@ name = shaders; sourceTree = ""; }; + 503DD8CD1926736A00CD74DD /* ios */ = { + isa = PBXGroup; + children = ( + 503DD8CE1926736A00CD74DD /* CCApplication.h */, + 503DD8CF1926736A00CD74DD /* CCApplication.mm */, + 503DD8D01926736A00CD74DD /* CCCommon.mm */, + 503DD8D11926736A00CD74DD /* CCDevice.mm */, + 503DD8D21926736A00CD74DD /* CCDirectorCaller.h */, + 503DD8D31926736A00CD74DD /* CCDirectorCaller.mm */, + 503DD8D41926736A00CD74DD /* CCEAGLView.h */, + 503DD8D51926736A00CD74DD /* CCEAGLView.mm */, + 503DD8D61926736A00CD74DD /* CCES2Renderer.h */, + 503DD8D71926736A00CD74DD /* CCES2Renderer.m */, + 503DD8D81926736A00CD74DD /* CCESRenderer.h */, + 503DD8D91926736A00CD74DD /* CCGL.h */, + 503DD8DA1926736A00CD74DD /* CCGLView.h */, + 503DD8DB1926736A00CD74DD /* CCGLView.mm */, + 503DD8DC1926736A00CD74DD /* CCImage.mm */, + 503DD8DD1926736A00CD74DD /* CCPlatformDefine.h */, + 503DD8DE1926736A00CD74DD /* CCStdC.h */, + 503DD8DF1926736A00CD74DD /* OpenGL_Internal.h */, + ); + path = ios; + sourceTree = ""; + }; + 50ABBEDB1926664700A911A9 /* platform */ = { + isa = PBXGroup; + children = ( + 503DD8CD1926736A00CD74DD /* ios */, + 50ABBF2D1926664700A911A9 /* desktop */, + 50ABBF4E1926664700A911A9 /* mac */, + 50ABBF1A1926664700A911A9 /* apple */, + 50ABBF201926664700A911A9 /* CCApplicationProtocol.h */, + 50ABBF211926664700A911A9 /* CCCommon.h */, + 50ABBF221926664700A911A9 /* CCDevice.h */, + 50ABBF231926664700A911A9 /* CCFileUtils.cpp */, + 50ABBF241926664700A911A9 /* CCFileUtils.h */, + 50ABBF251926664700A911A9 /* CCGLViewProtocol.cpp */, + 50ABBF261926664700A911A9 /* CCGLViewProtocol.h */, + 50ABBF271926664700A911A9 /* CCImage.cpp */, + 50ABBF281926664700A911A9 /* CCImage.h */, + 50ABBF291926664700A911A9 /* CCSAXParser.cpp */, + 50ABBF2A1926664700A911A9 /* CCSAXParser.h */, + 50ABBF2B1926664700A911A9 /* CCThread.cpp */, + 50ABBF2C1926664700A911A9 /* CCThread.h */, + ); + name = platform; + path = ../cocos/platform; + sourceTree = ""; + }; + 50ABBF1A1926664700A911A9 /* apple */ = { + isa = PBXGroup; + children = ( + 50ABBF1B1926664700A911A9 /* CCFileUtilsApple.h */, + 50ABBF1C1926664700A911A9 /* CCFileUtilsApple.mm */, + 50ABBF1D1926664700A911A9 /* CCLock.cpp */, + 50ABBF1E1926664700A911A9 /* CCLock.h */, + 50ABBF1F1926664700A911A9 /* CCThread.mm */, + ); + path = apple; + sourceTree = ""; + }; + 50ABBF2D1926664700A911A9 /* desktop */ = { + isa = PBXGroup; + children = ( + 50ABBF2E1926664700A911A9 /* CCGLView.cpp */, + 50ABBF2F1926664700A911A9 /* CCGLView.h */, + ); + path = desktop; + sourceTree = ""; + }; + 50ABBF4E1926664700A911A9 /* mac */ = { + isa = PBXGroup; + children = ( + 50ABBF4F1926664700A911A9 /* CCApplication.h */, + 50ABBF501926664700A911A9 /* CCApplication.mm */, + 50ABBF511926664700A911A9 /* CCCommon.mm */, + 50ABBF521926664700A911A9 /* CCDevice.mm */, + 50ABBF531926664700A911A9 /* CCGL.h */, + 50ABBF541926664700A911A9 /* CCPlatformDefine.h */, + 50ABBF551926664700A911A9 /* CCStdC.h */, + ); + path = mac; + sourceTree = ""; + }; 50FCEB6818C72017004AD434 /* WidgetReader */ = { isa = PBXGroup; children = ( @@ -4822,68 +4755,6 @@ path = TextReader; sourceTree = ""; }; - A0053F45189B2BEA0035A564 /* android */ = { - isa = PBXGroup; - children = ( - A0053F46189B2BEA0035A564 /* Android.mk */, - A0053F47189B2BEA0035A564 /* CCApplication.cpp */, - A0053F48189B2BEA0035A564 /* CCApplication.h */, - A0053F49189B2BEA0035A564 /* CCCommon.cpp */, - A0053F4A189B2BEA0035A564 /* CCDevice.cpp */, - A0053F4B189B2BEA0035A564 /* CCFileUtilsAndroid.cpp */, - A0053F4C189B2BEA0035A564 /* CCFileUtilsAndroid.h */, - A0053F4D189B2BEA0035A564 /* CCGL.h */, - A0053F4E189B2BEA0035A564 /* CCGLView.cpp */, - A0053F4F189B2BEA0035A564 /* CCGLView.h */, - A0053F51189B2BEA0035A564 /* CCPlatformDefine.h */, - A0053F52189B2BEA0035A564 /* CCStdC.h */, - ); - path = android; - sourceTree = ""; - }; - A0053FA7189B2BEA0035A564 /* win32 */ = { - isa = PBXGroup; - children = ( - A0053FA8189B2BEA0035A564 /* CCApplication.cpp */, - A0053FA9189B2BEA0035A564 /* CCApplication.h */, - A0053FAA189B2BEA0035A564 /* CCCommon.cpp */, - A0053FAB189B2BEA0035A564 /* CCDevice.cpp */, - A0053FAC189B2BEA0035A564 /* CCFileUtilsWin32.cpp */, - A0053FAD189B2BEA0035A564 /* CCFileUtilsWin32.h */, - A0053FAE189B2BEA0035A564 /* CCGL.h */, - A0053FB0189B2BEA0035A564 /* CCPlatformDefine.h */, - A0053FB1189B2BEA0035A564 /* CCStdC.cpp */, - A0053FB2189B2BEA0035A564 /* CCStdC.h */, - ); - path = win32; - sourceTree = ""; - }; - A0053FB5189B2BEA0035A564 /* linux */ = { - isa = PBXGroup; - children = ( - A0053FB6189B2BEA0035A564 /* CCApplication.cpp */, - A0053FB7189B2BEA0035A564 /* CCApplication.h */, - A0053FB8189B2BEA0035A564 /* CCCommon.cpp */, - A0053FB9189B2BEA0035A564 /* CCDevice.cpp */, - A0053FBA189B2BEA0035A564 /* CCFileUtilsLinux.cpp */, - A0053FBB189B2BEA0035A564 /* CCFileUtilsLinux.h */, - A0053FBC189B2BEA0035A564 /* CCGL.h */, - A0053FBE189B2BEA0035A564 /* CCPlatformDefine.h */, - A0053FBF189B2BEA0035A564 /* CCStdC.cpp */, - A0053FC0189B2BEA0035A564 /* CCStdC.h */, - ); - path = linux; - sourceTree = ""; - }; - A04583EF189053B500E32FE8 /* desktop */ = { - isa = PBXGroup; - children = ( - A04583F0189053B500E32FE8 /* CCGLView.cpp */, - A04583F1189053B500E32FE8 /* CCGLView.h */, - ); - path = desktop; - sourceTree = ""; - }; B3D8D4471799219B0039C204 /* mac */ = { isa = PBXGroup; children = ( @@ -4919,49 +4790,39 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + 50ABBE9B1925AB6F00A911A9 /* CCRef.h in Headers */, + 50ABBE851925AB6F00A911A9 /* ccFPSImages.h in Headers */, 5034CA39191D591100CE6051 /* ccShader_PositionColorLengthTexture.frag in Headers */, 2AC795DF18628723005EC8E1 /* SkeletonBounds.h in Headers */, + 50ABBE891925AB6F00A911A9 /* CCMap.h in Headers */, 2AC795E018628723005EC8E1 /* Event.h in Headers */, 2AC795E118628723005EC8E1 /* EventData.h in Headers */, 50E6D33618E174130051CA34 /* UIHBox.h in Headers */, - 500DC94A19106300007B91BF /* CCDirector.h in Headers */, - 500DC97A19106300007B91BF /* CCEventMouse.h in Headers */, + 50ABBE8D1925AB6F00A911A9 /* CCNS.h in Headers */, 2AC795E218628723005EC8E1 /* BoundingBoxAttachment.h in Headers */, 06CAAAC9186AD7EE0012A414 /* TriggerMng.h in Headers */, 2905FA6018CF08D100240AA3 /* UILayoutParameter.h in Headers */, + 50ABBEA51925AB6F00A911A9 /* CCScriptSupport.h in Headers */, 1ABA68B01888D700007D1BB4 /* CCFontCharMap.h in Headers */, 5034CA3F191D591100CE6051 /* ccShader_Position_uColor.vert in Headers */, - 500DC8B419105D41007B91BF /* CCGroupCommand.h in Headers */, - 500DC8D319105F7D007B91BF /* CCAffineTransform.h in Headers */, - 46A170191807CBFC005B8026 /* CCCommon.h in Headers */, + 50ABBD461925AB0000A911A9 /* CCVertex.h in Headers */, 46A170E71807CECA005B8026 /* CCPhysicsBody.h in Headers */, 2905FA4818CF08D100240AA3 /* UIButton.h in Headers */, 46A170EB1807CECA005B8026 /* CCPhysicsJoint.h in Headers */, - 46A170241807CBFC005B8026 /* CCSAXParser.h in Headers */, - 46A1701A1807CBFC005B8026 /* CCDevice.h in Headers */, - B2AF2F9F18EBAEAE00C5807C /* Quaternion.h in Headers */, - 46A170161807CBFC005B8026 /* CCLock.h in Headers */, - 46A1701C1807CBFC005B8026 /* CCGLViewProtocol.h in Headers */, - 46A1701E1807CBFC005B8026 /* CCFileUtils.h in Headers */, + 50ABBD3E1925AB0000A911A9 /* CCGeometry.h in Headers */, + 50ABBE631925AB6F00A911A9 /* CCEventListenerAcceleration.h in Headers */, 2905FA4418CF08D100240AA3 /* GUIDefine.h in Headers */, B37510771823AC9F00B3BA6A /* CCPhysicsJointInfo_chipmunk.h in Headers */, - 46A1705B1807CC1C005B8026 /* CCPlatformDefine.h in Headers */, 46A170EE1807CECA005B8026 /* CCPhysicsShape.h in Headers */, 2905FA5018CF08D100240AA3 /* UIHelper.h in Headers */, - 46A170261807CBFC005B8026 /* CCThread.h in Headers */, + 50ABBED31925AB6F00A911A9 /* uthash.h in Headers */, 46A170E91807CECA005B8026 /* CCPhysicsContact.h in Headers */, B375107B1823AC9F00B3BA6A /* CCPhysicsWorldInfo_chipmunk.h in Headers */, 2905FA6818CF08D100240AA3 /* UILoadingBar.h in Headers */, - 500DC99A19106300007B91BF /* ccTypes.h in Headers */, 46A170F01807CECA005B8026 /* CCPhysicsWorld.h in Headers */, - 500DC8C219105D41007B91BF /* CCRenderCommandPool.h in Headers */, - 5034CA4D191D591100CE6051 /* ccGLStateCache.h in Headers */, - 46A1705C1807CC1C005B8026 /* CCStdC.h in Headers */, - 46A1704F1807CC1C005B8026 /* CCApplication.h in Headers */, - 500DC98C19106300007B91BF /* CCPlatformMacros.h in Headers */, - 46A170131807CBFC005B8026 /* CCFileUtilsApple.h in Headers */, - 46A1701F1807CBFC005B8026 /* CCImage.h in Headers */, - 46A170181807CBFC005B8026 /* CCApplicationProtocol.h in Headers */, + 50ABBEC11925AB6F00A911A9 /* CCValue.h in Headers */, + 50ABBE871925AB6F00A911A9 /* ccMacros.h in Headers */, + 50ABBE731925AB6F00A911A9 /* CCEventListenerMouse.h in Headers */, 1A570063180BC5A10088DEC7 /* CCAction.h in Headers */, 1A570067180BC5A10088DEC7 /* CCActionCamera.h in Headers */, 1A57006B180BC5A10088DEC7 /* CCActionCatmullRom.h in Headers */, @@ -4972,48 +4833,40 @@ 06CAAAD1186AD8010012A414 /* ObjectFactory.h in Headers */, 1A570077180BC5A10088DEC7 /* CCActionGrid3D.h in Headers */, 1A57007B180BC5A10088DEC7 /* CCActionInstant.h in Headers */, - 500DC8BC19105D41007B91BF /* CCQuadCommand.h in Headers */, - 500DC94E19106300007B91BF /* CCEvent.h in Headers */, 1A57007F180BC5A10088DEC7 /* CCActionInterval.h in Headers */, 1A01C69A18F57BE800EFE3A6 /* CCSet.h in Headers */, - 296CAD2A1915EC9900C64FBF /* CCEventListenerFocus.h in Headers */, 1A570083180BC5A10088DEC7 /* CCActionManager.h in Headers */, 1A570087180BC5A10088DEC7 /* CCActionPageTurn3D.h in Headers */, + 50ABBD911925AB4100A911A9 /* CCGLProgramCache.h in Headers */, ED9C6A9618599AD8000A5232 /* CCNodeGrid.h in Headers */, + 50ABBEC31925AB6F00A911A9 /* CCVector.h in Headers */, 1A57008B180BC5A10088DEC7 /* CCActionProgressTimer.h in Headers */, - 500DC96E19106300007B91BF /* CCEventListenerKeyboard.h in Headers */, - 1A0DB7381823828F0025743D /* CCGL.h in Headers */, + 50ABBD8D1925AB4100A911A9 /* CCGLProgram.h in Headers */, + 50ABBEA11925AB6F00A911A9 /* CCScheduler.h in Headers */, + 50ABBDB71925AB4100A911A9 /* CCTexture2D.h in Headers */, 2905FA6C18CF08D100240AA3 /* UIPageView.h in Headers */, 50FCEB9518C72017004AD434 /* ButtonReader.h in Headers */, + 50ABBE811925AB6F00A911A9 /* CCEventType.h in Headers */, 1A57008F180BC5A10088DEC7 /* CCActionTiledGrid.h in Headers */, 1A570093180BC5A10088DEC7 /* CCActionTween.h in Headers */, - 500DC8C019105D41007B91BF /* CCRenderCommand.h in Headers */, + 50ABBD4A1925AB0000A911A9 /* Mat4.h in Headers */, 1A57009A180BC5C10088DEC7 /* CCAtlasNode.h in Headers */, 1A5700A0180BC5D20088DEC7 /* CCNode.h in Headers */, + 50ABC0671926664800A911A9 /* CCPlatformDefine.h in Headers */, 46C02E0918E91123004B7456 /* xxhash.h in Headers */, - B2AF2FA318EBAEAE00C5807C /* Vector2.h in Headers */, 06CAAAC6186AD7E60012A414 /* TriggerObj.h in Headers */, - 500DC8B019105D41007B91BF /* CCCustomCommand.h in Headers */, - 500DC8AC19105D41007B91BF /* CCBatchCommand.h in Headers */, - A04583F3189053B500E32FE8 /* CCGLView.h in Headers */, - B2AF2FA718EBAEAE00C5807C /* Vector3.h in Headers */, 1A570110180BC8EE0088DEC7 /* CCDrawingPrimitives.h in Headers */, - 500DC8D719105F7D007B91BF /* CCGeometry.h in Headers */, - 500DC96619106300007B91BF /* CCEventListenerAcceleration.h in Headers */, B37510791823AC9F00B3BA6A /* CCPhysicsShapeInfo_chipmunk.h in Headers */, 1A570114180BC8EE0088DEC7 /* CCDrawNode.h in Headers */, - 500DC98219106300007B91BF /* ccMacros.h in Headers */, 1A57011D180BC90D0088DEC7 /* CCGrabber.h in Headers */, 1A570121180BC90D0088DEC7 /* CCGrid.h in Headers */, 5034CA2D191D591100CE6051 /* ccShader_PositionTextureA8Color.frag in Headers */, 50E6D33A18E174130051CA34 /* UIRelativeBox.h in Headers */, - 500DC8C619105D41007B91BF /* CCRenderer.h in Headers */, 50E6D30F18DADB5D0051CA34 /* CCProtectedNode.h in Headers */, - 500DC9BE19106E89007B91BF /* CCProfiling.h in Headers */, 50FCEB9918C72017004AD434 /* CheckBoxReader.h in Headers */, 50E6D33E18E174130051CA34 /* UIVBox.h in Headers */, - 500DC9AC19106300007B91BF /* ZipUtils.h in Headers */, 1AC0269C1914068200FA920D /* ConvertUTF.h in Headers */, + 50ABBED11925AB6F00A911A9 /* TGAlib.h in Headers */, 1A57019F180BCB590088DEC7 /* CCFont.h in Headers */, 1A5701A3180BCB590088DEC7 /* CCFontAtlas.h in Headers */, 1A01C68618F57BE800EFE3A6 /* CCArray.h in Headers */, @@ -5021,106 +4874,100 @@ 1A5701B3180BCB590088DEC7 /* CCFontFNT.h in Headers */, 5034CA47191D591100CE6051 /* ccShader_Label_normal.frag in Headers */, 1A5701B7180BCB5A0088DEC7 /* CCFontFreeType.h in Headers */, - 500DC94219106300007B91BF /* CCData.h in Headers */, 1A5701BB180BCB5A0088DEC7 /* CCLabel.h in Headers */, 1A5701BF180BCB5A0088DEC7 /* CCLabelAtlas.h in Headers */, + 50ABBED91925AB6F00A911A9 /* ZipUtils.h in Headers */, 1A5701C3180BCB5A0088DEC7 /* CCLabelBMFont.h in Headers */, - 500DC93A19106300007B91BF /* CCConfiguration.h in Headers */, + 50ABBE5F1925AB6F00A911A9 /* CCEventListener.h in Headers */, 1A5701C9180BCB5A0088DEC7 /* CCLabelTextFormatter.h in Headers */, 5034CA37191D591100CE6051 /* ccShader_PositionColorLengthTexture.vert in Headers */, 1A5701CD180BCB5A0088DEC7 /* CCLabelTTF.h in Headers */, 1A5701E0180BCB8C0088DEC7 /* CCLayer.h in Headers */, 1A5701E4180BCB8C0088DEC7 /* CCScene.h in Headers */, 1A01C68818F57BE800EFE3A6 /* CCBool.h in Headers */, + 50ABBEAD1925AB6F00A911A9 /* ccTypes.h in Headers */, 1A087AEA1860400400196EF5 /* edtaa3func.h in Headers */, 1A5701E8180BCB8C0088DEC7 /* CCTransition.h in Headers */, 2905FA4C18CF08D100240AA3 /* UICheckBox.h in Headers */, 1A5701EC180BCB8C0088DEC7 /* CCTransitionPageTurn.h in Headers */, 1A5701F0180BCB8C0088DEC7 /* CCTransitionProgress.h in Headers */, 1A5701F9180BCBAD0088DEC7 /* CCMenu.h in Headers */, + 50ABBD401925AB0000A911A9 /* CCMath.h in Headers */, 1A5701FD180BCBAD0088DEC7 /* CCMenuItem.h in Headers */, 1A570204180BCBD40088DEC7 /* CCClippingNode.h in Headers */, 1A01C6A618F58F7500EFE3A6 /* CCNotificationCenter.h in Headers */, 1A57020A180BCBDF0088DEC7 /* CCMotionStreak.h in Headers */, 1A570212180BCBF40088DEC7 /* CCProgressTimer.h in Headers */, 1A570216180BCBF40088DEC7 /* CCRenderTexture.h in Headers */, - 500DC95219106300007B91BF /* CCEventAcceleration.h in Headers */, - 500DC99E19106300007B91BF /* CCValue.h in Headers */, 1A01C69618F57BE800EFE3A6 /* CCInteger.h in Headers */, 1A570223180BCC1A0088DEC7 /* CCParticleBatchNode.h in Headers */, + 50ABBD891925AB4100A911A9 /* CCCustomCommand.h in Headers */, 5034CA43191D591100CE6051 /* ccShader_Label.vert in Headers */, 1A570227180BCC1A0088DEC7 /* CCParticleExamples.h in Headers */, 1A57022B180BCC1A0088DEC7 /* CCParticleSystem.h in Headers */, 5034CA2F191D591100CE6051 /* ccShader_PositionTexture.vert in Headers */, + 50ABBE951925AB6F00A911A9 /* CCProfiling.h in Headers */, 5034CA4B191D591100CE6051 /* ccShader_Label_df_glow.frag in Headers */, + 50ABBE4F1925AB6F00A911A9 /* CCEventCustom.h in Headers */, + 50ABBD521925AB0000A911A9 /* Quaternion.h in Headers */, 1A57022F180BCC1A0088DEC7 /* CCParticleSystemQuad.h in Headers */, - 500DC96A19106300007B91BF /* CCEventListenerCustom.h in Headers */, - B2AF2F9718EBAEAE00C5807C /* MathUtil.h in Headers */, - 1A570236180BCC4D0088DEC7 /* CCScriptSupport.h in Headers */, - 500DC95E19106300007B91BF /* CCEventKeyboard.h in Headers */, 2905FA4218CF08D100240AA3 /* CocosGUI.h in Headers */, - 500DC95A19106300007B91BF /* CCEventDispatcher.h in Headers */, 5034CA49191D591100CE6051 /* ccShader_Label_df.frag in Headers */, - 500DC9A019106300007B91BF /* CCVector.h in Headers */, - 500DC92C19106300007B91BF /* atitc.h in Headers */, 1A01C68C18F57BE800EFE3A6 /* CCDeprecated.h in Headers */, - 500DC98419106300007B91BF /* CCMap.h in Headers */, + 50ABBD561925AB0000A911A9 /* TransformUtils.h in Headers */, 2905FA6418CF08D100240AA3 /* UIListView.h in Headers */, 50FCEBB918C72017004AD434 /* TextAtlasReader.h in Headers */, + 50ABBD991925AB4100A911A9 /* CCGLProgramStateCache.h in Headers */, 5034CA3D191D591100CE6051 /* ccShader_PositionColor.frag in Headers */, 1A570280180BCC900088DEC7 /* CCSprite.h in Headers */, 1A570284180BCC900088DEC7 /* CCSpriteBatchNode.h in Headers */, - 500DC9A419106300007B91BF /* etc1.h in Headers */, - 5034CA55191D591100CE6051 /* CCGLProgramState.h in Headers */, 5034CA2B191D591100CE6051 /* ccShader_PositionTextureA8Color.vert in Headers */, 1A570288180BCC900088DEC7 /* CCSpriteFrame.h in Headers */, 1A57028C180BCC900088DEC7 /* CCSpriteFrameCache.h in Headers */, 5027253A190BF1B900AAF4ED /* cocos2d.h in Headers */, 1A570294180BCCAB0088DEC7 /* CCAnimation.h in Headers */, + 50ABBD421925AB0000A911A9 /* CCMathBase.h in Headers */, 1A570298180BCCAB0088DEC7 /* CCAnimationCache.h in Headers */, 50FCEB9D18C72017004AD434 /* ImageViewReader.h in Headers */, + 50ABBE911925AB6F00A911A9 /* CCPlatformMacros.h in Headers */, + 50ABC05D1926664800A911A9 /* CCApplication.h in Headers */, + 50ABC0071926664800A911A9 /* CCApplicationProtocol.h in Headers */, 50FCEBA918C72017004AD434 /* LoadingBarReader.h in Headers */, - 500DC9B21910633C007B91BF /* CCTouch.h in Headers */, - 1A5702B1180BCDBC0088DEC7 /* ccUTF8.h in Headers */, - 1A5702B7180BCDF40088DEC7 /* CCVertex.h in Headers */, - 1A5702BA180BCDFC0088DEC7 /* ccUtils.h in Headers */, - 1A5702C0180BCE2A0088DEC7 /* CCIMEDelegate.h in Headers */, + 50ABBD4E1925AB0000A911A9 /* MathUtil.h in Headers */, 2905FA7618CF08D100240AA3 /* UIScrollView.h in Headers */, - 1A5702C4180BCE2A0088DEC7 /* CCIMEDispatcher.h in Headers */, + 50ABBE431925AB6F00A911A9 /* CCDirector.h in Headers */, 1A12775B18DFCC540005F345 /* CCTweenFunction.h in Headers */, 1A5702CA180BCE370088DEC7 /* CCTextFieldTTF.h in Headers */, - 1A5702D5180BCE570088DEC7 /* CCTexture2D.h in Headers */, - 1A5702D9180BCE570088DEC7 /* CCTextureAtlas.h in Headers */, - 1A5702DD180BCE570088DEC7 /* CCTextureCache.h in Headers */, 1A5702EC180BCE750088DEC7 /* CCTileMapAtlas.h in Headers */, 1A5702F0180BCE750088DEC7 /* CCTMXLayer.h in Headers */, + 50ABC01B1926664800A911A9 /* CCSAXParser.h in Headers */, + 50ABBED51925AB6F00A911A9 /* utlist.h in Headers */, 50FCEBAD18C72017004AD434 /* PageViewReader.h in Headers */, 1A5702F4180BCE750088DEC7 /* CCTMXObjectGroup.h in Headers */, + 50ABBDAF1925AB4100A911A9 /* CCRenderer.h in Headers */, 1A5702F8180BCE750088DEC7 /* CCTMXTiledMap.h in Headers */, 5034CA21191D591100CE6051 /* ccShader_PositionTextureColorAlphaTest.frag in Headers */, + 50ABBDA11925AB4100A911A9 /* CCGroupCommand.h in Headers */, 1A5702FC180BCE750088DEC7 /* CCTMXXMLParser.h in Headers */, + 50ABBDBB1925AB4100A911A9 /* CCTextureAtlas.h in Headers */, 1A570302180BCE890088DEC7 /* CCParallaxNode.h in Headers */, + 50ABBE4B1925AB6F00A911A9 /* CCEventAcceleration.h in Headers */, 1A57030E180BCF190088DEC7 /* CCComponent.h in Headers */, 1A570312180BCF190088DEC7 /* CCComponentContainer.h in Headers */, 50FCEBC918C72017004AD434 /* WidgetReader.h in Headers */, + 50ABBD851925AB4100A911A9 /* CCBatchCommand.h in Headers */, + 50ABC0651926664800A911A9 /* CCGL.h in Headers */, B37510751823AC9F00B3BA6A /* CCPhysicsHelper_chipmunk.h in Headers */, - 500DC94619106300007B91BF /* CCDataVisitor.h in Headers */, - B2AF2FAB18EBAEAE00C5807C /* Vector4.h in Headers */, - 1A57031B180BCF430088DEC7 /* ccCArray.h in Headers */, - 1A57031D180BCF430088DEC7 /* uthash.h in Headers */, - 1A57031F180BCF430088DEC7 /* utlist.h in Headers */, + 50ABBD621925AB0000A911A9 /* Vec4.h in Headers */, 1A01C69418F57BE800EFE3A6 /* CCFloat.h in Headers */, - 1A570326180BCF660088DEC7 /* TGAlib.h in Headers */, - 1A570331180BCFD50088DEC7 /* CCUserDefault.h in Headers */, - 500DC93419106300007B91BF /* CCAutoreleasePool.h in Headers */, 2905FA5818CF08D100240AA3 /* UILayout.h in Headers */, 1A57034D180BD09B0088DEC7 /* tinyxml2.h in Headers */, 1A570356180BD0B00088DEC7 /* ioapi.h in Headers */, - 500DC99619106300007B91BF /* CCScheduler.h in Headers */, + 50ABBE331925AB6F00A911A9 /* CCConfiguration.h in Headers */, + 50ABC01F1926664800A911A9 /* CCThread.h in Headers */, 1A57035A180BD0B00088DEC7 /* unzip.h in Headers */, - 296CAD241915EC8000C64FBF /* CCEventFocus.h in Headers */, - 500DC98819106300007B91BF /* CCNS.h in Headers */, 1AD71DAB180E26E600808F54 /* CCBAnimationManager.h in Headers */, + 50ABBDBF1925AB4100A911A9 /* CCTextureCache.h in Headers */, 1AD71DAF180E26E600808F54 /* CCBFileLoader.h in Headers */, B37510741823AC9F00B3BA6A /* CCPhysicsContactInfo_chipmunk.h in Headers */, 2905FA8E18CF08D100240AA3 /* UIWidget.h in Headers */, @@ -5130,135 +4977,159 @@ 2905FA7E18CF08D100240AA3 /* UIText.h in Headers */, 1AD71DBB180E26E600808F54 /* CCBSelectorResolver.h in Headers */, 5034CA35191D591100CE6051 /* ccShader_PositionTexture.frag in Headers */, - 500DC98019106300007B91BF /* CCEventType.h in Headers */, + 50ABBE6F1925AB6F00A911A9 /* CCEventListenerKeyboard.h in Headers */, + 50ABBE9D1925AB6F00A911A9 /* CCRefPtr.h in Headers */, 1AD71DBF180E26E600808F54 /* CCBSequence.h in Headers */, 1AD71DC3180E26E600808F54 /* CCBSequenceProperty.h in Headers */, 5034CA31191D591100CE6051 /* ccShader_PositionTexture_uColor.vert in Headers */, 1AD71DCB180E26E600808F54 /* CCControlButtonLoader.h in Headers */, 1AD71DCF180E26E600808F54 /* CCControlLoader.h in Headers */, + 50ABBE7B1925AB6F00A911A9 /* CCEventMouse.h in Headers */, 1AD71DD3180E26E600808F54 /* CCLabelBMFontLoader.h in Headers */, 1AD71DD7180E26E600808F54 /* CCLabelTTFLoader.h in Headers */, 1AD71DDB180E26E600808F54 /* CCLayerColorLoader.h in Headers */, + 503DD8F91926B0DB00CD74DD /* CCIMEDispatcher.h in Headers */, 1AD71DDF180E26E600808F54 /* CCLayerGradientLoader.h in Headers */, 1AD71DE3180E26E600808F54 /* CCLayerLoader.h in Headers */, - 500DC97219106300007B91BF /* CCEventListenerMouse.h in Headers */, 1AD71DE7180E26E600808F54 /* CCMenuItemImageLoader.h in Headers */, 1AD71DEB180E26E600808F54 /* CCMenuItemLoader.h in Headers */, 1AD71DED180E26E600808F54 /* CCMenuLoader.h in Headers */, + 50ABBE8F1925AB6F00A911A9 /* CCPlatformConfig.h in Headers */, 1AD71DF1180E26E600808F54 /* CCNode+CCBRelativePositioning.h in Headers */, 2905FA7218CF08D100240AA3 /* UIScrollInterface.h in Headers */, - B2AF2F9B18EBAEAE00C5807C /* Matrix.h in Headers */, 1AD71DF5180E26E600808F54 /* CCNodeLoader.h in Headers */, 1AD71DF9180E26E600808F54 /* CCNodeLoaderLibrary.h in Headers */, + 50ABBE291925AB6F00A911A9 /* CCAutoreleasePool.h in Headers */, 2905FA8A18CF08D100240AA3 /* UITextField.h in Headers */, + 50ABBE471925AB6F00A911A9 /* CCEvent.h in Headers */, + 50ABBE6B1925AB6F00A911A9 /* CCEventListenerFocus.h in Headers */, 1AD71DFB180E26E600808F54 /* CCNodeLoaderListener.h in Headers */, + 50ABBDA51925AB4100A911A9 /* CCQuadCommand.h in Headers */, 1AD71DFF180E26E600808F54 /* CCParticleSystemQuadLoader.h in Headers */, + 50ABBD3A1925AB0000A911A9 /* CCAffineTransform.h in Headers */, 1AD71E03180E26E600808F54 /* CCScale9SpriteLoader.h in Headers */, - 5034CA51191D591100CE6051 /* CCGLProgramStateCache.h in Headers */, 1AD71E07180E26E600808F54 /* CCScrollViewLoader.h in Headers */, + 50ABBE571925AB6F00A911A9 /* CCEventFocus.h in Headers */, 1AD71E0B180E26E600808F54 /* CCSpriteLoader.h in Headers */, 1AD71E0D180E26E600808F54 /* CocosBuilder.h in Headers */, 1AD71E97180E26E600808F54 /* Animation.h in Headers */, 1AD71E9B180E26E600808F54 /* AnimationState.h in Headers */, 1A01C69218F57BE800EFE3A6 /* CCDouble.h in Headers */, + 50ABBE251925AB6F00A911A9 /* base64.h in Headers */, + 50ABBEC91925AB6F00A911A9 /* firePngData.h in Headers */, 1AD71E9F180E26E600808F54 /* AnimationStateData.h in Headers */, 1AD71EA3180E26E600808F54 /* Atlas.h in Headers */, 1AD71EA7180E26E600808F54 /* AtlasAttachmentLoader.h in Headers */, + 503DD8F51926B0DB00CD74DD /* CCIMEDelegate.h in Headers */, 1AD71EAB180E26E600808F54 /* Attachment.h in Headers */, - 500DC97E19106300007B91BF /* CCEventTouch.h in Headers */, 50FCEBC118C72017004AD434 /* TextFieldReader.h in Headers */, 1AD71EAF180E26E600808F54 /* AttachmentLoader.h in Headers */, 1AD71EB3180E26E600808F54 /* Bone.h in Headers */, 2905FA8218CF08D100240AA3 /* UITextAtlas.h in Headers */, 1AD71EB7180E26E600808F54 /* BoneData.h in Headers */, - 500DC99219106300007B91BF /* CCRefPtr.h in Headers */, + 50ABBD5A1925AB0000A911A9 /* Vec2.h in Headers */, 1AD71EBB180E26E600808F54 /* CCSkeleton.h in Headers */, - 500DC97619106300007B91BF /* CCEventListenerTouch.h in Headers */, 50FCEBA118C72017004AD434 /* LayoutReader.h in Headers */, + 50ABBEBD1925AB6F00A911A9 /* ccUtils.h in Headers */, 1AD71EBF180E26E600808F54 /* CCSkeletonAnimation.h in Headers */, 2905FA7018CF08D100240AA3 /* UIRichText.h in Headers */, 1AD71EC3180E26E600808F54 /* extension.h in Headers */, 50FCEBC518C72017004AD434 /* TextReader.h in Headers */, 1AD71EC7180E26E600808F54 /* Json.h in Headers */, - 500DC8D919105F7D007B91BF /* CCMathBase.h in Headers */, + 50ABC0231926664800A911A9 /* CCGLView.h in Headers */, 06CAAACD186AD7F90012A414 /* TriggerBase.h in Headers */, 1AD71ECB180E26E600808F54 /* RegionAttachment.h in Headers */, + 50ABBFFD1926664800A911A9 /* CCFileUtilsApple.h in Headers */, 2905FA8618CF08D100240AA3 /* UITextBMFont.h in Headers */, 1AD71ECF180E26E600808F54 /* Skeleton.h in Headers */, 5034CA41191D591100CE6051 /* ccShader_Position_uColor.frag in Headers */, + 50ABBE7F1925AB6F00A911A9 /* CCEventTouch.h in Headers */, + 50ABBE5B1925AB6F00A911A9 /* CCEventKeyboard.h in Headers */, 1A01C69E18F57BE800EFE3A6 /* CCString.h in Headers */, - 500DC9B819106E6D007B91BF /* TransformUtils.h in Headers */, 1AD71ED3180E26E600808F54 /* SkeletonData.h in Headers */, + 50ABC00F1926664800A911A9 /* CCFileUtils.h in Headers */, + 50ABBE3B1925AB6F00A911A9 /* CCData.h in Headers */, 1AD71ED7180E26E600808F54 /* SkeletonJson.h in Headers */, - 500DC9A819106300007B91BF /* s3tc.h in Headers */, 1AD71EDB180E26E600808F54 /* Skin.h in Headers */, + 50ABBE3F1925AB6F00A911A9 /* CCDataVisitor.h in Headers */, 1AD71EDF180E26E600808F54 /* Slot.h in Headers */, 1AD71EE3180E26E600808F54 /* SlotData.h in Headers */, 1AD71EE7180E26E600808F54 /* spine-cocos2dx.h in Headers */, 1AD71EE9180E26E600808F54 /* spine.h in Headers */, 1AAF536C180E3374000584C8 /* HttpClient.h in Headers */, + 50ABBD9D1925AB4100A911A9 /* ccGLStateCache.h in Headers */, + 50ABBEB91925AB6F00A911A9 /* ccUTF8.h in Headers */, 1AAF536E180E3374000584C8 /* HttpRequest.h in Headers */, - 500DC99019106300007B91BF /* CCRef.h in Headers */, 1AAF5370180E3374000584C8 /* HttpResponse.h in Headers */, + 50ABBE671925AB6F00A911A9 /* CCEventListenerCustom.h in Headers */, 1AAF5374180E3374000584C8 /* SocketIO.h in Headers */, + 50ABBE2F1925AB6F00A911A9 /* ccConfig.h in Headers */, 373B9129187891F400198F86 /* CCComBase.h in Headers */, 1AAF5378180E3374000584C8 /* WebSocket.h in Headers */, 1AAF5851180E40B9000584C8 /* LocalStorage.h in Headers */, 1A01C69018F57BE800EFE3A6 /* CCDictionary.h in Headers */, - 1A9DCA25180E6955007A3AD4 /* ccFPSImages.h in Headers */, 1A9DCA29180E6955007A3AD4 /* CCGLBufferedNode.h in Headers */, - 1A9DCA2D180E6955007A3AD4 /* CCProtocols.h in Headers */, 50FCEBB118C72017004AD434 /* ScrollViewReader.h in Headers */, - 500DC98A19106300007B91BF /* CCPlatformConfig.h in Headers */, - 5034CA19191D591000CE6051 /* ccShaders.h in Headers */, - 1A9DCA3B180E6955007A3AD4 /* firePngData.h in Headers */, + 50ABC0031926664800A911A9 /* CCLock.h in Headers */, B37510721823AC9F00B3BA6A /* CCPhysicsBodyInfo_chipmunk.h in Headers */, + 50ABBE2D1925AB6F00A911A9 /* ccCArray.h in Headers */, 50FCEBA518C72017004AD434 /* ListViewReader.h in Headers */, + 50ABBD5E1925AB0000A911A9 /* Vec3.h in Headers */, 1A8C598D180E930E00EF57C3 /* CCActionFrame.h in Headers */, 1A8C5991180E930E00EF57C3 /* CCActionFrameEasing.h in Headers */, 1A8C5995180E930E00EF57C3 /* CCActionManagerEx.h in Headers */, + 50ABBE211925AB6F00A911A9 /* atitc.h in Headers */, 1A8C5999180E930E00EF57C3 /* CCActionNode.h in Headers */, 1A8C599D180E930E00EF57C3 /* CCActionObject.h in Headers */, + 50ABBE371925AB6F00A911A9 /* CCConsole.h in Headers */, 1A8C59A1180E930E00EF57C3 /* CCArmature.h in Headers */, 1A8C59A5180E930E00EF57C3 /* CCArmatureAnimation.h in Headers */, 1A8C59A9180E930E00EF57C3 /* CCArmatureDataManager.h in Headers */, + 50ABC00B1926664800A911A9 /* CCDevice.h in Headers */, 2905FA7A18CF08D100240AA3 /* UISlider.h in Headers */, - 500DC93E19106300007B91BF /* CCConsole.h in Headers */, 1A8C59AD180E930E00EF57C3 /* CCArmatureDefine.h in Headers */, + 50ABC0131926664800A911A9 /* CCGLViewProtocol.h in Headers */, 1A8C59B1180E930E00EF57C3 /* CCBatchNode.h in Headers */, + 50ABBDB31925AB4100A911A9 /* ccShaders.h in Headers */, 2905FA5418CF08D100240AA3 /* UIImageView.h in Headers */, 1A8C59B5180E930E00EF57C3 /* CCBone.h in Headers */, + 50ABBDAB1925AB4100A911A9 /* CCRenderCommandPool.h in Headers */, 5034CA45191D591100CE6051 /* ccShader_Label_outline.frag in Headers */, - 500DC96219106300007B91BF /* CCEventListener.h in Headers */, 1A8C59B9180E930E00EF57C3 /* CCColliderDetector.h in Headers */, 1A8C59BD180E930E00EF57C3 /* CCComAttribute.h in Headers */, 1A8C59C1180E930E00EF57C3 /* CCComAudio.h in Headers */, - B2AF2FB118EBBDA100C5807C /* CCMath.h in Headers */, 1A8C59C5180E930E00EF57C3 /* CCComController.h in Headers */, 1A8C59C9180E930E00EF57C3 /* CCComRender.h in Headers */, - 5034CA59191D591100CE6051 /* CCGLProgram.h in Headers */, 1A8C59CD180E930E00EF57C3 /* CCDataReaderHelper.h in Headers */, + 50ABBEB11925AB6F00A911A9 /* CCUserDefault.h in Headers */, + 50ABBEC71925AB6F00A911A9 /* etc1.h in Headers */, + 50ABBEA91925AB6F00A911A9 /* CCTouch.h in Headers */, + 50ABBE971925AB6F00A911A9 /* CCProtocols.h in Headers */, 1A8C59D1180E930E00EF57C3 /* CCDatas.h in Headers */, 1A8C59D5180E930E00EF57C3 /* CCDecorativeDisplay.h in Headers */, 1A8C59D9180E930E00EF57C3 /* CCDisplayFactory.h in Headers */, + 50ABC0691926664800A911A9 /* CCStdC.h in Headers */, + 50ABBECD1925AB6F00A911A9 /* s3tc.h in Headers */, + 50ABBE771925AB6F00A911A9 /* CCEventListenerTouch.h in Headers */, 1A8C59DD180E930E00EF57C3 /* CCDisplayManager.h in Headers */, 1A8C59E1180E930E00EF57C3 /* CCInputDelegate.h in Headers */, 1A8C59E5180E930E00EF57C3 /* CCProcessBase.h in Headers */, 1A8C59E9180E930E00EF57C3 /* CCSGUIReader.h in Headers */, 5034CA33191D591100CE6051 /* ccShader_PositionTexture_uColor.frag in Headers */, + 50ABC0171926664800A911A9 /* CCImage.h in Headers */, 1A8C59ED180E930E00EF57C3 /* CCSkin.h in Headers */, - 5034CA1D191D591100CE6051 /* CCGLProgramCache.h in Headers */, + 50ABBDA91925AB4100A911A9 /* CCRenderCommand.h in Headers */, + 50ABBD951925AB4100A911A9 /* CCGLProgramState.h in Headers */, 1A8C59F1180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h in Headers */, 1A8C59F5180E930E00EF57C3 /* CCSSceneReader.h in Headers */, 1A8C59F9180E930E00EF57C3 /* CCTransformHelp.h in Headers */, 1A8C59FD180E930E00EF57C3 /* CCTween.h in Headers */, 1A8C5A05180E930E00EF57C3 /* CCUtilMath.h in Headers */, + 50ABC0091926664800A911A9 /* CCCommon.h in Headers */, + 50ABBE531925AB6F00A911A9 /* CCEventDispatcher.h in Headers */, 1A8C5A07180E930E00EF57C3 /* CocoStudio.h in Headers */, - 500DC93619106300007B91BF /* ccConfig.h in Headers */, - 500DC93019106300007B91BF /* base64.h in Headers */, 1A8C5A0F180E930E00EF57C3 /* DictionaryHelper.h in Headers */, 50FCEBBD18C72017004AD434 /* TextBMFontReader.h in Headers */, - 500DC95619106300007B91BF /* CCEventCustom.h in Headers */, 50FCEBCB18C72017004AD434 /* WidgetReaderProtocol.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -5403,210 +5274,195 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 500DC9B31910633C007B91BF /* CCTouch.h in Headers */, 2AC795E71862875D005EC8E1 /* SkeletonBounds.h in Headers */, 2AC795E81862875D005EC8E1 /* Event.h in Headers */, - 500DC97B19106300007B91BF /* CCEventMouse.h in Headers */, 2AC795E91862875D005EC8E1 /* EventData.h in Headers */, 2AC795EA1862875D005EC8E1 /* BoundingBoxAttachment.h in Headers */, - 500DC93519106300007B91BF /* CCAutoreleasePool.h in Headers */, - 5034CA1A191D591100CE6051 /* ccShaders.h in Headers */, - 46A1702D1807CBFE005B8026 /* CCCommon.h in Headers */, + 503DD8F01926736A00CD74DD /* CCStdC.h in Headers */, 46A170FF1807CECB005B8026 /* CCPhysicsContact.h in Headers */, + 50ABBDA21925AB4100A911A9 /* CCGroupCommand.h in Headers */, + 503DD8EF1926736A00CD74DD /* CCPlatformDefine.h in Headers */, 46A171041807CECB005B8026 /* CCPhysicsShape.h in Headers */, - 500DC95719106300007B91BF /* CCEventCustom.h in Headers */, - 500DC95319106300007B91BF /* CCEventAcceleration.h in Headers */, - B2AF2F9818EBAEAE00C5807C /* MathUtil.h in Headers */, - 500DC9BF19106E89007B91BF /* CCProfiling.h in Headers */, - 500DC8D819105F7D007B91BF /* CCGeometry.h in Headers */, 50FCEBAE18C72017004AD434 /* PageViewReader.h in Headers */, - 46A1703F1807CC07005B8026 /* CCDirectorCaller.h in Headers */, - 46A170381807CBFE005B8026 /* CCSAXParser.h in Headers */, + 50ABBD3B1925AB0000A911A9 /* CCAffineTransform.h in Headers */, 5034CA38191D591100CE6051 /* ccShader_PositionColorLengthTexture.vert in Headers */, - 500DC97319106300007B91BF /* CCEventListenerMouse.h in Headers */, - 500DC99319106300007B91BF /* CCRefPtr.h in Headers */, - 46A1702E1807CBFE005B8026 /* CCDevice.h in Headers */, - 46A1702A1807CBFE005B8026 /* CCLock.h in Headers */, - 46A170451807CC07005B8026 /* CCESRenderer.h in Headers */, + 50ABBE7C1925AB6F00A911A9 /* CCEventMouse.h in Headers */, 46A171011807CECB005B8026 /* CCPhysicsJoint.h in Headers */, - 46A170411807CC07005B8026 /* CCGLView.h in Headers */, - 46A170301807CBFE005B8026 /* CCGLViewProtocol.h in Headers */, - 5034CA4E191D591100CE6051 /* ccGLStateCache.h in Headers */, - 500DC8B119105D41007B91BF /* CCCustomCommand.h in Headers */, - 500DC8DA19105F7D007B91BF /* CCMathBase.h in Headers */, - 46A170321807CBFE005B8026 /* CCFileUtils.h in Headers */, - 46A1703A1807CBFE005B8026 /* CCThread.h in Headers */, 46A170FD1807CECB005B8026 /* CCPhysicsBody.h in Headers */, 2905FA6118CF08D100240AA3 /* UILayoutParameter.h in Headers */, - 500DC8BD19105D41007B91BF /* CCQuadCommand.h in Headers */, + 50ABBE9C1925AB6F00A911A9 /* CCRef.h in Headers */, + 50ABBD961925AB4100A911A9 /* CCGLProgramState.h in Headers */, 46A171061807CECB005B8026 /* CCPhysicsWorld.h in Headers */, - 46A170491807CC07005B8026 /* CCStdC.h in Headers */, - 46A1703B1807CC07005B8026 /* CCApplication.h in Headers */, - 46A170271807CBFE005B8026 /* CCFileUtilsApple.h in Headers */, - 46A170431807CC07005B8026 /* CCES2Renderer.h in Headers */, - 46A170331807CBFE005B8026 /* CCImage.h in Headers */, + 50ABBDB41925AB4100A911A9 /* ccShaders.h in Headers */, + 50ABBE861925AB6F00A911A9 /* ccFPSImages.h in Headers */, + 50ABBE2E1925AB6F00A911A9 /* ccCArray.h in Headers */, + 50ABC0041926664800A911A9 /* CCLock.h in Headers */, 5034CA40191D591100CE6051 /* ccShader_Position_uColor.vert in Headers */, + 50ABBEC21925AB6F00A911A9 /* CCValue.h in Headers */, 2905FA5518CF08D100240AA3 /* UIImageView.h in Headers */, - 46A170481807CC07005B8026 /* CCPlatformDefine.h in Headers */, - 46A1704C1807CC07005B8026 /* OpenGL_Internal.h in Headers */, - 46A1702C1807CBFE005B8026 /* CCApplicationProtocol.h in Headers */, + 50ABBECA1925AB6F00A911A9 /* firePngData.h in Headers */, + 50ABBE401925AB6F00A911A9 /* CCDataVisitor.h in Headers */, 1A570064180BC5A10088DEC7 /* CCAction.h in Headers */, 06CAAACE186AD7FA0012A414 /* TriggerBase.h in Headers */, - 500DC9AD19106300007B91BF /* ZipUtils.h in Headers */, + 503DD8EC1926736A00CD74DD /* CCGLView.h in Headers */, 50FCEBC218C72017004AD434 /* TextFieldReader.h in Headers */, + 50ABBEBA1925AB6F00A911A9 /* ccUTF8.h in Headers */, 1A570068180BC5A10088DEC7 /* CCActionCamera.h in Headers */, 1A57006C180BC5A10088DEC7 /* CCActionCatmullRom.h in Headers */, 5034CA3A191D591100CE6051 /* ccShader_PositionColorLengthTexture.frag in Headers */, + 50ABBEC41925AB6F00A911A9 /* CCVector.h in Headers */, + 50ABBE501925AB6F00A911A9 /* CCEventCustom.h in Headers */, 1A570070180BC5A10088DEC7 /* CCActionEase.h in Headers */, 1A570074180BC5A10088DEC7 /* CCActionGrid.h in Headers */, B37510841823ACA100B3BA6A /* CCPhysicsShapeInfo_chipmunk.h in Headers */, 5034CA46191D591100CE6051 /* ccShader_Label_outline.frag in Headers */, 1A570078180BC5A10088DEC7 /* CCActionGrid3D.h in Headers */, + 50ABBD631925AB0000A911A9 /* Vec4.h in Headers */, 1A01C68918F57BE800EFE3A6 /* CCBool.h in Headers */, 1A57007C180BC5A10088DEC7 /* CCActionInstant.h in Headers */, + 50ABBE781925AB6F00A911A9 /* CCEventListenerTouch.h in Headers */, B37510861823ACA100B3BA6A /* CCPhysicsWorldInfo_chipmunk.h in Headers */, 1A570080180BC5A10088DEC7 /* CCActionInterval.h in Headers */, 1A570084180BC5A10088DEC7 /* CCActionManager.h in Headers */, + 50ABC0141926664800A911A9 /* CCGLViewProtocol.h in Headers */, 1A570088180BC5A10088DEC7 /* CCActionPageTurn3D.h in Headers */, + 50ABBD9E1925AB4100A911A9 /* ccGLStateCache.h in Headers */, 1A57008C180BC5A10088DEC7 /* CCActionProgressTimer.h in Headers */, 2905FA8318CF08D100240AA3 /* UITextAtlas.h in Headers */, 1A570090180BC5A10088DEC7 /* CCActionTiledGrid.h in Headers */, 1A570094180BC5A10088DEC7 /* CCActionTween.h in Headers */, - 1A0DB7331823827C0025743D /* CCEAGLView.h in Headers */, 1A57009B180BC5C10088DEC7 /* CCAtlasNode.h in Headers */, 2905FA5118CF08D100240AA3 /* UIHelper.h in Headers */, 1A5700A1180BC5D20088DEC7 /* CCNode.h in Headers */, - 500DC93B19106300007B91BF /* CCConfiguration.h in Headers */, 50FCEB9618C72017004AD434 /* ButtonReader.h in Headers */, 2905FA7118CF08D100240AA3 /* UIRichText.h in Headers */, + 503DD8E41926736A00CD74DD /* CCDirectorCaller.h in Headers */, + 50ABBD8A1925AB4100A911A9 /* CCCustomCommand.h in Headers */, 2905FA6D18CF08D100240AA3 /* UIPageView.h in Headers */, 2905FA7318CF08D100240AA3 /* UIScrollInterface.h in Headers */, + 50ABBE881925AB6F00A911A9 /* ccMacros.h in Headers */, + 50ABC0101926664800A911A9 /* CCFileUtils.h in Headers */, 2905FA4318CF08D100240AA3 /* CocosGUI.h in Headers */, 5034CA30191D591100CE6051 /* ccShader_PositionTexture.vert in Headers */, - 500DC93119106300007B91BF /* base64.h in Headers */, - B2AF2FA018EBAEAE00C5807C /* Quaternion.h in Headers */, 50E6D33718E174130051CA34 /* UIHBox.h in Headers */, 1A570111180BC8EE0088DEC7 /* CCDrawingPrimitives.h in Headers */, 50E6D33F18E174130051CA34 /* UIVBox.h in Headers */, + 50ABBE381925AB6F00A911A9 /* CCConsole.h in Headers */, + 50ABBE8A1925AB6F00A911A9 /* CCMap.h in Headers */, + 503DD8E61926736A00CD74DD /* CCEAGLView.h in Headers */, + 50ABBE4C1925AB6F00A911A9 /* CCEventAcceleration.h in Headers */, + 50ABBD571925AB0000A911A9 /* TransformUtils.h in Headers */, 1A570115180BC8EE0088DEC7 /* CCDrawNode.h in Headers */, 06CAAAC5186AD7E50012A414 /* TriggerObj.h in Headers */, 1A57011E180BC90D0088DEC7 /* CCGrabber.h in Headers */, 1A570122180BC90D0088DEC7 /* CCGrid.h in Headers */, - 500DC8C319105D41007B91BF /* CCRenderCommandPool.h in Headers */, - 5034CA52191D591100CE6051 /* CCGLProgramStateCache.h in Headers */, - 500DC8C719105D41007B91BF /* CCRenderer.h in Headers */, - 500DC98519106300007B91BF /* CCMap.h in Headers */, 50FCEBBA18C72017004AD434 /* TextAtlasReader.h in Headers */, 5034CA2E191D591100CE6051 /* ccShader_PositionTextureA8Color.frag in Headers */, + 50ABBD5B1925AB0000A911A9 /* Vec2.h in Headers */, + 50ABBD411925AB0000A911A9 /* CCMath.h in Headers */, 1A5701A0180BCB590088DEC7 /* CCFont.h in Headers */, + 50ABBD9A1925AB4100A911A9 /* CCGLProgramStateCache.h in Headers */, + 50ABBD3F1925AB0000A911A9 /* CCGeometry.h in Headers */, + 50ABBFFE1926664800A911A9 /* CCFileUtilsApple.h in Headers */, 1A5701A4180BCB590088DEC7 /* CCFontAtlas.h in Headers */, 1A5701A8180BCB590088DEC7 /* CCFontAtlasCache.h in Headers */, - 500DC98919106300007B91BF /* CCNS.h in Headers */, 1A5701B4180BCB590088DEC7 /* CCFontFNT.h in Headers */, 1A5701B8180BCB5A0088DEC7 /* CCFontFreeType.h in Headers */, 1A5701BC180BCB5A0088DEC7 /* CCLabel.h in Headers */, 1A5701C0180BCB5A0088DEC7 /* CCLabelAtlas.h in Headers */, + 50ABBE681925AB6F00A911A9 /* CCEventListenerCustom.h in Headers */, 5034CA42191D591100CE6051 /* ccShader_Position_uColor.frag in Headers */, - 500DC97719106300007B91BF /* CCEventListenerTouch.h in Headers */, - 500DC93F19106300007B91BF /* CCConsole.h in Headers */, 1A5701C4180BCB5A0088DEC7 /* CCLabelBMFont.h in Headers */, + 50ABBDA61925AB4100A911A9 /* CCQuadCommand.h in Headers */, + 50ABBE9E1925AB6F00A911A9 /* CCRefPtr.h in Headers */, 1A01C69518F57BE800EFE3A6 /* CCFloat.h in Headers */, 1A5701CA180BCB5A0088DEC7 /* CCLabelTextFormatter.h in Headers */, 2905FA7B18CF08D100240AA3 /* UISlider.h in Headers */, 5034CA22191D591100CE6051 /* ccShader_PositionTextureColorAlphaTest.frag in Headers */, + 50ABBECE1925AB6F00A911A9 /* s3tc.h in Headers */, + 50ABBE901925AB6F00A911A9 /* CCPlatformConfig.h in Headers */, 1A5701CE180BCB5A0088DEC7 /* CCLabelTTF.h in Headers */, - 296CAD251915EC8000C64FBF /* CCEventFocus.h in Headers */, 50FCEBCA18C72017004AD434 /* WidgetReader.h in Headers */, 1A5701E1180BCB8C0088DEC7 /* CCLayer.h in Headers */, 1A5701E5180BCB8C0088DEC7 /* CCScene.h in Headers */, - 500DC92D19106300007B91BF /* atitc.h in Headers */, 1A5701E9180BCB8C0088DEC7 /* CCTransition.h in Headers */, + 50ABBED41925AB6F00A911A9 /* uthash.h in Headers */, 1A5701ED180BCB8C0088DEC7 /* CCTransitionPageTurn.h in Headers */, - 500DC8C119105D41007B91BF /* CCRenderCommand.h in Headers */, 1A5701F1180BCB8C0088DEC7 /* CCTransitionProgress.h in Headers */, 1A5701FA180BCBAD0088DEC7 /* CCMenu.h in Headers */, 50FCEBBE18C72017004AD434 /* TextBMFontReader.h in Headers */, 1A5701FE180BCBAD0088DEC7 /* CCMenuItem.h in Headers */, + 50ABC00C1926664800A911A9 /* CCDevice.h in Headers */, 1A570205180BCBD40088DEC7 /* CCClippingNode.h in Headers */, 5034CA34191D591100CE6051 /* ccShader_PositionTexture_uColor.frag in Headers */, + 50ABBEA21925AB6F00A911A9 /* CCScheduler.h in Headers */, 1A57020B180BCBDF0088DEC7 /* CCMotionStreak.h in Headers */, 1A570213180BCBF40088DEC7 /* CCProgressTimer.h in Headers */, B37510821823ACA100B3BA6A /* CCPhysicsJointInfo_chipmunk.h in Headers */, 1A570217180BCBF40088DEC7 /* CCRenderTexture.h in Headers */, 1A570224180BCC1A0088DEC7 /* CCParticleBatchNode.h in Headers */, - 500DC95F19106300007B91BF /* CCEventKeyboard.h in Headers */, - 500DC95B19106300007B91BF /* CCEventDispatcher.h in Headers */, + 503DD8F61926B0DB00CD74DD /* CCIMEDelegate.h in Headers */, 373B912A187891FB00198F86 /* CCComBase.h in Headers */, - 500DC8D419105F7D007B91BF /* CCAffineTransform.h in Headers */, 1A570228180BCC1A0088DEC7 /* CCParticleExamples.h in Headers */, 1A57022C180BCC1A0088DEC7 /* CCParticleSystem.h in Headers */, 1A570230180BCC1A0088DEC7 /* CCParticleSystemQuad.h in Headers */, 5034CA2C191D591100CE6051 /* ccShader_PositionTextureA8Color.vert in Headers */, - 1A570237180BCC4D0088DEC7 /* CCScriptSupport.h in Headers */, + 50ABBE981925AB6F00A911A9 /* CCProtocols.h in Headers */, 2905FA8B18CF08D100240AA3 /* UITextField.h in Headers */, - 500DC96F19106300007B91BF /* CCEventListenerKeyboard.h in Headers */, - 500DC8B519105D41007B91BF /* CCGroupCommand.h in Headers */, 50FCEBA618C72017004AD434 /* ListViewReader.h in Headers */, - 500DC9B919106E6D007B91BF /* TransformUtils.h in Headers */, + 50ABBD431925AB0000A911A9 /* CCMathBase.h in Headers */, + 50ABBE441925AB6F00A911A9 /* CCDirector.h in Headers */, 5034CA4A191D591100CE6051 /* ccShader_Label_df.frag in Headers */, - 500DC99119106300007B91BF /* CCRef.h in Headers */, 1A570281180BCC900088DEC7 /* CCSprite.h in Headers */, 1A570285180BCC900088DEC7 /* CCSpriteBatchNode.h in Headers */, 1A570289180BCC900088DEC7 /* CCSpriteFrame.h in Headers */, + 50ABBE701925AB6F00A911A9 /* CCEventListenerKeyboard.h in Headers */, 1A57028D180BCC900088DEC7 /* CCSpriteFrameCache.h in Headers */, 1A570295180BCCAB0088DEC7 /* CCAnimation.h in Headers */, + 50ABBDB81925AB4100A911A9 /* CCTexture2D.h in Headers */, + 50ABBE341925AB6F00A911A9 /* CCConfiguration.h in Headers */, 1A570299180BCCAB0088DEC7 /* CCAnimationCache.h in Headers */, - 1A5702B2180BCDBC0088DEC7 /* ccUTF8.h in Headers */, - 1A5702B8180BCDF40088DEC7 /* CCVertex.h in Headers */, 06CAAAD2186AD8030012A414 /* ObjectFactory.h in Headers */, - 1A5702BB180BCDFC0088DEC7 /* ccUtils.h in Headers */, - 1A5702C1180BCE2A0088DEC7 /* CCIMEDelegate.h in Headers */, + 50ABBEAA1925AB6F00A911A9 /* CCTouch.h in Headers */, 2905FA6918CF08D100240AA3 /* UILoadingBar.h in Headers */, + 50ABBE741925AB6F00A911A9 /* CCEventListenerMouse.h in Headers */, 2905FA8F18CF08D100240AA3 /* UIWidget.h in Headers */, - 1A5702C5180BCE2A0088DEC7 /* CCIMEDispatcher.h in Headers */, - 5034CA1E191D591100CE6051 /* CCGLProgramCache.h in Headers */, 50FCEB9A18C72017004AD434 /* CheckBoxReader.h in Headers */, - 500DC8AD19105D41007B91BF /* CCBatchCommand.h in Headers */, 1A5702CB180BCE370088DEC7 /* CCTextFieldTTF.h in Headers */, 2905FA7F18CF08D100240AA3 /* UIText.h in Headers */, - 1A5702D6180BCE570088DEC7 /* CCTexture2D.h in Headers */, - 1A5702DA180BCE570088DEC7 /* CCTextureAtlas.h in Headers */, - 1A5702DE180BCE570088DEC7 /* CCTextureCache.h in Headers */, 1A5702ED180BCE750088DEC7 /* CCTileMapAtlas.h in Headers */, - 500DC99F19106300007B91BF /* CCValue.h in Headers */, 1A5702F1180BCE750088DEC7 /* CCTMXLayer.h in Headers */, 5034CA44191D591100CE6051 /* ccShader_Label.vert in Headers */, 1A5702F5180BCE750088DEC7 /* CCTMXObjectGroup.h in Headers */, 1A5702F9180BCE750088DEC7 /* CCTMXTiledMap.h in Headers */, 1AC0269D1914068200FA920D /* ConvertUTF.h in Headers */, - 500DC9A119106300007B91BF /* CCVector.h in Headers */, 1A5702FD180BCE750088DEC7 /* CCTMXXMLParser.h in Headers */, 1A570303180BCE890088DEC7 /* CCParallaxNode.h in Headers */, + 50ABBE2A1925AB6F00A911A9 /* CCAutoreleasePool.h in Headers */, 1A57030F180BCF190088DEC7 /* CCComponent.h in Headers */, 1A570313180BCF190088DEC7 /* CCComponentContainer.h in Headers */, 1A087AEB1860400400196EF5 /* edtaa3func.h in Headers */, - 1A57031C180BCF430088DEC7 /* ccCArray.h in Headers */, 2905FA6518CF08D100240AA3 /* UIListView.h in Headers */, 50FCEBAA18C72017004AD434 /* LoadingBarReader.h in Headers */, - B2AF2FA818EBAEAE00C5807C /* Vector3.h in Headers */, - 1A57031E180BCF430088DEC7 /* uthash.h in Headers */, - 500DC98B19106300007B91BF /* CCPlatformConfig.h in Headers */, - 1A570320180BCF430088DEC7 /* utlist.h in Headers */, 50FCEBC618C72017004AD434 /* TextReader.h in Headers */, 2905FA7718CF08D100240AA3 /* UIScrollView.h in Headers */, B375107F1823ACA100B3BA6A /* CCPhysicsContactInfo_chipmunk.h in Headers */, - 1A570327180BCF660088DEC7 /* TGAlib.h in Headers */, - 1A570332180BCFD50088DEC7 /* CCUserDefault.h in Headers */, - 500DC94319106300007B91BF /* CCData.h in Headers */, 1A57034E180BD09B0088DEC7 /* tinyxml2.h in Headers */, 1A570357180BD0B00088DEC7 /* ioapi.h in Headers */, + 50ABBD4B1925AB0000A911A9 /* Mat4.h in Headers */, 1A01C69B18F57BE800EFE3A6 /* CCSet.h in Headers */, + 50ABBED61925AB6F00A911A9 /* utlist.h in Headers */, 1A57035B180BD0B00088DEC7 /* unzip.h in Headers */, 5034CA48191D591100CE6051 /* ccShader_Label_normal.frag in Headers */, + 50ABBD531925AB0000A911A9 /* Quaternion.h in Headers */, 1AD71DAC180E26E600808F54 /* CCBAnimationManager.h in Headers */, + 503DD8E81926736A00CD74DD /* CCES2Renderer.h in Headers */, 1AD71DB0180E26E600808F54 /* CCBFileLoader.h in Headers */, + 50ABBE6C1925AB6F00A911A9 /* CCEventListenerFocus.h in Headers */, 1AD71DB4180E26E600808F54 /* CCBKeyframe.h in Headers */, 5034CA3E191D591100CE6051 /* ccShader_PositionColor.frag in Headers */, + 50ABBE301925AB6F00A911A9 /* ccConfig.h in Headers */, + 50ABBDAC1925AB4100A911A9 /* CCRenderCommandPool.h in Headers */, 1AD71DB6180E26E600808F54 /* CCBMemberVariableAssigner.h in Headers */, 1AD71DBA180E26E600808F54 /* CCBReader.h in Headers */, 1AD71DBC180E26E600808F54 /* CCBSelectorResolver.h in Headers */, @@ -5617,42 +5473,54 @@ 1AD71DD0180E26E600808F54 /* CCControlLoader.h in Headers */, 1AD71DD4180E26E600808F54 /* CCLabelBMFontLoader.h in Headers */, 5034CA3C191D591100CE6051 /* ccShader_PositionColor.vert in Headers */, + 50ABC0181926664800A911A9 /* CCImage.h in Headers */, + 50ABBE8E1925AB6F00A911A9 /* CCNS.h in Headers */, + 50ABBEA61925AB6F00A911A9 /* CCScriptSupport.h in Headers */, 46C02E0A18E91123004B7456 /* xxhash.h in Headers */, 5034CA4C191D591100CE6051 /* ccShader_Label_df_glow.frag in Headers */, 50E6D33B18E174130051CA34 /* UIRelativeBox.h in Headers */, + 503DD8EB1926736A00CD74DD /* CCGL.h in Headers */, + 50ABBE3C1925AB6F00A911A9 /* CCData.h in Headers */, 1AD71DD8180E26E600808F54 /* CCLabelTTFLoader.h in Headers */, + 503DD8FA1926B0DB00CD74DD /* CCIMEDispatcher.h in Headers */, 1AD71DDC180E26E600808F54 /* CCLayerColorLoader.h in Headers */, 1AD71DE0180E26E600808F54 /* CCLayerGradientLoader.h in Headers */, 1AD71DE4180E26E600808F54 /* CCLayerLoader.h in Headers */, + 50ABBEC81925AB6F00A911A9 /* etc1.h in Headers */, 1AD71DE8180E26E600808F54 /* CCMenuItemImageLoader.h in Headers */, 50E6D31118DAF01E0051CA34 /* CCProtectedNode.h in Headers */, 1AD71DEC180E26E600808F54 /* CCMenuItemLoader.h in Headers */, 1AD71DEE180E26E600808F54 /* CCMenuLoader.h in Headers */, 1AD71DF2180E26E600808F54 /* CCNode+CCBRelativePositioning.h in Headers */, + 50ABBDB01925AB4100A911A9 /* CCRenderer.h in Headers */, 1AD71DF6180E26E600808F54 /* CCNodeLoader.h in Headers */, + 50ABBD861925AB4100A911A9 /* CCBatchCommand.h in Headers */, 1AD71DFA180E26E600808F54 /* CCNodeLoaderLibrary.h in Headers */, - B2AF2FAC18EBAEAE00C5807C /* Vector4.h in Headers */, + 50ABBE481925AB6F00A911A9 /* CCEvent.h in Headers */, 5027253B190BF1B900AAF4ED /* cocos2d.h in Headers */, 1AD71DFC180E26E600808F54 /* CCNodeLoaderListener.h in Headers */, 3EA0FB6B191C841D00B170C8 /* UIVideoPlayer.h in Headers */, + 50ABBE641925AB6F00A911A9 /* CCEventListenerAcceleration.h in Headers */, 1AD71E00180E26E600808F54 /* CCParticleSystemQuadLoader.h in Headers */, 1AD71E04180E26E600808F54 /* CCScale9SpriteLoader.h in Headers */, 1AD71E08180E26E600808F54 /* CCScrollViewLoader.h in Headers */, 1AD71E0C180E26E600808F54 /* CCSpriteLoader.h in Headers */, + 50ABBD921925AB4100A911A9 /* CCGLProgramCache.h in Headers */, 1AD71E0E180E26E600808F54 /* CocosBuilder.h in Headers */, - 500DC93719106300007B91BF /* ccConfig.h in Headers */, 1AD71E98180E26E600808F54 /* Animation.h in Headers */, 1AD71E9C180E26E600808F54 /* AnimationState.h in Headers */, + 50ABBE961925AB6F00A911A9 /* CCProfiling.h in Headers */, + 503DD8E01926736A00CD74DD /* CCApplication.h in Headers */, + 50ABBD8E1925AB4100A911A9 /* CCGLProgram.h in Headers */, 1AD71EA0180E26E600808F54 /* AnimationStateData.h in Headers */, 50FCEB9E18C72017004AD434 /* ImageViewReader.h in Headers */, - 500DC98119106300007B91BF /* CCEventType.h in Headers */, + 50ABC0081926664800A911A9 /* CCApplicationProtocol.h in Headers */, 1AD71EA4180E26E600808F54 /* Atlas.h in Headers */, 1AD71EA8180E26E600808F54 /* AtlasAttachmentLoader.h in Headers */, 1ABA68B11888D700007D1BB4 /* CCFontCharMap.h in Headers */, + 50ABBD4F1925AB0000A911A9 /* MathUtil.h in Headers */, 1AD71EAC180E26E600808F54 /* Attachment.h in Headers */, - 500DC94719106300007B91BF /* CCDataVisitor.h in Headers */, 2905FA4918CF08D100240AA3 /* UIButton.h in Headers */, - 500DC96719106300007B91BF /* CCEventListenerAcceleration.h in Headers */, 1AD71EB0180E26E600808F54 /* AttachmentLoader.h in Headers */, 5034CA32191D591100CE6051 /* ccShader_PositionTexture_uColor.vert in Headers */, 1AD71EB4180E26E600808F54 /* Bone.h in Headers */, @@ -5661,95 +5529,98 @@ 1AD71EBC180E26E600808F54 /* CCSkeleton.h in Headers */, 1A01C69718F57BE800EFE3A6 /* CCInteger.h in Headers */, 50FCEBB218C72017004AD434 /* ScrollViewReader.h in Headers */, + 50ABBEBE1925AB6F00A911A9 /* ccUtils.h in Headers */, + 50ABBE801925AB6F00A911A9 /* CCEventTouch.h in Headers */, 1AD71EC0180E26E600808F54 /* CCSkeletonAnimation.h in Headers */, - 500DC94F19106300007B91BF /* CCEvent.h in Headers */, - B2AF2FB218EBBDA100C5807C /* CCMath.h in Headers */, 1AD71EC4180E26E600808F54 /* extension.h in Headers */, 1AD71EC8180E26E600808F54 /* Json.h in Headers */, 1AD71ECC180E26E600808F54 /* RegionAttachment.h in Headers */, + 50ABBDBC1925AB4100A911A9 /* CCTextureAtlas.h in Headers */, 1AD71ED0180E26E600808F54 /* Skeleton.h in Headers */, + 50ABBE541925AB6F00A911A9 /* CCEventDispatcher.h in Headers */, 1AD71ED4180E26E600808F54 /* SkeletonData.h in Headers */, 1AD71ED8180E26E600808F54 /* SkeletonJson.h in Headers */, 1A12775A18DFCC4F0005F345 /* CCTweenFunction.h in Headers */, 1AD71EDC180E26E600808F54 /* Skin.h in Headers */, + 50ABBD5F1925AB0000A911A9 /* Vec3.h in Headers */, 1AD71EE0180E26E600808F54 /* Slot.h in Headers */, 1AD71EE4180E26E600808F54 /* SlotData.h in Headers */, 1AD71EE8180E26E600808F54 /* spine-cocos2dx.h in Headers */, - B2AF2F9C18EBAEAE00C5807C /* Matrix.h in Headers */, 1AD71EEA180E26E600808F54 /* spine.h in Headers */, 1AAF536D180E3374000584C8 /* HttpClient.h in Headers */, 1AAF536F180E3374000584C8 /* HttpRequest.h in Headers */, 1AAF5371180E3374000584C8 /* HttpResponse.h in Headers */, 1AAF5375180E3374000584C8 /* SocketIO.h in Headers */, 1AAF5379180E3374000584C8 /* WebSocket.h in Headers */, + 50ABBE921925AB6F00A911A9 /* CCPlatformMacros.h in Headers */, + 50ABBE821925AB6F00A911A9 /* CCEventType.h in Headers */, 1AAF5852180E40B9000584C8 /* LocalStorage.h in Headers */, - 1A9DCA26180E6955007A3AD4 /* ccFPSImages.h in Headers */, - 5034CA5A191D591100CE6051 /* CCGLProgram.h in Headers */, + 50ABBD471925AB0000A911A9 /* CCVertex.h in Headers */, 1A9DCA2A180E6955007A3AD4 /* CCGLBufferedNode.h in Headers */, - 1A0DB7321823827C0025743D /* CCGL.h in Headers */, - 1A9DCA2E180E6955007A3AD4 /* CCProtocols.h in Headers */, - 500DC96B19106300007B91BF /* CCEventListenerCustom.h in Headers */, - 1A9DCA3C180E6955007A3AD4 /* firePngData.h in Headers */, 1A01C69F18F57BE800EFE3A6 /* CCString.h in Headers */, - 296CAD2B1915EC9900C64FBF /* CCEventListenerFocus.h in Headers */, 1A01C69118F57BE800EFE3A6 /* CCDictionary.h in Headers */, - 500DC99B19106300007B91BF /* ccTypes.h in Headers */, 1A8C598E180E930E00EF57C3 /* CCActionFrame.h in Headers */, 1A8C5992180E930E00EF57C3 /* CCActionFrameEasing.h in Headers */, 5034CA36191D591100CE6051 /* ccShader_PositionTexture.frag in Headers */, - 5034CA56191D591100CE6051 /* CCGLProgramState.h in Headers */, 1A8C5996180E930E00EF57C3 /* CCActionManagerEx.h in Headers */, 2905FA4D18CF08D100240AA3 /* UICheckBox.h in Headers */, - 500DC9A519106300007B91BF /* etc1.h in Headers */, 1A8C599A180E930E00EF57C3 /* CCActionNode.h in Headers */, 1A8C599E180E930E00EF57C3 /* CCActionObject.h in Headers */, 1A8C59A2180E930E00EF57C3 /* CCArmature.h in Headers */, 1A8C59A6180E930E00EF57C3 /* CCArmatureAnimation.h in Headers */, 2905FA8718CF08D100240AA3 /* UITextBMFont.h in Headers */, - 500DC97F19106300007B91BF /* CCEventTouch.h in Headers */, - B2AF2FA418EBAEAE00C5807C /* Vector2.h in Headers */, 1A8C59AA180E930E00EF57C3 /* CCArmatureDataManager.h in Headers */, 1A8C59AE180E930E00EF57C3 /* CCArmatureDefine.h in Headers */, 1A8C59B2180E930E00EF57C3 /* CCBatchNode.h in Headers */, 1A8C59B6180E930E00EF57C3 /* CCBone.h in Headers */, - 500DC9A919106300007B91BF /* s3tc.h in Headers */, 1A8C59BA180E930E00EF57C3 /* CCColliderDetector.h in Headers */, + 50ABBEAE1925AB6F00A911A9 /* ccTypes.h in Headers */, 1A8C59BE180E930E00EF57C3 /* CCComAttribute.h in Headers */, + 50ABBE261925AB6F00A911A9 /* base64.h in Headers */, 1A8C59C2180E930E00EF57C3 /* CCComAudio.h in Headers */, 1A01C68718F57BE800EFE3A6 /* CCArray.h in Headers */, 1A01C6A718F58F7500EFE3A6 /* CCNotificationCenter.h in Headers */, - 500DC98D19106300007B91BF /* CCPlatformMacros.h in Headers */, 1A8C59C6180E930E00EF57C3 /* CCComController.h in Headers */, + 50ABBEDA1925AB6F00A911A9 /* ZipUtils.h in Headers */, 1A8C59CA180E930E00EF57C3 /* CCComRender.h in Headers */, 1A8C59CE180E930E00EF57C3 /* CCDataReaderHelper.h in Headers */, 1A8C59D2180E930E00EF57C3 /* CCDatas.h in Headers */, + 50ABBDC01925AB4100A911A9 /* CCTextureCache.h in Headers */, ED9C6A9718599AD8000A5232 /* CCNodeGrid.h in Headers */, 1A8C59D6180E930E00EF57C3 /* CCDecorativeDisplay.h in Headers */, + 50ABC0201926664800A911A9 /* CCThread.h in Headers */, 1A01C69318F57BE800EFE3A6 /* CCDouble.h in Headers */, + 50ABBE221925AB6F00A911A9 /* atitc.h in Headers */, 1A8C59DA180E930E00EF57C3 /* CCDisplayFactory.h in Headers */, 1A8C59DE180E930E00EF57C3 /* CCDisplayManager.h in Headers */, 50FCEBB618C72017004AD434 /* SliderReader.h in Headers */, - 500DC99719106300007B91BF /* CCScheduler.h in Headers */, - 500DC98319106300007B91BF /* ccMacros.h in Headers */, + 50ABBED21925AB6F00A911A9 /* TGAlib.h in Headers */, 1A01C68D18F57BE800EFE3A6 /* CCDeprecated.h in Headers */, 1A8C59E2180E930E00EF57C3 /* CCInputDelegate.h in Headers */, + 503DD8EA1926736A00CD74DD /* CCESRenderer.h in Headers */, 1A8C59E6180E930E00EF57C3 /* CCProcessBase.h in Headers */, - 500DC96319106300007B91BF /* CCEventListener.h in Headers */, + 50ABBE581925AB6F00A911A9 /* CCEventFocus.h in Headers */, + 50ABC00A1926664800A911A9 /* CCCommon.h in Headers */, 2905FA5918CF08D100240AA3 /* UILayout.h in Headers */, + 50ABBE5C1925AB6F00A911A9 /* CCEventKeyboard.h in Headers */, B375107D1823ACA100B3BA6A /* CCPhysicsBodyInfo_chipmunk.h in Headers */, + 50ABC01C1926664800A911A9 /* CCSAXParser.h in Headers */, 2905FA4518CF08D100240AA3 /* GUIDefine.h in Headers */, 1A8C59EA180E930E00EF57C3 /* CCSGUIReader.h in Headers */, + 503DD8F11926736A00CD74DD /* OpenGL_Internal.h in Headers */, 1A8C59EE180E930E00EF57C3 /* CCSkin.h in Headers */, B37510801823ACA100B3BA6A /* CCPhysicsHelper_chipmunk.h in Headers */, - 500DC94B19106300007B91BF /* CCDirector.h in Headers */, 50FCEBA218C72017004AD434 /* LayoutReader.h in Headers */, 1A8C59F2180E930E00EF57C3 /* CCSpriteFrameCacheHelper.h in Headers */, 1A8C59F6180E930E00EF57C3 /* CCSSceneReader.h in Headers */, 1A8C59FA180E930E00EF57C3 /* CCTransformHelp.h in Headers */, + 50ABBDAA1925AB4100A911A9 /* CCRenderCommand.h in Headers */, 1A8C59FE180E930E00EF57C3 /* CCTween.h in Headers */, 1A8C5A06180E930E00EF57C3 /* CCUtilMath.h in Headers */, + 50ABBE601925AB6F00A911A9 /* CCEventListener.h in Headers */, 1A8C5A08180E930E00EF57C3 /* CocoStudio.h in Headers */, 1A8C5A10180E930E00EF57C3 /* DictionaryHelper.h in Headers */, + 50ABBEB21925AB6F00A911A9 /* CCUserDefault.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -6106,70 +5977,64 @@ buildActionMask = 2147483647; files = ( 2AC795DB1862870F005EC8E1 /* SkeletonBounds.cpp in Sources */, + 50ABBE2B1925AB6F00A911A9 /* ccCArray.cpp in Sources */, 2AC795DC1862870F005EC8E1 /* Event.cpp in Sources */, 1A01C68A18F57BE800EFE3A6 /* CCDeprecated.cpp in Sources */, 1A1645B0191B726C008C7C7F /* ConvertUTF.c in Sources */, - 500DC93219106300007B91BF /* CCAutoreleasePool.cpp in Sources */, 2905FA5618CF08D100240AA3 /* UILayout.cpp in Sources */, 2AC795DD1862870F005EC8E1 /* EventData.cpp in Sources */, 2AC795DE1862870F005EC8E1 /* BoundingBoxAttachment.cpp in Sources */, - 46A170501807CC1C005B8026 /* CCApplication.mm in Sources */, + 50ABBD581925AB0000A911A9 /* Vec2.cpp in Sources */, + 50ABBE311925AB6F00A911A9 /* CCConfiguration.cpp in Sources */, 1A01C6A418F58F7500EFE3A6 /* CCNotificationCenter.cpp in Sources */, 46A170EA1807CECA005B8026 /* CCPhysicsJoint.cpp in Sources */, - 46A170141807CBFC005B8026 /* CCFileUtilsApple.mm in Sources */, - 500DC99C19106300007B91BF /* CCValue.cpp in Sources */, 5027253C190BF1B900AAF4ED /* cocos2d.cpp in Sources */, - 500DC95C19106300007B91BF /* CCEventKeyboard.cpp in Sources */, - 46A1701D1807CBFC005B8026 /* CCFileUtils.cpp in Sources */, + 50ABC0611926664800A911A9 /* CCCommon.mm in Sources */, + 50ABBDB11925AB4100A911A9 /* ccShaders.cpp in Sources */, 46A170EF1807CECA005B8026 /* CCPhysicsWorld.cpp in Sources */, - 500DC96C19106300007B91BF /* CCEventListenerKeyboard.cpp in Sources */, - 46A170231807CBFC005B8026 /* CCSAXParser.cpp in Sources */, - B2AF2FA918EBAEAE00C5807C /* Vector4.cpp in Sources */, 46A170ED1807CECA005B8026 /* CCPhysicsShape.cpp in Sources */, - 46A170171807CBFC005B8026 /* CCThread.mm in Sources */, + 50ABBE991925AB6F00A911A9 /* CCRef.cpp in Sources */, ED9C6A9418599AD8000A5232 /* CCNodeGrid.cpp in Sources */, 06CAAACB186AD7F20012A414 /* TriggerMng.cpp in Sources */, - 46A170511807CC1C005B8026 /* CCCommon.mm in Sources */, - 46A1701B1807CBFC005B8026 /* CCGLViewProtocol.cpp in Sources */, - 500DC97019106300007B91BF /* CCEventListenerMouse.cpp in Sources */, 46A170E61807CECA005B8026 /* CCPhysicsBody.cpp in Sources */, - 3E26D40818ACB63900834404 /* CCDevice.mm in Sources */, - 46A170151807CBFC005B8026 /* CCLock.cpp in Sources */, - A04583F2189053B500E32FE8 /* CCGLView.cpp in Sources */, + 50ABBDA71925AB4100A911A9 /* CCRenderCommand.cpp in Sources */, + 50ABBD501925AB0000A911A9 /* Quaternion.cpp in Sources */, + 50ABBEBB1925AB6F00A911A9 /* ccUtils.cpp in Sources */, + 50ABBEB71925AB6F00A911A9 /* ccUTF8.cpp in Sources */, + 50ABBE271925AB6F00A911A9 /* CCAutoreleasePool.cpp in Sources */, + 50ABBE8B1925AB6F00A911A9 /* CCNS.cpp in Sources */, 46A170E81807CECA005B8026 /* CCPhysicsContact.cpp in Sources */, - 46A170251807CBFC005B8026 /* CCThread.cpp in Sources */, 1A570061180BC5A10088DEC7 /* CCAction.cpp in Sources */, - 5034CA4F191D591100CE6051 /* ccGLStateCache.cpp in Sources */, + 50ABBEC51925AB6F00A911A9 /* etc1.cpp in Sources */, 50FCEB9718C72017004AD434 /* CheckBoxReader.cpp in Sources */, 1A570065180BC5A10088DEC7 /* CCActionCamera.cpp in Sources */, - 500DC8BE19105D41007B91BF /* CCRenderCommand.cpp in Sources */, + 50ABBEAB1925AB6F00A911A9 /* ccTypes.cpp in Sources */, 1A570069180BC5A10088DEC7 /* CCActionCatmullRom.cpp in Sources */, 1A57006D180BC5A10088DEC7 /* CCActionEase.cpp in Sources */, 2905FA4E18CF08D100240AA3 /* UIHelper.cpp in Sources */, 1A570071180BC5A10088DEC7 /* CCActionGrid.cpp in Sources */, B37510761823AC9F00B3BA6A /* CCPhysicsJointInfo_chipmunk.cpp in Sources */, - 500DC98619106300007B91BF /* CCNS.cpp in Sources */, + 50ABBFFF1926664800A911A9 /* CCFileUtilsApple.mm in Sources */, 1A570075180BC5A10088DEC7 /* CCActionGrid3D.cpp in Sources */, B375107A1823AC9F00B3BA6A /* CCPhysicsWorldInfo_chipmunk.cpp in Sources */, 1A570079180BC5A10088DEC7 /* CCActionInstant.cpp in Sources */, - B2AF2FA118EBAEAE00C5807C /* Vector2.cpp in Sources */, - 500DC95819106300007B91BF /* CCEventDispatcher.cpp in Sources */, + 50ABBE591925AB6F00A911A9 /* CCEventKeyboard.cpp in Sources */, 1A57007D180BC5A10088DEC7 /* CCActionInterval.cpp in Sources */, 1A570081180BC5A10088DEC7 /* CCActionManager.cpp in Sources */, 1A570085180BC5A10088DEC7 /* CCActionPageTurn3D.cpp in Sources */, 1A570089180BC5A10088DEC7 /* CCActionProgressTimer.cpp in Sources */, - 296CAD281915EC9900C64FBF /* CCEventListenerFocus.cpp in Sources */, 1A57008D180BC5A10088DEC7 /* CCActionTiledGrid.cpp in Sources */, 1A570091180BC5A10088DEC7 /* CCActionTween.cpp in Sources */, - B2AF2F9918EBAEAE00C5807C /* Matrix.cpp in Sources */, - 500DC94419106300007B91BF /* CCDataVisitor.cpp in Sources */, + 50ABBEBF1925AB6F00A911A9 /* CCValue.cpp in Sources */, 1A570098180BC5C10088DEC7 /* CCAtlasNode.cpp in Sources */, 1A57009E180BC5D20088DEC7 /* CCNode.cpp in Sources */, 2905FA7418CF08D100240AA3 /* UIScrollView.cpp in Sources */, + 50ABBE651925AB6F00A911A9 /* CCEventListenerCustom.cpp in Sources */, B37510781823AC9F00B3BA6A /* CCPhysicsShapeInfo_chipmunk.cpp in Sources */, - 500DC97819106300007B91BF /* CCEventMouse.cpp in Sources */, 50FCEBB718C72017004AD434 /* TextAtlasReader.cpp in Sources */, + 50ABBE391925AB6F00A911A9 /* CCData.cpp in Sources */, 1A57010E180BC8EE0088DEC7 /* CCDrawingPrimitives.cpp in Sources */, + 50ABBED71925AB6F00A911A9 /* ZipUtils.cpp in Sources */, 2905FA6618CF08D100240AA3 /* UILoadingBar.cpp in Sources */, 50FCEBA318C72017004AD434 /* ListViewReader.cpp in Sources */, 1A01C68418F57BE800EFE3A6 /* CCArray.cpp in Sources */, @@ -6178,35 +6043,29 @@ 1A57011F180BC90D0088DEC7 /* CCGrid.cpp in Sources */, 50FCEBA718C72017004AD434 /* LoadingBarReader.cpp in Sources */, 06C0F2EF186AD822003594D5 /* ObjectFactory.cpp in Sources */, - 5034CA53191D591100CE6051 /* CCGLProgramStateCache.cpp in Sources */, - 500DC96419106300007B91BF /* CCEventListenerAcceleration.cpp in Sources */, 1A57019D180BCB590088DEC7 /* CCFont.cpp in Sources */, 1A5701A1180BCB590088DEC7 /* CCFontAtlas.cpp in Sources */, 1A5701A5180BCB590088DEC7 /* CCFontAtlasCache.cpp in Sources */, - 500DC96819106300007B91BF /* CCEventListenerCustom.cpp in Sources */, - 500DC95019106300007B91BF /* CCEventAcceleration.cpp in Sources */, - 5034CA1B191D591100CE6051 /* ccShaders.cpp in Sources */, 1A5701B1180BCB590088DEC7 /* CCFontFNT.cpp in Sources */, 1A5701B5180BCB590088DEC7 /* CCFontFreeType.cpp in Sources */, - 5034CA1F191D591100CE6051 /* CCGLProgramCache.cpp in Sources */, 1A5701B9180BCB5A0088DEC7 /* CCLabel.cpp in Sources */, - 500DC93819106300007B91BF /* CCConfiguration.cpp in Sources */, - 500DC9A619106300007B91BF /* s3tc.cpp in Sources */, 1A5701BD180BCB5A0088DEC7 /* CCLabelAtlas.cpp in Sources */, + 50ABBE551925AB6F00A911A9 /* CCEventFocus.cpp in Sources */, + 50ABBE491925AB6F00A911A9 /* CCEventAcceleration.cpp in Sources */, 1A5701C1180BCB5A0088DEC7 /* CCLabelBMFont.cpp in Sources */, + 50ABBD4C1925AB0000A911A9 /* MathUtil.cpp in Sources */, 1A087AE81860400400196EF5 /* edtaa3func.cpp in Sources */, B37510731823AC9F00B3BA6A /* CCPhysicsContactInfo_chipmunk.cpp in Sources */, + 50ABBD831925AB4100A911A9 /* CCBatchCommand.cpp in Sources */, 1A5701C7180BCB5A0088DEC7 /* CCLabelTextFormatter.cpp in Sources */, 1A5701CB180BCB5A0088DEC7 /* CCLabelTTF.cpp in Sources */, + 50ABBE711925AB6F00A911A9 /* CCEventListenerMouse.cpp in Sources */, 1A5701DE180BCB8C0088DEC7 /* CCLayer.cpp in Sources */, - 500DC99819106300007B91BF /* ccTypes.cpp in Sources */, - 500DC8C419105D41007B91BF /* CCRenderer.cpp in Sources */, 1A5701E2180BCB8C0088DEC7 /* CCScene.cpp in Sources */, 1A12775C18DFCC590005F345 /* CCTweenFunction.cpp in Sources */, - 500DC94019106300007B91BF /* CCData.cpp in Sources */, 1A5701E6180BCB8C0088DEC7 /* CCTransition.cpp in Sources */, 1A5701EA180BCB8C0088DEC7 /* CCTransitionPageTurn.cpp in Sources */, - 500DC9B619106E6D007B91BF /* TransformUtils.cpp in Sources */, + 50ABBDAD1925AB4100A911A9 /* CCRenderer.cpp in Sources */, 1A5701EE180BCB8C0088DEC7 /* CCTransitionProgress.cpp in Sources */, 1A5701F7180BCBAD0088DEC7 /* CCMenu.cpp in Sources */, 1A1645B2191B726C008C7C7F /* ConvertUTFWrapper.cpp in Sources */, @@ -6215,184 +6074,196 @@ 06CAAACF186AD7FC0012A414 /* TriggerBase.cpp in Sources */, 1A570208180BCBDF0088DEC7 /* CCMotionStreak.cpp in Sources */, 1A570210180BCBF40088DEC7 /* CCProgressTimer.cpp in Sources */, + 50ABBDB51925AB4100A911A9 /* CCTexture2D.cpp in Sources */, 1A570214180BCBF40088DEC7 /* CCRenderTexture.cpp in Sources */, + 50ABBE411925AB6F00A911A9 /* CCDirector.cpp in Sources */, 1A570221180BCC1A0088DEC7 /* CCParticleBatchNode.cpp in Sources */, 1A570225180BCC1A0088DEC7 /* CCParticleExamples.cpp in Sources */, 1A570229180BCC1A0088DEC7 /* CCParticleSystem.cpp in Sources */, 1A57022D180BCC1A0088DEC7 /* CCParticleSystemQuad.cpp in Sources */, - 500DC9B01910633C007B91BF /* CCTouch.cpp in Sources */, 50FCEB9B18C72017004AD434 /* ImageViewReader.cpp in Sources */, - 500DC9AA19106300007B91BF /* ZipUtils.cpp in Sources */, - 1A570234180BCC4D0088DEC7 /* CCScriptSupport.cpp in Sources */, 1A57027E180BCC900088DEC7 /* CCSprite.cpp in Sources */, 1A570282180BCC900088DEC7 /* CCSpriteBatchNode.cpp in Sources */, 1A570286180BCC900088DEC7 /* CCSpriteFrame.cpp in Sources */, + 50ABC0191926664800A911A9 /* CCSAXParser.cpp in Sources */, 1A57028A180BCC900088DEC7 /* CCSpriteFrameCache.cpp in Sources */, - 3E26D40518ACB5D100834404 /* CCImage.cpp in Sources */, 1A570292180BCCAB0088DEC7 /* CCAnimation.cpp in Sources */, 1A570296180BCCAB0088DEC7 /* CCAnimationCache.cpp in Sources */, 2905FA8C18CF08D100240AA3 /* UIWidget.cpp in Sources */, 2905FA8018CF08D100240AA3 /* UITextAtlas.cpp in Sources */, + 50ABBE351925AB6F00A911A9 /* CCConsole.cpp in Sources */, + 50ABBEAF1925AB6F00A911A9 /* CCUserDefault.cpp in Sources */, 50FCEBBB18C72017004AD434 /* TextBMFontReader.cpp in Sources */, + 50ABBE791925AB6F00A911A9 /* CCEventMouse.cpp in Sources */, 50FCEBBF18C72017004AD434 /* TextFieldReader.cpp in Sources */, 50FCEBAF18C72017004AD434 /* ScrollViewReader.cpp in Sources */, - 1A5702AF180BCDBC0088DEC7 /* ccUTF8.cpp in Sources */, - 500DC8D519105F7D007B91BF /* CCGeometry.cpp in Sources */, - 1A5702B5180BCDF40088DEC7 /* CCVertex.cpp in Sources */, - 1A5702C2180BCE2A0088DEC7 /* CCIMEDispatcher.cpp in Sources */, + 50ABC0111926664800A911A9 /* CCGLViewProtocol.cpp in Sources */, + 50ABBE3D1925AB6F00A911A9 /* CCDataVisitor.cpp in Sources */, 1A5702C8180BCE370088DEC7 /* CCTextFieldTTF.cpp in Sources */, + 50ABBE7D1925AB6F00A911A9 /* CCEventTouch.cpp in Sources */, 50FCEBAB18C72017004AD434 /* PageViewReader.cpp in Sources */, - 1A5702D3180BCE570088DEC7 /* CCTexture2D.cpp in Sources */, - 1A5702D7180BCE570088DEC7 /* CCTextureAtlas.cpp in Sources */, - 1A5702DB180BCE570088DEC7 /* CCTextureCache.cpp in Sources */, 1A5702EA180BCE750088DEC7 /* CCTileMapAtlas.cpp in Sources */, + 50ABBD971925AB4100A911A9 /* CCGLProgramStateCache.cpp in Sources */, 1A5702EE180BCE750088DEC7 /* CCTMXLayer.cpp in Sources */, - 500DC97C19106300007B91BF /* CCEventTouch.cpp in Sources */, + 50ABBE691925AB6F00A911A9 /* CCEventListenerFocus.cpp in Sources */, 1A5702F2180BCE750088DEC7 /* CCTMXObjectGroup.cpp in Sources */, 1A5702F6180BCE750088DEC7 /* CCTMXTiledMap.cpp in Sources */, 1A5702FA180BCE750088DEC7 /* CCTMXXMLParser.cpp in Sources */, + 50ABBD5C1925AB0000A911A9 /* Vec3.cpp in Sources */, 1A570300180BCE890088DEC7 /* CCParallaxNode.cpp in Sources */, - 1A570305180BCED90088DEC7 /* ccUtils.cpp in Sources */, 1A57030C180BCF190088DEC7 /* CCComponent.cpp in Sources */, - 500DC96019106300007B91BF /* CCEventListener.cpp in Sources */, 1A570310180BCF190088DEC7 /* CCComponentContainer.cpp in Sources */, - 1A570319180BCF430088DEC7 /* ccCArray.cpp in Sources */, B37510711823AC9F00B3BA6A /* CCPhysicsBodyInfo_chipmunk.cpp in Sources */, - 1A570324180BCF660088DEC7 /* TGAlib.cpp in Sources */, 1A01C69C18F57BE800EFE3A6 /* CCString.cpp in Sources */, - 1A57032F180BCFD50088DEC7 /* CCUserDefault.cpp in Sources */, - 1A570333180BCFD50088DEC7 /* CCUserDefault.mm in Sources */, - 1A570335180BCFD50088DEC7 /* CCUserDefaultAndroid.cpp in Sources */, + 50ABBD3C1925AB0000A911A9 /* CCGeometry.cpp in Sources */, + 50ABC0011926664800A911A9 /* CCLock.cpp in Sources */, 50E6D30E18DADB5D0051CA34 /* CCProtectedNode.cpp in Sources */, - 500DC93C19106300007B91BF /* CCConsole.cpp in Sources */, + 50ABBD931925AB4100A911A9 /* CCGLProgramState.cpp in Sources */, 1A57034B180BD09B0088DEC7 /* tinyxml2.cpp in Sources */, 1A570354180BD0B00088DEC7 /* ioapi.cpp in Sources */, 1A570358180BD0B00088DEC7 /* unzip.cpp in Sources */, 1AD71DA9180E26E600808F54 /* CCBAnimationManager.cpp in Sources */, - 500DC95419106300007B91BF /* CCEventCustom.cpp in Sources */, 1AD71DAD180E26E600808F54 /* CCBFileLoader.cpp in Sources */, 50E6D33418E174130051CA34 /* UIHBox.cpp in Sources */, + 50ABBEB31925AB6F00A911A9 /* CCUserDefault.mm in Sources */, 2905FA8418CF08D100240AA3 /* UITextBMFont.cpp in Sources */, 1AD71DB1180E26E600808F54 /* CCBKeyframe.cpp in Sources */, 1AD71DB7180E26E600808F54 /* CCBReader.cpp in Sources */, - B2AF2FA518EBAEAE00C5807C /* Vector3.cpp in Sources */, + 50ABBEB51925AB6F00A911A9 /* CCUserDefaultAndroid.cpp in Sources */, 1AD71DBD180E26E600808F54 /* CCBSequence.cpp in Sources */, 1AD71DC1180E26E600808F54 /* CCBSequenceProperty.cpp in Sources */, 1AD71DC9180E26E600808F54 /* CCControlButtonLoader.cpp in Sources */, 1AD71DCD180E26E600808F54 /* CCControlLoader.cpp in Sources */, + 50ABBE831925AB6F00A911A9 /* ccFPSImages.c in Sources */, 50FCEBC718C72017004AD434 /* WidgetReader.cpp in Sources */, 1AD71DD1180E26E600808F54 /* CCLabelBMFontLoader.cpp in Sources */, 1AD71DD5180E26E600808F54 /* CCLabelTTFLoader.cpp in Sources */, + 50ABBEA71925AB6F00A911A9 /* CCTouch.cpp in Sources */, 1AD71DD9180E26E600808F54 /* CCLayerColorLoader.cpp in Sources */, - 500DC94C19106300007B91BF /* CCEvent.cpp in Sources */, - 500DC8BA19105D41007B91BF /* CCQuadCommand.cpp in Sources */, 1AD71DDD180E26E600808F54 /* CCLayerGradientLoader.cpp in Sources */, 1AD71DE1180E26E600808F54 /* CCLayerLoader.cpp in Sources */, 1AD71DE5180E26E600808F54 /* CCMenuItemImageLoader.cpp in Sources */, + 50ABBD8B1925AB4100A911A9 /* CCGLProgram.cpp in Sources */, 1AD71DE9180E26E600808F54 /* CCMenuItemLoader.cpp in Sources */, + 50ABBDA31925AB4100A911A9 /* CCQuadCommand.cpp in Sources */, 2905FA6A18CF08D100240AA3 /* UIPageView.cpp in Sources */, 06CAAAC7186AD7E90012A414 /* TriggerObj.cpp in Sources */, 1AD71DEF180E26E600808F54 /* CCNode+CCBRelativePositioning.cpp in Sources */, + 50ABC01D1926664800A911A9 /* CCThread.cpp in Sources */, 1AD71DF3180E26E600808F54 /* CCNodeLoader.cpp in Sources */, 1AD71DF7180E26E600808F54 /* CCNodeLoaderLibrary.cpp in Sources */, + 50ABBECB1925AB6F00A911A9 /* s3tc.cpp in Sources */, 1AD71DFD180E26E600808F54 /* CCParticleSystemQuadLoader.cpp in Sources */, 50FCEB9318C72017004AD434 /* ButtonReader.cpp in Sources */, - 5034CA57191D591100CE6051 /* CCGLProgramState.cpp in Sources */, 1AD71E01180E26E600808F54 /* CCScale9SpriteLoader.cpp in Sources */, 1AD71E05180E26E600808F54 /* CCScrollViewLoader.cpp in Sources */, 1AD71E09180E26E600808F54 /* CCSpriteLoader.cpp in Sources */, - 500DC8AE19105D41007B91BF /* CCCustomCommand.cpp in Sources */, - 500DC92A19106300007B91BF /* atitc.cpp in Sources */, + 50ABBD481925AB0000A911A9 /* Mat4.cpp in Sources */, 1AD71E95180E26E600808F54 /* Animation.cpp in Sources */, 1AD71E99180E26E600808F54 /* AnimationState.cpp in Sources */, 1AD71E9D180E26E600808F54 /* AnimationStateData.cpp in Sources */, 1AD71EA1180E26E600808F54 /* Atlas.cpp in Sources */, - 500DC97419106300007B91BF /* CCEventListenerTouch.cpp in Sources */, 1AD71EA5180E26E600808F54 /* AtlasAttachmentLoader.cpp in Sources */, - 500DC8D119105F7D007B91BF /* CCAffineTransform.cpp in Sources */, + 50ABBD8F1925AB4100A911A9 /* CCGLProgramCache.cpp in Sources */, + 50ABBD441925AB0000A911A9 /* CCVertex.cpp in Sources */, 1AD71EA9180E26E600808F54 /* Attachment.cpp in Sources */, 1AD71EAD180E26E600808F54 /* AttachmentLoader.cpp in Sources */, + 503DD8F71926B0DB00CD74DD /* CCIMEDispatcher.cpp in Sources */, 1AD71EB1180E26E600808F54 /* Bone.cpp in Sources */, 1AD71EB5180E26E600808F54 /* BoneData.cpp in Sources */, 1AD71EB9180E26E600808F54 /* CCSkeleton.cpp in Sources */, - 500DC8AA19105D41007B91BF /* CCBatchCommand.cpp in Sources */, + 50ABBE751925AB6F00A911A9 /* CCEventListenerTouch.cpp in Sources */, 1AD71EBD180E26E600808F54 /* CCSkeletonAnimation.cpp in Sources */, 2905FA4018CF08D100240AA3 /* CocosGUI.cpp in Sources */, 1AD71EC1180E26E600808F54 /* extension.cpp in Sources */, + 50ABBE511925AB6F00A911A9 /* CCEventDispatcher.cpp in Sources */, + 50ABC0051926664800A911A9 /* CCThread.mm in Sources */, 1AD71EC5180E26E600808F54 /* Json.cpp in Sources */, - B2AF2F9518EBAEAE00C5807C /* MathUtil.cpp in Sources */, 50E6D33C18E174130051CA34 /* UIVBox.cpp in Sources */, 1AD71EC9180E26E600808F54 /* RegionAttachment.cpp in Sources */, 50E6D33818E174130051CA34 /* UIRelativeBox.cpp in Sources */, 1AD71ECD180E26E600808F54 /* Skeleton.cpp in Sources */, 1AD71ED1180E26E600808F54 /* SkeletonData.cpp in Sources */, 1AD71ED5180E26E600808F54 /* SkeletonJson.cpp in Sources */, - 296CAD221915EC8000C64FBF /* CCEventFocus.cpp in Sources */, 1AD71ED9180E26E600808F54 /* Skin.cpp in Sources */, 1AD71EDD180E26E600808F54 /* Slot.cpp in Sources */, 1AD71EE1180E26E600808F54 /* SlotData.cpp in Sources */, 2905FA7818CF08D100240AA3 /* UISlider.cpp in Sources */, 1AD71EE5180E26E600808F54 /* spine-cocos2dx.cpp in Sources */, 1AAF536A180E3374000584C8 /* HttpClient.cpp in Sources */, + 50ABC0631926664800A911A9 /* CCDevice.mm in Sources */, 1AAF5372180E3374000584C8 /* SocketIO.cpp in Sources */, + 50ABBE1F1925AB6F00A911A9 /* atitc.cpp in Sources */, 1AAF5376180E3374000584C8 /* WebSocket.cpp in Sources */, 1A01C69818F57BE800EFE3A6 /* CCSet.cpp in Sources */, 1AAF584F180E40B9000584C8 /* LocalStorage.cpp in Sources */, + 50ABBEA31925AB6F00A911A9 /* CCScriptSupport.cpp in Sources */, + 50ABBE6D1925AB6F00A911A9 /* CCEventListenerKeyboard.cpp in Sources */, 1AAF5853180E40B9000584C8 /* LocalStorageAndroid.cpp in Sources */, 2905FA4A18CF08D100240AA3 /* UICheckBox.cpp in Sources */, - 500DC94819106300007B91BF /* CCDirector.cpp in Sources */, - 500DC9BC19106E89007B91BF /* CCProfiling.cpp in Sources */, - 1A9DCA23180E6955007A3AD4 /* ccFPSImages.c in Sources */, 1A9DCA27180E6955007A3AD4 /* CCGLBufferedNode.cpp in Sources */, - 500DC9A219106300007B91BF /* etc1.cpp in Sources */, 2905FA5E18CF08D100240AA3 /* UILayoutParameter.cpp in Sources */, + 50ABBD541925AB0000A911A9 /* TransformUtils.cpp in Sources */, 1A8C598B180E930E00EF57C3 /* CCActionFrame.cpp in Sources */, + 50ABBD9B1925AB4100A911A9 /* ccGLStateCache.cpp in Sources */, 1A8C598F180E930E00EF57C3 /* CCActionFrameEasing.cpp in Sources */, + 50ABBDB91925AB4100A911A9 /* CCTextureAtlas.cpp in Sources */, 1A8C5993180E930E00EF57C3 /* CCActionManagerEx.cpp in Sources */, - B2AF2F9D18EBAEAE00C5807C /* Quaternion.cpp in Sources */, 1A8C5997180E930E00EF57C3 /* CCActionNode.cpp in Sources */, + 50ABBECF1925AB6F00A911A9 /* TGAlib.cpp in Sources */, 50FCEBC318C72017004AD434 /* TextReader.cpp in Sources */, 1A8C599B180E930E00EF57C3 /* CCActionObject.cpp in Sources */, + 50ABBE451925AB6F00A911A9 /* CCEvent.cpp in Sources */, 1A8C599F180E930E00EF57C3 /* CCArmature.cpp in Sources */, 1A8C59A3180E930E00EF57C3 /* CCArmatureAnimation.cpp in Sources */, 1A8C59A7180E930E00EF57C3 /* CCArmatureDataManager.cpp in Sources */, 1A8C59AB180E930E00EF57C3 /* CCArmatureDefine.cpp in Sources */, 1A8C59AF180E930E00EF57C3 /* CCBatchNode.cpp in Sources */, + 50ABBE611925AB6F00A911A9 /* CCEventListenerAcceleration.cpp in Sources */, + 50ABBD9F1925AB4100A911A9 /* CCGroupCommand.cpp in Sources */, 1A8C59B3180E930E00EF57C3 /* CCBone.cpp in Sources */, 1A8C59B7180E930E00EF57C3 /* CCColliderDetector.cpp in Sources */, - 5034CA5B191D591100CE6051 /* CCGLProgram.cpp in Sources */, 1A8C59BB180E930E00EF57C3 /* CCComAttribute.cpp in Sources */, + 50ABBD871925AB4100A911A9 /* CCCustomCommand.cpp in Sources */, 1A8C59BF180E930E00EF57C3 /* CCComAudio.cpp in Sources */, 1A8C59C3180E930E00EF57C3 /* CCComController.cpp in Sources */, 2905FA5218CF08D100240AA3 /* UIImageView.cpp in Sources */, + 50ABBDBD1925AB4100A911A9 /* CCTextureCache.cpp in Sources */, 2905FA7C18CF08D100240AA3 /* UIText.cpp in Sources */, 50FCEB9F18C72017004AD434 /* LayoutReader.cpp in Sources */, + 50ABC0211926664800A911A9 /* CCGLView.cpp in Sources */, 1A8C59C7180E930E00EF57C3 /* CCComRender.cpp in Sources */, + 50ABC00D1926664800A911A9 /* CCFileUtils.cpp in Sources */, 1A8C59CB180E930E00EF57C3 /* CCDataReaderHelper.cpp in Sources */, 1A8C59CF180E930E00EF57C3 /* CCDatas.cpp in Sources */, 1A8C59D3180E930E00EF57C3 /* CCDecorativeDisplay.cpp in Sources */, - 500DC8B219105D41007B91BF /* CCGroupCommand.cpp in Sources */, 50FCEBB318C72017004AD434 /* SliderReader.cpp in Sources */, + 50ABBE4D1925AB6F00A911A9 /* CCEventCustom.cpp in Sources */, + 50ABBE9F1925AB6F00A911A9 /* CCScheduler.cpp in Sources */, + 50ABC0151926664800A911A9 /* CCImage.cpp in Sources */, + 50ABBE231925AB6F00A911A9 /* base64.cpp in Sources */, + 50ABBE5D1925AB6F00A911A9 /* CCEventListener.cpp in Sources */, 1A8C59D7180E930E00EF57C3 /* CCDisplayFactory.cpp in Sources */, + 50ABBD601925AB0000A911A9 /* Vec4.cpp in Sources */, 1A8C59DB180E930E00EF57C3 /* CCDisplayManager.cpp in Sources */, 2905FA6218CF08D100240AA3 /* UIListView.cpp in Sources */, 1A8C59DF180E930E00EF57C3 /* CCInputDelegate.cpp in Sources */, - 500DC92E19106300007B91BF /* base64.cpp in Sources */, - 500DC99419106300007B91BF /* CCScheduler.cpp in Sources */, 1A8C59E3180E930E00EF57C3 /* CCProcessBase.cpp in Sources */, - 500DC98E19106300007B91BF /* CCRef.cpp in Sources */, 1A8C59E7180E930E00EF57C3 /* CCSGUIReader.cpp in Sources */, + 50ABC05F1926664800A911A9 /* CCApplication.mm in Sources */, 1A8C59EB180E930E00EF57C3 /* CCSkin.cpp in Sources */, 1A8C59EF180E930E00EF57C3 /* CCSpriteFrameCacheHelper.cpp in Sources */, 1A8C59F3180E930E00EF57C3 /* CCSSceneReader.cpp in Sources */, 2905FA6E18CF08D100240AA3 /* UIRichText.cpp in Sources */, 1A01C68E18F57BE800EFE3A6 /* CCDictionary.cpp in Sources */, 1A8C59F7180E930E00EF57C3 /* CCTransformHelp.cpp in Sources */, + 50ABBD381925AB0000A911A9 /* CCAffineTransform.cpp in Sources */, 1A8C59FB180E930E00EF57C3 /* CCTween.cpp in Sources */, 2905FA8818CF08D100240AA3 /* UITextField.cpp in Sources */, 46C02E0718E91123004B7456 /* xxhash.c in Sources */, 1A8C5A03180E930E00EF57C3 /* CCUtilMath.cpp in Sources */, 1A8C5A0D180E930E00EF57C3 /* DictionaryHelper.cpp in Sources */, + 50ABBE931925AB6F00A911A9 /* CCProfiling.cpp in Sources */, 1ABA68AE1888D700007D1BB4 /* CCFontCharMap.cpp in Sources */, 2905FA4618CF08D100240AA3 /* UIButton.cpp in Sources */, ); @@ -6535,7 +6406,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 296CAD291915EC9900C64FBF /* CCEventListenerFocus.cpp in Sources */, 1A01C69918F57BE800EFE3A6 /* CCSet.cpp in Sources */, 1A01C69D18F57BE800EFE3A6 /* CCString.cpp in Sources */, 2986667F18B1B246000E39CA /* CCTweenFunction.cpp in Sources */, @@ -6543,286 +6413,285 @@ 2AC795E418628746005EC8E1 /* Event.cpp in Sources */, 2AC795E518628746005EC8E1 /* EventData.cpp in Sources */, 2AC795E618628746005EC8E1 /* BoundingBoxAttachment.cpp in Sources */, - 46A1703C1807CC07005B8026 /* CCApplication.mm in Sources */, - 500DC93919106300007B91BF /* CCConfiguration.cpp in Sources */, - 500DC92F19106300007B91BF /* base64.cpp in Sources */, - 46A170471807CC07005B8026 /* CCImage.mm in Sources */, - 46A1704B1807CC07005B8026 /* CCEAGLView.mm in Sources */, 46A171001807CECB005B8026 /* CCPhysicsJoint.cpp in Sources */, - 46A170441807CC07005B8026 /* CCES2Renderer.m in Sources */, - 46A170281807CBFE005B8026 /* CCFileUtilsApple.mm in Sources */, - 46A170311807CBFE005B8026 /* CCFileUtils.cpp in Sources */, - 500DC9B719106E6D007B91BF /* TransformUtils.cpp in Sources */, 46A171051807CECB005B8026 /* CCPhysicsWorld.cpp in Sources */, - 46A1703E1807CC07005B8026 /* CCDevice.mm in Sources */, - 500DC9A319106300007B91BF /* etc1.cpp in Sources */, + 50ABBDA01925AB4100A911A9 /* CCGroupCommand.cpp in Sources */, 46A171031807CECB005B8026 /* CCPhysicsShape.cpp in Sources */, + 50ABC0161926664800A911A9 /* CCImage.cpp in Sources */, 1A01C6A518F58F7500EFE3A6 /* CCNotificationCenter.cpp in Sources */, - 46A170371807CBFE005B8026 /* CCSAXParser.cpp in Sources */, - 46A1702B1807CBFE005B8026 /* CCThread.mm in Sources */, 50E6D33918E174130051CA34 /* UIRelativeBox.cpp in Sources */, ED9C6A9518599AD8000A5232 /* CCNodeGrid.cpp in Sources */, - 46A170401807CC07005B8026 /* CCDirectorCaller.mm in Sources */, 1A01C68F18F57BE800EFE3A6 /* CCDictionary.cpp in Sources */, + 50ABBE561925AB6F00A911A9 /* CCEventFocus.cpp in Sources */, 06CAAACC186AD7F50012A414 /* TriggerMng.cpp in Sources */, - 46A1703D1807CC07005B8026 /* CCCommon.mm in Sources */, + 503DD8E11926736A00CD74DD /* CCApplication.mm in Sources */, + 50ABC01A1926664800A911A9 /* CCSAXParser.cpp in Sources */, + 503DD8EE1926736A00CD74DD /* CCImage.mm in Sources */, 50FCEBC818C72017004AD434 /* WidgetReader.cpp in Sources */, - 46A1702F1807CBFE005B8026 /* CCGLViewProtocol.cpp in Sources */, 46A170FC1807CECB005B8026 /* CCPhysicsBody.cpp in Sources */, - 46A170291807CBFE005B8026 /* CCLock.cpp in Sources */, - 500DC97119106300007B91BF /* CCEventListenerMouse.cpp in Sources */, - 500DC8AB19105D41007B91BF /* CCBatchCommand.cpp in Sources */, - 500DC92B19106300007B91BF /* atitc.cpp in Sources */, + 50ABBD941925AB4100A911A9 /* CCGLProgramState.cpp in Sources */, + 50ABBE281925AB6F00A911A9 /* CCAutoreleasePool.cpp in Sources */, 46A170FE1807CECB005B8026 /* CCPhysicsContact.cpp in Sources */, - 46A170391807CBFE005B8026 /* CCThread.cpp in Sources */, 3EA0FB6C191C841D00B170C8 /* UIVideoPlayerIOS.mm in Sources */, - 46A170421807CC07005B8026 /* CCGLView.mm in Sources */, 1A570062180BC5A10088DEC7 /* CCAction.cpp in Sources */, 1A570066180BC5A10088DEC7 /* CCActionCamera.cpp in Sources */, 1A57006A180BC5A10088DEC7 /* CCActionCatmullRom.cpp in Sources */, 1A57006E180BC5A10088DEC7 /* CCActionEase.cpp in Sources */, + 50ABBD8C1925AB4100A911A9 /* CCGLProgram.cpp in Sources */, 1A570072180BC5A10088DEC7 /* CCActionGrid.cpp in Sources */, + 50ABBE621925AB6F00A911A9 /* CCEventListenerAcceleration.cpp in Sources */, B37510811823ACA100B3BA6A /* CCPhysicsJointInfo_chipmunk.cpp in Sources */, 2905FA8D18CF08D100240AA3 /* UIWidget.cpp in Sources */, + 50ABBE7E1925AB6F00A911A9 /* CCEventTouch.cpp in Sources */, 50FCEB9818C72017004AD434 /* CheckBoxReader.cpp in Sources */, + 50ABBE6E1925AB6F00A911A9 /* CCEventListenerKeyboard.cpp in Sources */, + 50ABBE461925AB6F00A911A9 /* CCEvent.cpp in Sources */, + 50ABBEA01925AB6F00A911A9 /* CCScheduler.cpp in Sources */, + 50ABBE4E1925AB6F00A911A9 /* CCEventCustom.cpp in Sources */, + 50ABBE761925AB6F00A911A9 /* CCEventListenerTouch.cpp in Sources */, + 50ABBE5A1925AB6F00A911A9 /* CCEventKeyboard.cpp in Sources */, 1A570076180BC5A10088DEC7 /* CCActionGrid3D.cpp in Sources */, - 500DC99D19106300007B91BF /* CCValue.cpp in Sources */, B37510851823ACA100B3BA6A /* CCPhysicsWorldInfo_chipmunk.cpp in Sources */, + 50ABBD551925AB0000A911A9 /* TransformUtils.cpp in Sources */, 1A57007A180BC5A10088DEC7 /* CCActionInstant.cpp in Sources */, + 50ABBEC01925AB6F00A911A9 /* CCValue.cpp in Sources */, + 50ABBD591925AB0000A911A9 /* Vec2.cpp in Sources */, + 50ABBE421925AB6F00A911A9 /* CCDirector.cpp in Sources */, 1A57007E180BC5A10088DEC7 /* CCActionInterval.cpp in Sources */, 1A570082180BC5A10088DEC7 /* CCActionManager.cpp in Sources */, - 500DC97519106300007B91BF /* CCEventListenerTouch.cpp in Sources */, 1A570086180BC5A10088DEC7 /* CCActionPageTurn3D.cpp in Sources */, - 500DC9BD19106E89007B91BF /* CCProfiling.cpp in Sources */, 1A57008A180BC5A10088DEC7 /* CCActionProgressTimer.cpp in Sources */, 2905FA6F18CF08D100240AA3 /* UIRichText.cpp in Sources */, + 50ABBED81925AB6F00A911A9 /* ZipUtils.cpp in Sources */, 1A57008E180BC5A10088DEC7 /* CCActionTiledGrid.cpp in Sources */, 1A570092180BC5A10088DEC7 /* CCActionTween.cpp in Sources */, 1A570099180BC5C10088DEC7 /* CCAtlasNode.cpp in Sources */, + 50ABBD4D1925AB0000A911A9 /* MathUtil.cpp in Sources */, + 50ABBE3E1925AB6F00A911A9 /* CCDataVisitor.cpp in Sources */, 1A57009F180BC5D20088DEC7 /* CCNode.cpp in Sources */, B37510831823ACA100B3BA6A /* CCPhysicsShapeInfo_chipmunk.cpp in Sources */, - B2AF2FA618EBAEAE00C5807C /* Vector3.cpp in Sources */, 1A57010F180BC8EE0088DEC7 /* CCDrawingPrimitives.cpp in Sources */, 1A570113180BC8EE0088DEC7 /* CCDrawNode.cpp in Sources */, 1A57011C180BC90D0088DEC7 /* CCGrabber.cpp in Sources */, 1A570120180BC90D0088DEC7 /* CCGrid.cpp in Sources */, - 500DC96919106300007B91BF /* CCEventListenerCustom.cpp in Sources */, 06C0F2F0186AD824003594D5 /* ObjectFactory.cpp in Sources */, - 500DC99919106300007B91BF /* ccTypes.cpp in Sources */, 1A57019E180BCB590088DEC7 /* CCFont.cpp in Sources */, + 503DD8E21926736A00CD74DD /* CCCommon.mm in Sources */, 1A5701A2180BCB590088DEC7 /* CCFontAtlas.cpp in Sources */, + 50ABC00E1926664800A911A9 /* CCFileUtils.cpp in Sources */, + 50ABBE241925AB6F00A911A9 /* base64.cpp in Sources */, 1A5701A6180BCB590088DEC7 /* CCFontAtlasCache.cpp in Sources */, - 500DC96119106300007B91BF /* CCEventListener.cpp in Sources */, 1A5701B2180BCB590088DEC7 /* CCFontFNT.cpp in Sources */, 1A5701B6180BCB590088DEC7 /* CCFontFreeType.cpp in Sources */, + 50ABBEAC1925AB6F00A911A9 /* ccTypes.cpp in Sources */, 1A5701BA180BCB5A0088DEC7 /* CCLabel.cpp in Sources */, 2905FA4B18CF08D100240AA3 /* UICheckBox.cpp in Sources */, 1A5701BE180BCB5A0088DEC7 /* CCLabelAtlas.cpp in Sources */, 1A5701C2180BCB5A0088DEC7 /* CCLabelBMFont.cpp in Sources */, - 500DC97919106300007B91BF /* CCEventMouse.cpp in Sources */, 1A087AE91860400400196EF5 /* edtaa3func.cpp in Sources */, B375107E1823ACA100B3BA6A /* CCPhysicsContactInfo_chipmunk.cpp in Sources */, - 500DC99519106300007B91BF /* CCScheduler.cpp in Sources */, 1A5701C8180BCB5A0088DEC7 /* CCLabelTextFormatter.cpp in Sources */, 1A5701CC180BCB5A0088DEC7 /* CCLabelTTF.cpp in Sources */, 1A5701DF180BCB8C0088DEC7 /* CCLayer.cpp in Sources */, + 50ABBDBE1925AB4100A911A9 /* CCTextureCache.cpp in Sources */, 1A5701E3180BCB8C0088DEC7 /* CCScene.cpp in Sources */, - 500DC95119106300007B91BF /* CCEventAcceleration.cpp in Sources */, - 5034CA5C191D591100CE6051 /* CCGLProgram.cpp in Sources */, - 500DC9B11910633C007B91BF /* CCTouch.cpp in Sources */, + 50ABBD611925AB0000A911A9 /* Vec4.cpp in Sources */, + 50ABBD9C1925AB4100A911A9 /* ccGLStateCache.cpp in Sources */, 1A5701E7180BCB8C0088DEC7 /* CCTransition.cpp in Sources */, + 50ABC01E1926664800A911A9 /* CCThread.cpp in Sources */, 1A5701EB180BCB8C0088DEC7 /* CCTransitionPageTurn.cpp in Sources */, 1A5701EF180BCB8C0088DEC7 /* CCTransitionProgress.cpp in Sources */, 1A5701F8180BCBAD0088DEC7 /* CCMenu.cpp in Sources */, + 50ABBD511925AB0000A911A9 /* Quaternion.cpp in Sources */, 1A5701FC180BCBAD0088DEC7 /* CCMenuItem.cpp in Sources */, 06CAAAD0186AD7FE0012A414 /* TriggerBase.cpp in Sources */, 2905FA4F18CF08D100240AA3 /* UIHelper.cpp in Sources */, + 50ABBD491925AB0000A911A9 /* Mat4.cpp in Sources */, 1A570203180BCBD40088DEC7 /* CCClippingNode.cpp in Sources */, 1A570209180BCBDF0088DEC7 /* CCMotionStreak.cpp in Sources */, 1A570211180BCBF40088DEC7 /* CCProgressTimer.cpp in Sources */, + 503DD8ED1926736A00CD74DD /* CCGLView.mm in Sources */, 50FCEBA818C72017004AD434 /* LoadingBarReader.cpp in Sources */, 1A570215180BCBF40088DEC7 /* CCRenderTexture.cpp in Sources */, 1A570222180BCC1A0088DEC7 /* CCParticleBatchNode.cpp in Sources */, - 500DC9AB19106300007B91BF /* ZipUtils.cpp in Sources */, 1A570226180BCC1A0088DEC7 /* CCParticleExamples.cpp in Sources */, 1A57022A180BCC1A0088DEC7 /* CCParticleSystem.cpp in Sources */, 1A57022E180BCC1A0088DEC7 /* CCParticleSystemQuad.cpp in Sources */, - 1A570235180BCC4D0088DEC7 /* CCScriptSupport.cpp in Sources */, + 50ABBD901925AB4100A911A9 /* CCGLProgramCache.cpp in Sources */, 2905FA5718CF08D100240AA3 /* UILayout.cpp in Sources */, 2905FA7D18CF08D100240AA3 /* UIText.cpp in Sources */, 50E6D33D18E174130051CA34 /* UIVBox.cpp in Sources */, 1A57027F180BCC900088DEC7 /* CCSprite.cpp in Sources */, - 500DC93319106300007B91BF /* CCAutoreleasePool.cpp in Sources */, 1A570283180BCC900088DEC7 /* CCSpriteBatchNode.cpp in Sources */, 1A570287180BCC900088DEC7 /* CCSpriteFrame.cpp in Sources */, 1A57028B180BCC900088DEC7 /* CCSpriteFrameCache.cpp in Sources */, 1A570293180BCCAB0088DEC7 /* CCAnimation.cpp in Sources */, 1A570297180BCCAB0088DEC7 /* CCAnimationCache.cpp in Sources */, 50FCEBC418C72017004AD434 /* TextReader.cpp in Sources */, - 500DC94919106300007B91BF /* CCDirector.cpp in Sources */, - 1A5702B0180BCDBC0088DEC7 /* ccUTF8.cpp in Sources */, 50FCEB9418C72017004AD434 /* ButtonReader.cpp in Sources */, - 500DC8AF19105D41007B91BF /* CCCustomCommand.cpp in Sources */, - 1A5702B6180BCDF40088DEC7 /* CCVertex.cpp in Sources */, - 1A5702C3180BCE2A0088DEC7 /* CCIMEDispatcher.cpp in Sources */, + 50ABBE321925AB6F00A911A9 /* CCConfiguration.cpp in Sources */, 1A5702C9180BCE370088DEC7 /* CCTextFieldTTF.cpp in Sources */, - 1A5702D4180BCE570088DEC7 /* CCTexture2D.cpp in Sources */, - 1A5702D8180BCE570088DEC7 /* CCTextureAtlas.cpp in Sources */, - 1A5702DC180BCE570088DEC7 /* CCTextureCache.cpp in Sources */, 1A5702EB180BCE750088DEC7 /* CCTileMapAtlas.cpp in Sources */, 1A5702EF180BCE750088DEC7 /* CCTMXLayer.cpp in Sources */, 1A5702F3180BCE750088DEC7 /* CCTMXObjectGroup.cpp in Sources */, + 50ABBD3D1925AB0000A911A9 /* CCGeometry.cpp in Sources */, + 50ABBECC1925AB6F00A911A9 /* s3tc.cpp in Sources */, 50E6D31018DAF01A0051CA34 /* CCProtectedNode.cpp in Sources */, 1A5702F7180BCE750088DEC7 /* CCTMXTiledMap.cpp in Sources */, + 50ABBEC61925AB6F00A911A9 /* etc1.cpp in Sources */, + 50ABBE8C1925AB6F00A911A9 /* CCNS.cpp in Sources */, + 50ABBDAE1925AB4100A911A9 /* CCRenderer.cpp in Sources */, + 50ABBDBA1925AB4100A911A9 /* CCTextureAtlas.cpp in Sources */, 1A5702FB180BCE750088DEC7 /* CCTMXXMLParser.cpp in Sources */, - 500DC8B319105D41007B91BF /* CCGroupCommand.cpp in Sources */, 2905FA6B18CF08D100240AA3 /* UIPageView.cpp in Sources */, - 500DC95519106300007B91BF /* CCEventCustom.cpp in Sources */, 1A570301180BCE890088DEC7 /* CCParallaxNode.cpp in Sources */, - 1A570306180BCED90088DEC7 /* ccUtils.cpp in Sources */, 1A57030D180BCF190088DEC7 /* CCComponent.cpp in Sources */, 1A570311180BCF190088DEC7 /* CCComponentContainer.cpp in Sources */, - 296CAD231915EC8000C64FBF /* CCEventFocus.cpp in Sources */, - 1A57031A180BCF430088DEC7 /* ccCArray.cpp in Sources */, + 50ABBE2C1925AB6F00A911A9 /* ccCArray.cpp in Sources */, + 50ABC0061926664800A911A9 /* CCThread.mm in Sources */, B375107C1823ACA100B3BA6A /* CCPhysicsBodyInfo_chipmunk.cpp in Sources */, 50FCEBB418C72017004AD434 /* SliderReader.cpp in Sources */, - 1A570325180BCF660088DEC7 /* TGAlib.cpp in Sources */, - 1A570330180BCFD50088DEC7 /* CCUserDefault.cpp in Sources */, - 1A570334180BCFD50088DEC7 /* CCUserDefault.mm in Sources */, - 1A570336180BCFD50088DEC7 /* CCUserDefaultAndroid.cpp in Sources */, - 500DC95919106300007B91BF /* CCEventDispatcher.cpp in Sources */, + 50ABBEB61925AB6F00A911A9 /* CCUserDefaultAndroid.cpp in Sources */, 1A57034C180BD09B0088DEC7 /* tinyxml2.cpp in Sources */, + 50ABBDB61925AB4100A911A9 /* CCTexture2D.cpp in Sources */, 1A570355180BD0B00088DEC7 /* ioapi.cpp in Sources */, 1A570359180BD0B00088DEC7 /* unzip.cpp in Sources */, - 500DC96519106300007B91BF /* CCEventListenerAcceleration.cpp in Sources */, - 500DC94D19106300007B91BF /* CCEvent.cpp in Sources */, 1AD71DAA180E26E600808F54 /* CCBAnimationManager.cpp in Sources */, + 50ABBD881925AB4100A911A9 /* CCCustomCommand.cpp in Sources */, + 50ABBE941925AB6F00A911A9 /* CCProfiling.cpp in Sources */, 1AD71DAE180E26E600808F54 /* CCBFileLoader.cpp in Sources */, 1AD71DB2180E26E600808F54 /* CCBKeyframe.cpp in Sources */, 1AD71DB8180E26E600808F54 /* CCBReader.cpp in Sources */, - 500DC8C519105D41007B91BF /* CCRenderer.cpp in Sources */, 1AD71DBE180E26E600808F54 /* CCBSequence.cpp in Sources */, 1AD71DC2180E26E600808F54 /* CCBSequenceProperty.cpp in Sources */, 1AD71DCA180E26E600808F54 /* CCControlButtonLoader.cpp in Sources */, - 500DC9A719106300007B91BF /* s3tc.cpp in Sources */, 1AD71DCE180E26E600808F54 /* CCControlLoader.cpp in Sources */, 1AD71DD2180E26E600808F54 /* CCLabelBMFontLoader.cpp in Sources */, - B2AF2F9618EBAEAE00C5807C /* MathUtil.cpp in Sources */, - B2AF2F9A18EBAEAE00C5807C /* Matrix.cpp in Sources */, + 50ABBE5E1925AB6F00A911A9 /* CCEventListener.cpp in Sources */, 1AD71DD6180E26E600808F54 /* CCLabelTTFLoader.cpp in Sources */, 1AD71DDA180E26E600808F54 /* CCLayerColorLoader.cpp in Sources */, 50FCEBC018C72017004AD434 /* TextFieldReader.cpp in Sources */, 1AD71DDE180E26E600808F54 /* CCLayerGradientLoader.cpp in Sources */, 1AD71DE2180E26E600808F54 /* CCLayerLoader.cpp in Sources */, 1AD71DE6180E26E600808F54 /* CCMenuItemImageLoader.cpp in Sources */, + 50ABBEA81925AB6F00A911A9 /* CCTouch.cpp in Sources */, 1AD71DEA180E26E600808F54 /* CCMenuItemLoader.cpp in Sources */, 06CAAAC8186AD7EB0012A414 /* TriggerObj.cpp in Sources */, 1AD71DF0180E26E600808F54 /* CCNode+CCBRelativePositioning.cpp in Sources */, + 503DD8E91926736A00CD74DD /* CCES2Renderer.m in Sources */, 5027253D190BF1B900AAF4ED /* cocos2d.cpp in Sources */, - 5034CA50191D591100CE6051 /* ccGLStateCache.cpp in Sources */, + 50ABBE6A1925AB6F00A911A9 /* CCEventListenerFocus.cpp in Sources */, + 50ABBE661925AB6F00A911A9 /* CCEventListenerCustom.cpp in Sources */, 1AD71DF4180E26E600808F54 /* CCNodeLoader.cpp in Sources */, + 503DD8F81926B0DB00CD74DD /* CCIMEDispatcher.cpp in Sources */, 1AD71DF8180E26E600808F54 /* CCNodeLoaderLibrary.cpp in Sources */, 1AD71DFE180E26E600808F54 /* CCParticleSystemQuadLoader.cpp in Sources */, - 5034CA54191D591100CE6051 /* CCGLProgramStateCache.cpp in Sources */, 1AD71E02180E26E600808F54 /* CCScale9SpriteLoader.cpp in Sources */, 1AD71E06180E26E600808F54 /* CCScrollViewLoader.cpp in Sources */, 1AD71E0A180E26E600808F54 /* CCSpriteLoader.cpp in Sources */, 1AD71E96180E26E600808F54 /* Animation.cpp in Sources */, 1AD71E9A180E26E600808F54 /* AnimationState.cpp in Sources */, 1AD71E9E180E26E600808F54 /* AnimationStateData.cpp in Sources */, + 50ABBDB21925AB4100A911A9 /* ccShaders.cpp in Sources */, 1AD71EA2180E26E600808F54 /* Atlas.cpp in Sources */, 1AD71EA6180E26E600808F54 /* AtlasAttachmentLoader.cpp in Sources */, 1AD71EAA180E26E600808F54 /* Attachment.cpp in Sources */, 1AD71EAE180E26E600808F54 /* AttachmentLoader.cpp in Sources */, 1AD71EB2180E26E600808F54 /* Bone.cpp in Sources */, + 50ABBD451925AB0000A911A9 /* CCVertex.cpp in Sources */, 2905FA8118CF08D100240AA3 /* UITextAtlas.cpp in Sources */, + 50ABBEB01925AB6F00A911A9 /* CCUserDefault.cpp in Sources */, 50FCEBB818C72017004AD434 /* TextAtlasReader.cpp in Sources */, 1AD71EB6180E26E600808F54 /* BoneData.cpp in Sources */, - 500DC8D619105F7D007B91BF /* CCGeometry.cpp in Sources */, 50FCEB9C18C72017004AD434 /* ImageViewReader.cpp in Sources */, + 50ABBE521925AB6F00A911A9 /* CCEventDispatcher.cpp in Sources */, 1AD71EBA180E26E600808F54 /* CCSkeleton.cpp in Sources */, 1A01C68B18F57BE800EFE3A6 /* CCDeprecated.cpp in Sources */, 1AD71EBE180E26E600808F54 /* CCSkeletonAnimation.cpp in Sources */, - 500DC94119106300007B91BF /* CCData.cpp in Sources */, 50FCEBBC18C72017004AD434 /* TextBMFontReader.cpp in Sources */, - 500DC8BB19105D41007B91BF /* CCQuadCommand.cpp in Sources */, + 50ABBD391925AB0000A911A9 /* CCAffineTransform.cpp in Sources */, + 50ABBD841925AB4100A911A9 /* CCBatchCommand.cpp in Sources */, 1AD71EC2180E26E600808F54 /* extension.cpp in Sources */, 1AD71EC6180E26E600808F54 /* Json.cpp in Sources */, 1AD71ECA180E26E600808F54 /* RegionAttachment.cpp in Sources */, 1AD71ECE180E26E600808F54 /* Skeleton.cpp in Sources */, 1AD71ED2180E26E600808F54 /* SkeletonData.cpp in Sources */, - 500DC97D19106300007B91BF /* CCEventTouch.cpp in Sources */, 1AD71ED6180E26E600808F54 /* SkeletonJson.cpp in Sources */, + 50ABBDA81925AB4100A911A9 /* CCRenderCommand.cpp in Sources */, 2905FA6718CF08D100240AA3 /* UILoadingBar.cpp in Sources */, 2905FA5F18CF08D100240AA3 /* UILayoutParameter.cpp in Sources */, 1AD71EDA180E26E600808F54 /* Skin.cpp in Sources */, + 50ABBEA41925AB6F00A911A9 /* CCScriptSupport.cpp in Sources */, 1AD71EDE180E26E600808F54 /* Slot.cpp in Sources */, 1AD71EE2180E26E600808F54 /* SlotData.cpp in Sources */, + 503DD8E71926736A00CD74DD /* CCEAGLView.mm in Sources */, 1AD71EE6180E26E600808F54 /* spine-cocos2dx.cpp in Sources */, 2905FA8518CF08D100240AA3 /* UITextBMFont.cpp in Sources */, 1AAF536B180E3374000584C8 /* HttpClient.cpp in Sources */, - 3E26D40618ACB5D100834404 /* CCImage.cpp in Sources */, 1AAF5373180E3374000584C8 /* SocketIO.cpp in Sources */, - 500DC94519106300007B91BF /* CCDataVisitor.cpp in Sources */, - B2AF2FAA18EBAEAE00C5807C /* Vector4.cpp in Sources */, 1AAF5377180E3374000584C8 /* WebSocket.cpp in Sources */, - 500DC93D19106300007B91BF /* CCConsole.cpp in Sources */, + 50ABBDA41925AB4100A911A9 /* CCQuadCommand.cpp in Sources */, 1AAF5850180E40B9000584C8 /* LocalStorage.cpp in Sources */, - 5034CA58191D591100CE6051 /* CCGLProgramState.cpp in Sources */, 1AAF5854180E40B9000584C8 /* LocalStorageAndroid.cpp in Sources */, - 1A9DCA24180E6955007A3AD4 /* ccFPSImages.c in Sources */, 1A9DCA28180E6955007A3AD4 /* CCGLBufferedNode.cpp in Sources */, + 50ABBE201925AB6F00A911A9 /* atitc.cpp in Sources */, 50FCEBA018C72017004AD434 /* LayoutReader.cpp in Sources */, 50E6D33518E174130051CA34 /* UIHBox.cpp in Sources */, - 5034CA1C191D591100CE6051 /* ccShaders.cpp in Sources */, - 500DC98F19106300007B91BF /* CCRef.cpp in Sources */, 50FCEBB018C72017004AD434 /* ScrollViewReader.cpp in Sources */, + 50ABBE9A1925AB6F00A911A9 /* CCRef.cpp in Sources */, + 50ABBE361925AB6F00A911A9 /* CCConsole.cpp in Sources */, + 503DD8E51926736A00CD74DD /* CCDirectorCaller.mm in Sources */, + 50ABBD5D1925AB0000A911A9 /* Vec3.cpp in Sources */, + 50ABC0121926664800A911A9 /* CCGLViewProtocol.cpp in Sources */, + 50ABC0021926664800A911A9 /* CCLock.cpp in Sources */, 50FCEBAC18C72017004AD434 /* PageViewReader.cpp in Sources */, 1A8C598C180E930E00EF57C3 /* CCActionFrame.cpp in Sources */, 1A8C5990180E930E00EF57C3 /* CCActionFrameEasing.cpp in Sources */, 50FCEBA418C72017004AD434 /* ListViewReader.cpp in Sources */, 1A8C5994180E930E00EF57C3 /* CCActionManagerEx.cpp in Sources */, + 50ABBEBC1925AB6F00A911A9 /* ccUtils.cpp in Sources */, + 50ABBE721925AB6F00A911A9 /* CCEventListenerMouse.cpp in Sources */, 1A8C5998180E930E00EF57C3 /* CCActionNode.cpp in Sources */, 1A8C599C180E930E00EF57C3 /* CCActionObject.cpp in Sources */, 2905FA6318CF08D100240AA3 /* UIListView.cpp in Sources */, 1A8C59A0180E930E00EF57C3 /* CCArmature.cpp in Sources */, + 50ABC0001926664800A911A9 /* CCFileUtilsApple.mm in Sources */, 2905FA7918CF08D100240AA3 /* UISlider.cpp in Sources */, 1A8C59A4180E930E00EF57C3 /* CCArmatureAnimation.cpp in Sources */, 1A8C59A8180E930E00EF57C3 /* CCArmatureDataManager.cpp in Sources */, 2905FA8918CF08D100240AA3 /* UITextField.cpp in Sources */, 1A8C59AC180E930E00EF57C3 /* CCArmatureDefine.cpp in Sources */, - 500DC98719106300007B91BF /* CCNS.cpp in Sources */, + 50ABBEB81925AB6F00A911A9 /* ccUTF8.cpp in Sources */, 1A8C59B0180E930E00EF57C3 /* CCBatchNode.cpp in Sources */, + 50ABBE841925AB6F00A911A9 /* ccFPSImages.c in Sources */, 1A8C59B4180E930E00EF57C3 /* CCBone.cpp in Sources */, 1A8C59B8180E930E00EF57C3 /* CCColliderDetector.cpp in Sources */, 1A8C59BC180E930E00EF57C3 /* CCComAttribute.cpp in Sources */, - 500DC8BF19105D41007B91BF /* CCRenderCommand.cpp in Sources */, + 50ABBE4A1925AB6F00A911A9 /* CCEventAcceleration.cpp in Sources */, 1A8C59C0180E930E00EF57C3 /* CCComAudio.cpp in Sources */, - B2AF2F9E18EBAEAE00C5807C /* Quaternion.cpp in Sources */, 1A8C59C4180E930E00EF57C3 /* CCComController.cpp in Sources */, 1A8C59C8180E930E00EF57C3 /* CCComRender.cpp in Sources */, 1A8C59CC180E930E00EF57C3 /* CCDataReaderHelper.cpp in Sources */, 1A8C59D0180E930E00EF57C3 /* CCDatas.cpp in Sources */, 1A8C59D4180E930E00EF57C3 /* CCDecorativeDisplay.cpp in Sources */, - 500DC96D19106300007B91BF /* CCEventListenerKeyboard.cpp in Sources */, 1A8C59D8180E930E00EF57C3 /* CCDisplayFactory.cpp in Sources */, 46C02E0818E91123004B7456 /* xxhash.c in Sources */, - 500DC95D19106300007B91BF /* CCEventKeyboard.cpp in Sources */, + 50ABBED01925AB6F00A911A9 /* TGAlib.cpp in Sources */, 2905FA4118CF08D100240AA3 /* CocosGUI.cpp in Sources */, - 5034CA20191D591100CE6051 /* CCGLProgramCache.cpp in Sources */, 1A01C68518F57BE800EFE3A6 /* CCArray.cpp in Sources */, 1A8C59DC180E930E00EF57C3 /* CCDisplayManager.cpp in Sources */, 1A8C59E0180E930E00EF57C3 /* CCInputDelegate.cpp in Sources */, 1A8C59E4180E930E00EF57C3 /* CCProcessBase.cpp in Sources */, + 503DD8E31926736A00CD74DD /* CCDevice.mm in Sources */, 1A8C59E8180E930E00EF57C3 /* CCSGUIReader.cpp in Sources */, 1A8C59EC180E930E00EF57C3 /* CCSkin.cpp in Sources */, 2905FA4718CF08D100240AA3 /* UIButton.cpp in Sources */, 1A8C59F0180E930E00EF57C3 /* CCSpriteFrameCacheHelper.cpp in Sources */, + 50ABBEB41925AB6F00A911A9 /* CCUserDefault.mm in Sources */, 1A1645B1191B726C008C7C7F /* ConvertUTF.c in Sources */, - B2AF2FA218EBAEAE00C5807C /* Vector2.cpp in Sources */, - 500DC8D219105F7D007B91BF /* CCAffineTransform.cpp in Sources */, 1A8C59F4180E930E00EF57C3 /* CCSSceneReader.cpp in Sources */, 1A8C59F8180E930E00EF57C3 /* CCTransformHelp.cpp in Sources */, + 50ABBE3A1925AB6F00A911A9 /* CCData.cpp in Sources */, 1A8C59FC180E930E00EF57C3 /* CCTween.cpp in Sources */, 2905FA5318CF08D100240AA3 /* UIImageView.cpp in Sources */, 1A1645B3191B726C008C7C7F /* ConvertUTFWrapper.cpp in Sources */, @@ -6830,6 +6699,8 @@ 2905FA7518CF08D100240AA3 /* UIScrollView.cpp in Sources */, 1A8C5A0E180E930E00EF57C3 /* DictionaryHelper.cpp in Sources */, 1ABA68AF1888D700007D1BB4 /* CCFontCharMap.cpp in Sources */, + 50ABBE7A1925AB6F00A911A9 /* CCEventMouse.cpp in Sources */, + 50ABBD981925AB4100A911A9 /* CCGLProgramStateCache.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -7109,7 +6980,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "../cocos/2d/cocos2dx-Prefix.pch"; + GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, @@ -7126,7 +6997,7 @@ "\"$(SRCROOT)/../external/freetype2/prebuilt/mac\"", "\"$(SRCROOT)/../external/websockets/prebuilt/mac\"", ); - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/png/include/mac $(SRCROOT)/../external/tiff/include/mac $(SRCROOT)/../external/webp/include/mac $(SRCROOT)/../external/jpeg/include/mac $(SRCROOT)/../external/freetype2/include/mac $(SRCROOT)/../external/websockets/include/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../cocos/2d/platform/desktop"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/png/include/mac $(SRCROOT)/../external/tiff/include/mac $(SRCROOT)/../external/webp/include/mac $(SRCROOT)/../external/jpeg/include/mac $(SRCROOT)/../external/freetype2/include/mac $(SRCROOT)/../external/websockets/include/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop"; }; name = Debug; }; @@ -7135,7 +7006,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "../cocos/2d/cocos2dx-Prefix.pch"; + GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_KEYBOARD_SUPPORT, @@ -7152,7 +7023,7 @@ "\"$(SRCROOT)/../external/freetype2/prebuilt/mac\"", "\"$(SRCROOT)/../external/websockets/prebuilt/mac\"", ); - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/png/include/mac $(SRCROOT)/../external/tiff/include/mac $(SRCROOT)/../external/webp/include/mac $(SRCROOT)/../external/jpeg/include/mac $(SRCROOT)/../external/freetype2/include/mac $(SRCROOT)/../external/websockets/include/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../cocos/2d/platform/desktop"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/png/include/mac $(SRCROOT)/../external/tiff/include/mac $(SRCROOT)/../external/webp/include/mac $(SRCROOT)/../external/jpeg/include/mac $(SRCROOT)/../external/freetype2/include/mac $(SRCROOT)/../external/websockets/include/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop"; }; name = Release; }; @@ -7215,7 +7086,6 @@ "$(inherited)", "/Applications/Xcode\\ 2.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include", ); - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/physics $(SRCROOT)/../cocos/math/kazmath/ $(SRCROOT)/../cocos/2d/platform $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../cocos/ui $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../external/Box2D $(SRCROOT)/../external $(SRCROOT)/../cocos/storage"; }; name = Debug; }; @@ -7226,7 +7096,6 @@ "$(inherited)", "/Applications/Xcode\\ 2.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include", ); - USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/.. $(SRCROOT)/../cocos $(SRCROOT)/../cocos/base $(SRCROOT)/../cocos/2d $(SRCROOT)/../cocos/physics $(SRCROOT)/../cocos/math/kazmath/ $(SRCROOT)/../cocos/2d/platform $(SRCROOT)/../cocos/audio/include $(SRCROOT)/../cocos/editor-support $(SRCROOT)/../cocos/ui $(SRCROOT)/../external/chipmunk/include/chipmunk $(SRCROOT)/../external/Box2D $(SRCROOT)/../external $(SRCROOT)/../cocos/storage"; }; name = Release; }; @@ -7236,7 +7105,7 @@ ALWAYS_SEARCH_USER_PATHS = YES; GCC_PREPROCESSOR_DEFINITIONS = CC_TARGET_OS_MAC; HEADER_SEARCH_PATHS = ""; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac"; }; name = Debug; }; @@ -7246,7 +7115,7 @@ ALWAYS_SEARCH_USER_PATHS = YES; GCC_PREPROCESSOR_DEFINITIONS = CC_TARGET_OS_MAC; HEADER_SEARCH_PATHS = ""; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac"; }; name = Release; }; @@ -7261,7 +7130,7 @@ ); HEADER_SEARCH_PATHS = ""; LIBRARY_SEARCH_PATHS = "$(inherited)"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../cocos/2d/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; }; name = Debug; }; @@ -7276,7 +7145,7 @@ ); HEADER_SEARCH_PATHS = ""; LIBRARY_SEARCH_PATHS = "$(inherited)"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../cocos/2d/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../cocos/platform/desktop $(SRCROOT)/../external/glfw3/include/mac"; }; name = Release; }; @@ -7286,7 +7155,7 @@ ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "../cocos/2d/cocos2dx-Prefix.pch"; + GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_IPHONE, @@ -7314,7 +7183,7 @@ ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios"; }; name = Debug; }; @@ -7324,7 +7193,7 @@ ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "../cocos/2d/cocos2dx-Prefix.pch"; + GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_IPHONE, @@ -7352,7 +7221,7 @@ ); SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios"; }; name = Release; }; @@ -7390,7 +7259,7 @@ LIBRARY_SEARCH_PATHS = "$(inherited)"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios"; }; name = Debug; }; @@ -7408,7 +7277,7 @@ LIBRARY_SEARCH_PATHS = "$(inherited)"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external/curl/include/ios"; }; name = Release; }; @@ -7485,7 +7354,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios"; }; name = Debug; }; @@ -7502,7 +7371,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios"; }; name = Release; }; diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj b/build/cocos2d_tests.xcodeproj/project.pbxproj index c13c8fd7bd..11c134ac8a 100644 --- a/build/cocos2d_tests.xcodeproj/project.pbxproj +++ b/build/cocos2d_tests.xcodeproj/project.pbxproj @@ -5228,7 +5228,7 @@ CC_TARGET_OS_MAC, ); INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-empty-test/proj.mac/Info.plist"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; }; name = Debug; }; @@ -5242,7 +5242,7 @@ CC_TARGET_OS_MAC, ); INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-empty-test/proj.mac/Info.plist"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -5262,7 +5262,7 @@ "-image_base", 100000000, ); - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; }; name = Debug; }; @@ -5281,7 +5281,7 @@ "-image_base", 100000000, ); - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -5298,7 +5298,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../cocos/2d/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; }; name = Debug; }; @@ -5314,7 +5314,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../cocos/2d/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -5331,7 +5331,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; }; name = Debug; }; @@ -5347,7 +5347,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -5367,7 +5367,7 @@ "-image_base", 100000000, ); - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; }; name = Debug; }; @@ -5386,7 +5386,7 @@ "-image_base", 100000000, ); - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -5405,7 +5405,7 @@ PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; }; name = Debug; }; @@ -5423,7 +5423,7 @@ PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -5437,7 +5437,7 @@ CC_TARGET_OS_MAC, ); INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-tests/proj.mac/Info.plist"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; }; name = Debug; }; @@ -5450,7 +5450,7 @@ CC_TARGET_OS_MAC, ); INFOPLIST_FILE = "$(SRCROOT)/../tests/cpp-tests/proj.mac/Info.plist"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/mac $(SRCROOT)/../external/glfw3/include/mac"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -5497,7 +5497,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../cocos/2d/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; }; name = Debug; }; @@ -5513,7 +5513,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/2d/platform/ios $(SRCROOT)/../cocos/2d/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../cocos/platform/ios/Simulation $(SRCROOT)/../external/curl/include/ios"; VALIDATE_PRODUCT = YES; }; name = Release; diff --git a/cocos/2d/CCActionGrid.cpp b/cocos/2d/CCActionGrid.cpp index 437cbd6178..6f3aec7b8b 100644 --- a/cocos/2d/CCActionGrid.cpp +++ b/cocos/2d/CCActionGrid.cpp @@ -23,10 +23,12 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ + #include "2d/CCActionGrid.h" -#include "base/CCDirector.h" + #include "2d/CCGrid.h" #include "2d/CCNodeGrid.h" +#include "base/CCDirector.h" NS_CC_BEGIN // implementation of GridAction diff --git a/cocos/2d/CCActionInstant.cpp b/cocos/2d/CCActionInstant.cpp index 6a2a5e4a0b..1b5372520a 100644 --- a/cocos/2d/CCActionInstant.cpp +++ b/cocos/2d/CCActionInstant.cpp @@ -28,7 +28,7 @@ #include "2d/CCActionInstant.h" #include "2d/CCNode.h" #include "2d/CCSprite.h" -#include "2d/CCScriptSupport.h" +#include "base/CCScriptSupport.h" #if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" diff --git a/cocos/2d/CCActionInterval.h b/cocos/2d/CCActionInterval.h index 564c24c4d5..d1b3a9dd46 100644 --- a/cocos/2d/CCActionInterval.h +++ b/cocos/2d/CCActionInterval.h @@ -28,13 +28,14 @@ THE SOFTWARE. #ifndef __ACTION_CCINTERVAL_ACTION_H__ #define __ACTION_CCINTERVAL_ACTION_H__ +#include + #include "2d/CCNode.h" #include "2d/CCAction.h" -#include "2d/CCProtocols.h" #include "2d/CCSpriteFrame.h" #include "2d/CCAnimation.h" +#include "base/CCProtocols.h" #include "base/CCVector.h" -#include NS_CC_BEGIN diff --git a/cocos/2d/CCActionManager.cpp b/cocos/2d/CCActionManager.cpp index 98be24d3ee..0fb432a912 100644 --- a/cocos/2d/CCActionManager.cpp +++ b/cocos/2d/CCActionManager.cpp @@ -30,8 +30,8 @@ THE SOFTWARE. #include "2d/CCNode.h" #include "base/CCScheduler.h" #include "base/ccMacros.h" -#include "2d/ccCArray.h" -#include "2d/uthash.h" +#include "base/ccCArray.h" +#include "base/uthash.h" NS_CC_BEGIN // diff --git a/cocos/2d/CCAnimation.cpp b/cocos/2d/CCAnimation.cpp index d95b0816f6..335288b675 100644 --- a/cocos/2d/CCAnimation.cpp +++ b/cocos/2d/CCAnimation.cpp @@ -25,10 +25,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "2d/CCAnimation.h" -#include "2d/CCTextureCache.h" -#include "2d/CCTexture2D.h" -#include "base/ccMacros.h" #include "2d/CCSpriteFrame.h" +#include "renderer/CCTextureCache.h" +#include "renderer/CCTexture2D.h" +#include "base/ccMacros.h" #include "base/CCDirector.h" NS_CC_BEGIN diff --git a/cocos/2d/CCAnimationCache.cpp b/cocos/2d/CCAnimationCache.cpp index e1e922d8ae..fcbe96d501 100644 --- a/cocos/2d/CCAnimationCache.cpp +++ b/cocos/2d/CCAnimationCache.cpp @@ -29,7 +29,7 @@ THE SOFTWARE. #include "2d/CCAnimation.h" #include "2d/CCSpriteFrame.h" #include "2d/CCSpriteFrameCache.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "deprecated/CCString.h" using namespace std; diff --git a/cocos/2d/CCAtlasNode.cpp b/cocos/2d/CCAtlasNode.cpp index 8c1ac25ebf..cc750ff187 100644 --- a/cocos/2d/CCAtlasNode.cpp +++ b/cocos/2d/CCAtlasNode.cpp @@ -26,10 +26,10 @@ THE SOFTWARE. ****************************************************************************/ #include "CCAtlasNode.h" -#include "2d/CCTextureAtlas.h" -#include "2d/CCTextureCache.h" +#include "renderer/CCTextureAtlas.h" #include "base/CCDirector.h" #include "base/CCDirector.h" +#include "renderer/CCTextureCache.h" #include "renderer/CCRenderer.h" #include "renderer/CCGLProgram.h" #include "renderer/CCGLProgramState.h" diff --git a/cocos/2d/CCAtlasNode.h b/cocos/2d/CCAtlasNode.h index cdcda77bc6..9fa995488d 100644 --- a/cocos/2d/CCAtlasNode.h +++ b/cocos/2d/CCAtlasNode.h @@ -29,7 +29,7 @@ THE SOFTWARE. #define __CCATLAS_NODE_H__ #include "2d/CCNode.h" -#include "2d/CCProtocols.h" +#include "base/CCProtocols.h" #include "base/ccTypes.h" #include "renderer/CCQuadCommand.h" diff --git a/cocos/2d/CCComponent.cpp b/cocos/2d/CCComponent.cpp index 1c71ce4a70..22ae3e915c 100644 --- a/cocos/2d/CCComponent.cpp +++ b/cocos/2d/CCComponent.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include "2d/CCComponent.h" -#include "2d/CCScriptSupport.h" +#include "base/CCScriptSupport.h" NS_CC_BEGIN diff --git a/cocos/2d/CCComponent.h b/cocos/2d/CCComponent.h index fac789b3b0..c52db45b3c 100644 --- a/cocos/2d/CCComponent.h +++ b/cocos/2d/CCComponent.h @@ -26,7 +26,7 @@ THE SOFTWARE. #define __CC_FRAMEWORK_COMPONENT_H__ #include "base/CCRef.h" -#include "2d/CCScriptSupport.h" +#include "base/CCScriptSupport.h" #include NS_CC_BEGIN diff --git a/cocos/2d/CCFont.cpp b/cocos/2d/CCFont.cpp index 8e18fc4a66..1561df741f 100644 --- a/cocos/2d/CCFont.cpp +++ b/cocos/2d/CCFont.cpp @@ -23,8 +23,8 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCFont.h" -#include "ccUTF8.h" +#include "2d/CCFont.h" +#include "base/ccUTF8.h" NS_CC_BEGIN diff --git a/cocos/2d/CCFontAtlas.cpp b/cocos/2d/CCFontAtlas.cpp index fd3425c4fa..18153676af 100644 --- a/cocos/2d/CCFontAtlas.cpp +++ b/cocos/2d/CCFontAtlas.cpp @@ -25,7 +25,7 @@ #include "2d/CCFontAtlas.h" #include "2d/CCFontFreeType.h" -#include "ccUTF8.h" +#include "base/ccUTF8.h" #include "base/CCDirector.h" #include "base/CCEventListenerCustom.h" #include "base/CCEventDispatcher.h" diff --git a/cocos/2d/CCFontCharMap.cpp b/cocos/2d/CCFontCharMap.cpp index 75e802e31e..4438f7a165 100644 --- a/cocos/2d/CCFontCharMap.cpp +++ b/cocos/2d/CCFontCharMap.cpp @@ -25,10 +25,10 @@ #include "CCFontCharMap.h" #include "2d/CCFontAtlas.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" +#include "base/ccUTF8.h" #include "base/CCDirector.h" -#include "2d/CCTextureCache.h" -#include "ccUTF8.h" +#include "renderer/CCTextureCache.h" NS_CC_BEGIN diff --git a/cocos/2d/CCFontFNT.cpp b/cocos/2d/CCFontFNT.cpp index 6e7a9f7364..adae2b9ac3 100644 --- a/cocos/2d/CCFontFNT.cpp +++ b/cocos/2d/CCFontFNT.cpp @@ -24,15 +24,16 @@ ****************************************************************************/ #include "2d/CCFontFNT.h" -#include "2d/uthash.h" +#include "base/uthash.h" +#include "2d/CCFontAtlas.h" +#include "base/ccUTF8.h" +#include "platform/CCFileUtils.h" #include "base/CCConfiguration.h" #include "base/CCDirector.h" -#include "2d/CCFontAtlas.h" #include "base/CCMap.h" +#include "renderer/CCTextureCache.h" + #include "deprecated/CCString.h" -#include "2d/CCTextureCache.h" -#include "ccUTF8.h" -#include "2d/platform/CCFileUtils.h" using namespace std; NS_CC_BEGIN diff --git a/cocos/2d/CCFontFreeType.cpp b/cocos/2d/CCFontFreeType.cpp index 588bb4b4ac..c99269bcdd 100644 --- a/cocos/2d/CCFontFreeType.cpp +++ b/cocos/2d/CCFontFreeType.cpp @@ -23,12 +23,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ +#include "2d/CCFontFreeType.h" + #include #include -#include "ccUTF8.h" -#include "2d/CCFontFreeType.h" -#include "2d/platform/CCFileUtils.h" +#include "base/ccUTF8.h" +#include "platform/CCFileUtils.h" #include "edtaa3func.h" #include FT_BBOX_H @@ -563,4 +564,4 @@ void FontFreeType::renderCharAt(unsigned char *dest,int posX, int posY, unsigned } } -NS_CC_END \ No newline at end of file +NS_CC_END diff --git a/cocos/2d/CCGrabber.cpp b/cocos/2d/CCGrabber.cpp index f6a633c411..6a4f68acd9 100644 --- a/cocos/2d/CCGrabber.cpp +++ b/cocos/2d/CCGrabber.cpp @@ -25,7 +25,7 @@ THE SOFTWARE. ****************************************************************************/ #include "CCGrabber.h" #include "base/ccMacros.h" -#include "2d/CCTexture2D.h" +#include "renderer/CCTexture2D.h" NS_CC_BEGIN diff --git a/cocos/2d/CCGrid.cpp b/cocos/2d/CCGrid.cpp index dc7b879de9..1e43ad7d5b 100644 --- a/cocos/2d/CCGrid.cpp +++ b/cocos/2d/CCGrid.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #include "base/ccMacros.h" #include "base/CCDirector.h" #include "2d/CCGrabber.h" -#include "2d/ccUtils.h" +#include "base/ccUtils.h" #include "2d/CCGrid.h" #include "renderer/CCGLProgram.h" #include "renderer/CCGLProgramCache.h" diff --git a/cocos/2d/CCGrid.h b/cocos/2d/CCGrid.h index 9d59f24ce7..4e0c96f68d 100644 --- a/cocos/2d/CCGrid.h +++ b/cocos/2d/CCGrid.h @@ -30,7 +30,7 @@ THE SOFTWARE. #include "base/ccTypes.h" #include "base/CCDirector.h" #include "2d/CCNode.h" -#include "2d/CCTexture2D.h" +#include "renderer/CCTexture2D.h" #ifdef EMSCRIPTEN #include "CCGLBufferedNode.h" #endif // EMSCRIPTEN diff --git a/cocos/2d/CCLabel.cpp b/cocos/2d/CCLabel.cpp index 64439726b2..9372b247fd 100644 --- a/cocos/2d/CCLabel.cpp +++ b/cocos/2d/CCLabel.cpp @@ -27,9 +27,9 @@ #include "2d/CCFontAtlasCache.h" #include "2d/CCSprite.h" #include "2d/CCLabelTextFormatter.h" -#include "2d/ccUTF8.h" +#include "base/ccUTF8.h" #include "2d/CCSpriteFrame.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "2d/CCFont.h" #include "renderer/CCGLProgramState.h" #include "renderer/CCRenderer.h" diff --git a/cocos/2d/CCLabelAtlas.cpp b/cocos/2d/CCLabelAtlas.cpp index ee8b209331..f051917c84 100644 --- a/cocos/2d/CCLabelAtlas.cpp +++ b/cocos/2d/CCLabelAtlas.cpp @@ -25,17 +25,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "CCLabelAtlas.h" -#include "2d/CCTextureAtlas.h" -#include "2d/CCTextureCache.h" +#include "renderer/CCTextureAtlas.h" #include "2d/CCDrawingPrimitives.h" +#include "platform/CCFileUtils.h" #include "base/ccConfig.h" +#include "base/CCDirector.h" +#include "renderer/CCTextureCache.h" #include "renderer/CCGLProgramCache.h" #include "renderer/CCGLProgram.h" #include "renderer/ccGLStateCache.h" -#include "base/CCDirector.h" #include "math/TransformUtils.h" -#include "2d/platform/CCFileUtils.h" -// external + #include "deprecated/CCString.h" #if CC_LABELATLAS_DEBUG_DRAW diff --git a/cocos/2d/CCLabelTextFormatter.cpp b/cocos/2d/CCLabelTextFormatter.cpp index a64ba30140..580e9ff5c8 100644 --- a/cocos/2d/CCLabelTextFormatter.cpp +++ b/cocos/2d/CCLabelTextFormatter.cpp @@ -23,10 +23,11 @@ THE SOFTWARE. ****************************************************************************/ +#include "2d/CCLabelTextFormatter.h" + #include -#include "ccUTF8.h" -#include "CCLabelTextFormatter.h" +#include "base/ccUTF8.h" #include "base/CCDirector.h" #include "2d/CCLabel.h" diff --git a/cocos/2d/CCLabelTextFormatter.h b/cocos/2d/CCLabelTextFormatter.h index 2b15b456a6..664310a8b3 100644 --- a/cocos/2d/CCLabelTextFormatter.h +++ b/cocos/2d/CCLabelTextFormatter.h @@ -26,6 +26,8 @@ #ifndef _CCLabelTextFormatter_h_ #define _CCLabelTextFormatter_h_ +#include "base/CCPlatformMacros.h" + NS_CC_BEGIN class Label; diff --git a/cocos/2d/CCLayer.cpp b/cocos/2d/CCLayer.cpp index de60f31a02..6777dd4c05 100644 --- a/cocos/2d/CCLayer.cpp +++ b/cocos/2d/CCLayer.cpp @@ -27,8 +27,8 @@ THE SOFTWARE. #include #include "2d/CCLayer.h" -#include "2d/CCScriptSupport.h" -#include "2d/platform/CCDevice.h" +#include "base/CCScriptSupport.h" +#include "platform/CCDevice.h" #include "2d/CCScene.h" #include "renderer/CCGLProgramState.h" #include "renderer/CCGLProgram.h" diff --git a/cocos/2d/CCLayer.h b/cocos/2d/CCLayer.h index 363d2aab8e..4f8bdb3046 100644 --- a/cocos/2d/CCLayer.h +++ b/cocos/2d/CCLayer.h @@ -29,7 +29,7 @@ THE SOFTWARE. #define __CCLAYER_H__ #include "2d/CCNode.h" -#include "2d/CCProtocols.h" +#include "base/CCProtocols.h" #include "base/CCEventTouch.h" #ifdef EMSCRIPTEN #include "CCGLBufferedNode.h" diff --git a/cocos/2d/CCMenuItem.cpp b/cocos/2d/CCMenuItem.cpp index 79891fbb9a..ceda096b82 100644 --- a/cocos/2d/CCMenuItem.cpp +++ b/cocos/2d/CCMenuItem.cpp @@ -30,7 +30,7 @@ THE SOFTWARE. #include "2d/CCSprite.h" #include "CCLabelAtlas.h" #include "2d/CCLabel.h" -#include "2d/CCScriptSupport.h" +#include "base/CCScriptSupport.h" #include "deprecated/CCString.h" #include #include diff --git a/cocos/2d/CCMenuItem.h b/cocos/2d/CCMenuItem.h index 6af521c09f..2152046acc 100644 --- a/cocos/2d/CCMenuItem.h +++ b/cocos/2d/CCMenuItem.h @@ -33,7 +33,7 @@ THE SOFTWARE. // cocos2d includes #include "2d/CCNode.h" -#include "2d/CCProtocols.h" +#include "base/CCProtocols.h" NS_CC_BEGIN diff --git a/cocos/2d/CCMotionStreak.cpp b/cocos/2d/CCMotionStreak.cpp index 09fa33dc68..585ef38cdc 100644 --- a/cocos/2d/CCMotionStreak.cpp +++ b/cocos/2d/CCMotionStreak.cpp @@ -23,16 +23,17 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ + #include "2d/CCMotionStreak.h" -#include "2d/CCTextureCache.h" -#include "2d/CCVertex.h" +#include "math/CCVertex.h" +#include "base/ccMacros.h" +#include "base/CCDirector.h" +#include "renderer/CCTextureCache.h" #include "renderer/ccGLStateCache.h" #include "renderer/CCGLProgram.h" #include "renderer/CCGLProgramState.h" #include "renderer/CCCustomCommand.h" #include "renderer/CCRenderer.h" -#include "base/ccMacros.h" -#include "base/CCDirector.h" NS_CC_BEGIN diff --git a/cocos/2d/CCMotionStreak.h b/cocos/2d/CCMotionStreak.h index 20cfcf87ef..d4c5a1c47c 100644 --- a/cocos/2d/CCMotionStreak.h +++ b/cocos/2d/CCMotionStreak.h @@ -26,8 +26,8 @@ THE SOFTWARE. #ifndef __CCMOTION_STREAK_H__ #define __CCMOTION_STREAK_H__ -#include "2d/CCProtocols.h" -#include "2d/CCTexture2D.h" +#include "base/CCProtocols.h" +#include "renderer/CCTexture2D.h" #include "base/ccTypes.h" #include "2d/CCNode.h" #include "renderer/CCCustomCommand.h" diff --git a/cocos/2d/CCNode.cpp b/cocos/2d/CCNode.cpp index 461550ab50..d7451357ac 100644 --- a/cocos/2d/CCNode.cpp +++ b/cocos/2d/CCNode.cpp @@ -36,10 +36,10 @@ THE SOFTWARE. #include "base/CCEventDispatcher.h" #include "base/CCEvent.h" #include "base/CCEventTouch.h" -#include "2d/ccCArray.h" +#include "base/ccCArray.h" #include "2d/CCGrid.h" #include "2d/CCActionManager.h" -#include "2d/CCScriptSupport.h" +#include "base/CCScriptSupport.h" #include "2d/CCScene.h" #include "2d/CCComponent.h" #include "2d/CCComponentContainer.h" diff --git a/cocos/2d/CCNode.h b/cocos/2d/CCNode.h index f8a52ca287..e08fa3d779 100644 --- a/cocos/2d/CCNode.h +++ b/cocos/2d/CCNode.h @@ -32,11 +32,11 @@ #include "base/ccMacros.h" #include "base/CCEventDispatcher.h" #include "base/CCVector.h" +#include "base/CCScriptSupport.h" +#include "base/CCProtocols.h" #include "math/CCAffineTransform.h" #include "math/CCMath.h" #include "renderer/ccGLStateCache.h" -#include "2d/CCScriptSupport.h" -#include "2d/CCProtocols.h" #include "CCGL.h" NS_CC_BEGIN diff --git a/cocos/2d/CCParallaxNode.cpp b/cocos/2d/CCParallaxNode.cpp index 86f89e867f..89c1480d0d 100644 --- a/cocos/2d/CCParallaxNode.cpp +++ b/cocos/2d/CCParallaxNode.cpp @@ -25,7 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "CCParallaxNode.h" -#include "2d/ccCArray.h" +#include "base/ccCArray.h" NS_CC_BEGIN diff --git a/cocos/2d/CCParticleBatchNode.cpp b/cocos/2d/CCParticleBatchNode.cpp index 9b2177fe28..6b19d4457e 100644 --- a/cocos/2d/CCParticleBatchNode.cpp +++ b/cocos/2d/CCParticleBatchNode.cpp @@ -30,16 +30,16 @@ #include "2d/CCParticleBatchNode.h" -#include "2d/CCTextureCache.h" -#include "2d/CCTextureAtlas.h" +#include "renderer/CCTextureAtlas.h" #include "2d/CCGrid.h" #include "2d/CCParticleSystem.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "base/CCProfiling.h" #include "base/ccConfig.h" #include "base/ccMacros.h" #include "base/base64.h" #include "base/ZipUtils.h" +#include "renderer/CCTextureCache.h" #include "renderer/CCGLProgramState.h" #include "renderer/CCGLProgram.h" #include "renderer/ccGLStateCache.h" diff --git a/cocos/2d/CCParticleBatchNode.h b/cocos/2d/CCParticleBatchNode.h index 2b6d716a94..a967425fca 100644 --- a/cocos/2d/CCParticleBatchNode.h +++ b/cocos/2d/CCParticleBatchNode.h @@ -31,7 +31,7 @@ #define __CCPARTICLEBATCHNODE_H__ #include "2d/CCNode.h" -#include "2d/CCProtocols.h" +#include "base/CCProtocols.h" #include "renderer/CCBatchCommand.h" NS_CC_BEGIN diff --git a/cocos/2d/CCParticleExamples.cpp b/cocos/2d/CCParticleExamples.cpp index 6498740b76..6869dc79f2 100644 --- a/cocos/2d/CCParticleExamples.cpp +++ b/cocos/2d/CCParticleExamples.cpp @@ -24,11 +24,12 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCParticleExamples.h" + +#include "2d/CCParticleExamples.h" +#include "platform/CCImage.h" #include "base/CCDirector.h" -#include "2d/CCTextureCache.h" -#include "firePngData.h" -#include "2d/platform/CCImage.h" +#include "base/firePngData.h" +#include "renderer/CCTextureCache.h" NS_CC_BEGIN // diff --git a/cocos/2d/CCParticleSystem.cpp b/cocos/2d/CCParticleSystem.cpp index eafe9e19d0..724b196724 100644 --- a/cocos/2d/CCParticleSystem.cpp +++ b/cocos/2d/CCParticleSystem.cpp @@ -42,21 +42,21 @@ THE SOFTWARE. // cocos2d uses a another approach, but the results are almost identical. // -#include "CCParticleSystem.h" +#include "2d/CCParticleSystem.h" #include -#include "CCParticleBatchNode.h" +#include "2d/CCParticleBatchNode.h" +#include "renderer/CCTextureAtlas.h" +#include "platform/CCFileUtils.h" +#include "platform/CCImage.h" #include "base/ccTypes.h" -#include "2d/CCTextureCache.h" -#include "2d/CCTextureAtlas.h" #include "base/base64.h" -#include "2d/platform/CCFileUtils.h" -#include "2d/platform/CCImage.h" #include "base/ZipUtils.h" #include "base/CCDirector.h" #include "base/CCProfiling.h" -// opengl +#include "renderer/CCTextureCache.h" + #include "CCGL.h" using namespace std; diff --git a/cocos/2d/CCParticleSystem.h b/cocos/2d/CCParticleSystem.h index fc2050b7b4..55d85c3446 100644 --- a/cocos/2d/CCParticleSystem.h +++ b/cocos/2d/CCParticleSystem.h @@ -27,7 +27,7 @@ THE SOFTWARE. #ifndef __CCPARTICLE_SYSTEM_H__ #define __CCPARTICLE_SYSTEM_H__ -#include "2d/CCProtocols.h" +#include "base/CCProtocols.h" #include "2d/CCNode.h" #include "base/CCValue.h" #include "deprecated/CCString.h" diff --git a/cocos/2d/CCParticleSystemQuad.cpp b/cocos/2d/CCParticleSystemQuad.cpp index fc4f5fd779..02d02dfe36 100644 --- a/cocos/2d/CCParticleSystemQuad.cpp +++ b/cocos/2d/CCParticleSystemQuad.cpp @@ -30,7 +30,7 @@ THE SOFTWARE. #include "2d/CCParticleSystemQuad.h" #include "2d/CCSpriteFrame.h" #include "2d/CCParticleBatchNode.h" -#include "2d/CCTextureAtlas.h" +#include "renderer/CCTextureAtlas.h" #include "base/CCDirector.h" #include "base/CCEventType.h" #include "base/CCConfiguration.h" diff --git a/cocos/2d/CCProgressTimer.cpp b/cocos/2d/CCProgressTimer.cpp index d3249380fb..d0cbabdf87 100644 --- a/cocos/2d/CCProgressTimer.cpp +++ b/cocos/2d/CCProgressTimer.cpp @@ -27,8 +27,8 @@ THE SOFTWARE. #include "base/ccMacros.h" #include "base/CCDirector.h" -#include "2d/CCTextureCache.h" #include "2d/CCDrawingPrimitives.h" +#include "renderer/CCTextureCache.h" #include "renderer/CCGLProgram.h" #include "renderer/CCGLProgramState.h" #include "renderer/ccGLStateCache.h" diff --git a/cocos/2d/CCRenderTexture.cpp b/cocos/2d/CCRenderTexture.cpp index 436e07daa8..f11364a019 100644 --- a/cocos/2d/CCRenderTexture.cpp +++ b/cocos/2d/CCRenderTexture.cpp @@ -24,27 +24,27 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "base/CCConfiguration.h" #include "2d/CCRenderTexture.h" + +#include "base/ccUtils.h" +#include "platform/CCImage.h" +#include "platform/CCFileUtils.h" +#include "2d/CCGrid.h" +#include "base/CCEventType.h" +#include "base/CCConfiguration.h" +#include "base/CCConfiguration.h" #include "base/CCDirector.h" -#include "2d/platform/CCImage.h" +#include "base/CCEventListenerCustom.h" +#include "base/CCEventDispatcher.h" #include "renderer/CCGLProgram.h" #include "renderer/ccGLStateCache.h" -#include "base/CCConfiguration.h" -#include "2d/ccUtils.h" -#include "2d/CCTextureCache.h" -#include "2d/platform/CCFileUtils.h" -#include "CCGL.h" -#include "base/CCEventType.h" -#include "2d/CCGrid.h" - +#include "renderer/CCTextureCache.h" #include "renderer/CCRenderer.h" #include "renderer/CCGroupCommand.h" #include "renderer/CCCustomCommand.h" -// extern -#include "base/CCEventListenerCustom.h" -#include "base/CCEventDispatcher.h" +#include "CCGL.h" + NS_CC_BEGIN diff --git a/cocos/2d/CCRenderTexture.h b/cocos/2d/CCRenderTexture.h index d3f7ece158..47f2c506df 100644 --- a/cocos/2d/CCRenderTexture.h +++ b/cocos/2d/CCRenderTexture.h @@ -28,7 +28,7 @@ THE SOFTWARE. #include "2d/CCNode.h" #include "2d/CCSprite.h" -#include "2d/platform/CCImage.h" +#include "platform/CCImage.h" #include "renderer/CCGroupCommand.h" #include "renderer/CCCustomCommand.h" diff --git a/cocos/2d/CCSprite.cpp b/cocos/2d/CCSprite.cpp index a5c2049310..b922554d18 100644 --- a/cocos/2d/CCSprite.cpp +++ b/cocos/2d/CCSprite.cpp @@ -26,14 +26,18 @@ THE SOFTWARE. ****************************************************************************/ #include "2d/CCSprite.h" + +#include +#include + #include "2d/CCSpriteBatchNode.h" #include "2d/CCAnimation.h" #include "2d/CCAnimationCache.h" #include "2d/CCSpriteFrame.h" #include "2d/CCSpriteFrameCache.h" -#include "2d/CCTextureCache.h" #include "2d/CCDrawingPrimitives.h" -#include "2d/CCTexture2D.h" +#include "renderer/CCTextureCache.h" +#include "renderer/CCTexture2D.h" #include "renderer/CCGLProgramState.h" #include "renderer/ccGLStateCache.h" #include "renderer/CCGLProgram.h" @@ -48,8 +52,6 @@ THE SOFTWARE. #include "deprecated/CCString.h" -#include -#include NS_CC_BEGIN diff --git a/cocos/2d/CCSprite.h b/cocos/2d/CCSprite.h index 38d826fdb6..29935d7404 100644 --- a/cocos/2d/CCSprite.h +++ b/cocos/2d/CCSprite.h @@ -29,8 +29,8 @@ THE SOFTWARE. #define __SPRITE_NODE_CCSPRITE_H__ #include "2d/CCNode.h" -#include "2d/CCProtocols.h" -#include "2d/CCTextureAtlas.h" +#include "base/CCProtocols.h" +#include "renderer/CCTextureAtlas.h" #include "base/ccTypes.h" #include #ifdef EMSCRIPTEN diff --git a/cocos/2d/CCSpriteBatchNode.cpp b/cocos/2d/CCSpriteBatchNode.cpp index 4c44ae543e..474704247c 100644 --- a/cocos/2d/CCSpriteBatchNode.cpp +++ b/cocos/2d/CCSpriteBatchNode.cpp @@ -28,15 +28,17 @@ THE SOFTWARE. #include "2d/CCSpriteBatchNode.h" +#include + #include "2d/CCSprite.h" #include "2d/CCGrid.h" #include "2d/CCDrawingPrimitives.h" -#include "2d/CCTextureCache.h" #include "2d/CCLayer.h" #include "2d/CCScene.h" #include "base/ccConfig.h" #include "base/CCDirector.h" #include "base/CCProfiling.h" +#include "renderer/CCTextureCache.h" #include "renderer/CCGLProgramState.h" #include "renderer/CCGLProgram.h" #include "renderer/ccGLStateCache.h" @@ -46,8 +48,6 @@ THE SOFTWARE. #include "deprecated/CCString.h" // For StringUtils::format -// external -#include NS_CC_BEGIN diff --git a/cocos/2d/CCSpriteBatchNode.h b/cocos/2d/CCSpriteBatchNode.h index 6f59a65ba1..6bdbac905d 100644 --- a/cocos/2d/CCSpriteBatchNode.h +++ b/cocos/2d/CCSpriteBatchNode.h @@ -32,9 +32,9 @@ THE SOFTWARE. #include #include "2d/CCNode.h" -#include "2d/CCProtocols.h" -#include "2d/CCTextureAtlas.h" +#include "base/CCProtocols.h" #include "base/ccMacros.h" +#include "renderer/CCTextureAtlas.h" #include "renderer/CCBatchCommand.h" NS_CC_BEGIN diff --git a/cocos/2d/CCSpriteFrame.cpp b/cocos/2d/CCSpriteFrame.cpp index 86f46dc809..51d02c4d73 100644 --- a/cocos/2d/CCSpriteFrame.cpp +++ b/cocos/2d/CCSpriteFrame.cpp @@ -24,7 +24,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "2d/CCTextureCache.h" + +#include "renderer/CCTextureCache.h" #include "2d/CCSpriteFrame.h" #include "base/CCDirector.h" diff --git a/cocos/2d/CCSpriteFrame.h b/cocos/2d/CCSpriteFrame.h index bea7424ba3..9a534fbcdc 100644 --- a/cocos/2d/CCSpriteFrame.h +++ b/cocos/2d/CCSpriteFrame.h @@ -29,7 +29,7 @@ THE SOFTWARE. #define __SPRITE_CCSPRITE_FRAME_H__ #include "2d/CCNode.h" -#include "2d/CCProtocols.h" +#include "base/CCProtocols.h" #include "base/CCRef.h" #include "math/CCGeometry.h" diff --git a/cocos/2d/CCSpriteFrameCache.cpp b/cocos/2d/CCSpriteFrameCache.cpp index 4f9cedfa9e..2bd0dcc782 100644 --- a/cocos/2d/CCSpriteFrameCache.cpp +++ b/cocos/2d/CCSpriteFrameCache.cpp @@ -27,17 +27,21 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "base/CCNS.h" -#include "base/ccMacros.h" -#include "2d/CCTextureCache.h" #include "2d/CCSpriteFrameCache.h" + +#include + #include "2d/CCSpriteFrame.h" #include "2d/CCSprite.h" -#include "math/TransformUtils.h" -#include "2d/platform/CCFileUtils.h" -#include "deprecated/CCString.h" +#include "platform/CCFileUtils.h" +#include "base/CCNS.h" +#include "base/ccMacros.h" #include "base/CCDirector.h" -#include +#include "renderer/CCTextureCache.h" +#include "math/TransformUtils.h" + +#include "deprecated/CCString.h" + using namespace std; diff --git a/cocos/2d/CCSpriteFrameCache.h b/cocos/2d/CCSpriteFrameCache.h index d4c592e34d..7e01d33e7d 100644 --- a/cocos/2d/CCSpriteFrameCache.h +++ b/cocos/2d/CCSpriteFrameCache.h @@ -36,7 +36,7 @@ THE SOFTWARE. */ #include "2d/CCSpriteFrame.h" -#include "2d/CCTexture2D.h" +#include "renderer/CCTexture2D.h" #include "base/CCRef.h" #include "base/CCValue.h" #include "base/CCMap.h" diff --git a/cocos/2d/CCTMXLayer.cpp b/cocos/2d/CCTMXLayer.cpp index 8a61292f57..d763dabbf9 100644 --- a/cocos/2d/CCTMXLayer.cpp +++ b/cocos/2d/CCTMXLayer.cpp @@ -24,15 +24,17 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ + #include "2d/CCTMXLayer.h" + #include "2d/CCTMXXMLParser.h" #include "2d/CCTMXTiledMap.h" #include "2d/CCSprite.h" -#include "2d/CCTextureCache.h" -#include "2d/ccCArray.h" +#include "base/ccCArray.h" +#include "base/CCDirector.h" +#include "renderer/CCTextureCache.h" #include "renderer/CCGLProgramState.h" #include "renderer/CCGLProgram.h" -#include "base/CCDirector.h" #include "deprecated/CCString.h" // For StringUtils::format diff --git a/cocos/2d/CCTMXLayer.h b/cocos/2d/CCTMXLayer.h index 58ffa34db4..2ab316b90e 100644 --- a/cocos/2d/CCTMXLayer.h +++ b/cocos/2d/CCTMXLayer.h @@ -31,7 +31,7 @@ THE SOFTWARE. #include "CCAtlasNode.h" #include "2d/CCSpriteBatchNode.h" #include "CCTMXXMLParser.h" -#include "2d/ccCArray.h" +#include "base/ccCArray.h" NS_CC_BEGIN class TMXMapInfo; diff --git a/cocos/2d/CCTMXXMLParser.cpp b/cocos/2d/CCTMXXMLParser.cpp index a2de4100a6..7d42c9c978 100644 --- a/cocos/2d/CCTMXXMLParser.cpp +++ b/cocos/2d/CCTMXXMLParser.cpp @@ -31,7 +31,7 @@ THE SOFTWARE. #include "CCTMXXMLParser.h" #include "CCTMXTiledMap.h" #include "base/ccMacros.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "base/ZipUtils.h" #include "base/base64.h" #include "base/CCDirector.h" diff --git a/cocos/2d/CCTMXXMLParser.h b/cocos/2d/CCTMXXMLParser.h index 94621db3b0..dde1c4f535 100644 --- a/cocos/2d/CCTMXXMLParser.h +++ b/cocos/2d/CCTMXXMLParser.h @@ -30,7 +30,7 @@ THE SOFTWARE. #define __CC_TM_XML_PARSER__ #include "math/CCGeometry.h" -#include "2d/platform/CCSAXParser.h" +#include "platform/CCSAXParser.h" #include "base/CCVector.h" #include "base/CCValue.h" diff --git a/cocos/2d/CCTextFieldTTF.h b/cocos/2d/CCTextFieldTTF.h index 98b3283492..5c4eb4f54d 100644 --- a/cocos/2d/CCTextFieldTTF.h +++ b/cocos/2d/CCTextFieldTTF.h @@ -27,7 +27,7 @@ THE SOFTWARE. #define __CC_TEXT_FIELD_H__ #include "2d/CCLabel.h" -#include "2d/CCIMEDelegate.h" +#include "base/CCIMEDelegate.h" NS_CC_BEGIN diff --git a/cocos/2d/CCTileMapAtlas.cpp b/cocos/2d/CCTileMapAtlas.cpp index 77f4e7d43f..03b1633ba2 100644 --- a/cocos/2d/CCTileMapAtlas.cpp +++ b/cocos/2d/CCTileMapAtlas.cpp @@ -25,9 +25,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "CCTileMapAtlas.h" -#include "2d/platform/CCFileUtils.h" -#include "2d/CCTextureAtlas.h" -#include "TGAlib.h" +#include "platform/CCFileUtils.h" +#include "renderer/CCTextureAtlas.h" +#include "base/TGAlib.h" #include "base/ccConfig.h" #include "base/CCDirector.h" #include "deprecated/CCString.h" diff --git a/cocos/2d/CMakeLists.txt b/cocos/2d/CMakeLists.txt index a164b8a64f..630aa69782 100644 --- a/cocos/2d/CMakeLists.txt +++ b/cocos/2d/CMakeLists.txt @@ -2,43 +2,19 @@ if(WIN32) ADD_DEFINITIONS(-DUNICODE -D_UNICODE) -set(COCOS_2D_PLATFORM_SRC - 2d/platform/win32/CCStdC.cpp - 2d/platform/win32/CCFileUtilsWin32.cpp - 2d/platform/win32/CCCommon.cpp - 2d/platform/win32/CCApplication.cpp - 2d/platform/desktop/CCGLView.cpp - 2d/platform/win32/CCDevice.cpp -) - -elseif(APPLE) - -else() - -set(COCOS_2D_PLATFORM_SRC - 2d/platform/linux/CCStdC.cpp - 2d/platform/linux/CCFileUtilsLinux.cpp - 2d/platform/linux/CCCommon.cpp - 2d/platform/linux/CCApplication.cpp - 2d/platform/desktop/CCGLView.cpp - 2d/platform/linux/CCDevice.cpp -) - endif() include_directories( ../external/ConvertUTF ) - set(COCOS_2D_SRC - 2d/ccFPSImages.c - 2d/CCAction.cpp 2d/CCActionCamera.cpp 2d/CCActionCatmullRom.cpp + 2d/CCAction.cpp 2d/CCActionEase.cpp - 2d/CCActionGrid.cpp 2d/CCActionGrid3D.cpp + 2d/CCActionGrid.cpp 2d/CCActionInstant.cpp 2d/CCActionInterval.cpp 2d/CCActionManager.cpp @@ -46,29 +22,28 @@ set(COCOS_2D_SRC 2d/CCActionProgressTimer.cpp 2d/CCActionTiledGrid.cpp 2d/CCActionTween.cpp - 2d/CCAnimation.cpp 2d/CCAnimationCache.cpp + 2d/CCAnimation.cpp 2d/CCAtlasNode.cpp 2d/CCClippingNode.cpp - 2d/CCComponent.cpp 2d/CCComponentContainer.cpp - 2d/CCDrawNode.cpp + 2d/CCComponent.cpp 2d/CCDrawingPrimitives.cpp - 2d/CCFont.cpp - 2d/CCFontAtlas.cpp + 2d/CCDrawNode.cpp 2d/CCFontAtlasCache.cpp + 2d/CCFontAtlas.cpp 2d/CCFontCharMap.cpp + 2d/CCFont.cpp 2d/CCFontFNT.cpp 2d/CCFontFreeType.cpp 2d/CCGLBufferedNode.cpp 2d/CCGrabber.cpp 2d/CCGrid.cpp - 2d/CCIMEDispatcher.cpp - 2d/CCLabel.cpp 2d/CCLabelAtlas.cpp 2d/CCLabelBMFont.cpp - 2d/CCLabelTTF.cpp + 2d/CCLabel.cpp 2d/CCLabelTextFormatter.cpp + 2d/CCLabelTTF.cpp 2d/CCLayer.cpp 2d/CCMenu.cpp 2d/CCMenuItem.cpp @@ -83,38 +58,19 @@ set(COCOS_2D_SRC 2d/CCProgressTimer.cpp 2d/CCRenderTexture.cpp 2d/CCScene.cpp - 2d/CCScriptSupport.cpp - 2d/CCSprite.cpp 2d/CCSpriteBatchNode.cpp - 2d/CCSpriteFrame.cpp + 2d/CCSprite.cpp 2d/CCSpriteFrameCache.cpp + 2d/CCSpriteFrame.cpp + 2d/CCTextFieldTTF.cpp + 2d/CCTileMapAtlas.cpp 2d/CCTMXLayer.cpp 2d/CCTMXObjectGroup.cpp 2d/CCTMXTiledMap.cpp 2d/CCTMXXMLParser.cpp - 2d/CCTextFieldTTF.cpp - 2d/CCTexture2D.cpp - 2d/CCTextureAtlas.cpp - 2d/CCTextureCache.cpp - 2d/CCTileMapAtlas.cpp 2d/CCTransition.cpp 2d/CCTransitionPageTurn.cpp 2d/CCTransitionProgress.cpp 2d/CCTweenFunction.cpp - 2d/CCUserDefault.cpp - 2d/CCUserDefaultAndroid.cpp - 2d/CCVertex.cpp - 2d/TGAlib.cpp - 2d/ccCArray.cpp - 2d/ccUTF8.cpp - 2d/ccUtils.cpp - 2d/platform/CCSAXParser.cpp - 2d/platform/CCThread.cpp - 2d/platform/CCGLViewProtocol.cpp - 2d/platform/CCFileUtils.cpp - 2d/platform/CCImage.cpp - ../external/edtaa3func/edtaa3func.cpp - ../external/ConvertUTF/ConvertUTFWrapper.cpp - ../external/ConvertUTF/ConvertUTF.c ) diff --git a/cocos/2d/cocos2d.vcxproj b/cocos/2d/cocos2d.vcxproj index e5b1b92dc4..d7f58d5390 100644 --- a/cocos/2d/cocos2d.vcxproj +++ b/cocos/2d/cocos2d.vcxproj @@ -178,6 +178,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + @@ -198,15 +199,23 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + + + + + + + @@ -217,13 +226,14 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + - - - - + + + @@ -234,6 +244,17 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + + + + + + + + + + @@ -246,6 +267,9 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + + @@ -262,7 +286,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - @@ -274,11 +297,9 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - + - - @@ -289,6 +310,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + @@ -297,15 +319,11 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - - - - @@ -315,22 +333,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - - - - - - - - - - - - - - - - @@ -342,6 +344,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + @@ -364,21 +367,33 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + + + + + + + + + + + @@ -395,13 +410,14 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + - - - - + + + @@ -413,6 +429,21 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + + + + + + + + + + + + + + @@ -426,6 +457,9 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + + @@ -442,7 +476,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - @@ -454,12 +487,9 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - + - - - @@ -470,24 +500,20 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + - - - - - @@ -497,58 +523,15 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/cocos/2d/cocos2d.vcxproj.filters b/cocos/2d/cocos2d.vcxproj.filters index ec392a9884..5c2b8adc1e 100644 --- a/cocos/2d/cocos2d.vcxproj.filters +++ b/cocos/2d/cocos2d.vcxproj.filters @@ -1,108 +1,57 @@  - - {cc64f5ad-2234-494c-9c51-b7a20c8887aa} - - - {736cf4ab-e0d6-40ba-912a-b062d28d318a} - - - {1c7c61b8-3d36-4ba0-a87c-457eb4c782d0} - - - {0b3a64bd-79fa-476a-a461-6b97e5072453} - - - {e455af5e-da09-4f41-b79f-df4dd311820d} - - - {206bd96b-f80e-4722-8675-d7c6ff9b3639} - - - {075492ba-08bc-404c-92da-32029797a600} - - - {41abe422-1602-4fe0-ac1c-6b04a14c1abb} - - - {8bf0f517-2ac3-4fc3-a1ad-999d9ea103cd} - - - {926fc31c-8742-4984-9940-c972dd02fc8a} - - - {9428f8e6-4ce3-4596-b8af-14d70b7c5b5d} - - - {755e5282-111e-46a5-9169-7c12b37f5ffc} - - - {d94bbf20-8de9-49a7-ae20-6a1140cf633b} - - - {4a64789e-cc8d-4f84-a869-e6dae2e0d58c} - - - {bb98a889-9a48-4e31-af2f-117f14da388a} - - - {fdea327e-b905-47db-8c33-b70d7866166b} - - - {46c8d130-b8b5-47f5-a063-ca700e1c32cc} - - - {f2671200-b2d8-4d2e-9728-06719cf6f835} - - - {535c04b0-fe2b-44c9-9a8c-9029e2b6de5c} - - - {5b082c5c-d396-43ca-b3b1-997d0f6247d0} - - - {1179d205-d065-49f0-8457-bc4c3f1d0cb3} - - - {cc25bb83-527d-4218-8d68-ebf963ce7698} - - - {c45b97e8-fa1f-4e58-8ec5-d46371c2dd26} - - - {caa78ce0-9b58-4314-b117-1acae278691e} - - - {47fda93e-6eb4-4abc-b5bc-725bf667a395} - {08593631-5bf5-46aa-9436-62595c4f7bf6} {aeadfa95-9c89-4212-98ae-89ad57db596a} - - {aec8225f-81a7-4213-b97b-7004d5535398} - - - {cba0f362-878c-438b-ad0f-43d287516357} - - - {32373f63-2c2d-4eab-bc4a-21745ba0b3fb} - - - {b4e2b1e5-2d79-44a3-af45-728d47b7bdb2} - {0b1152b1-c732-4560-8629-87843b0fbd7c} - - {02a21a86-8f65-441b-ae13-11dec1c45ee5} + + {0965e868-aacd-4d73-9c78-31d3cdaaed52} - + + {4d0146d9-df5b-4430-a426-60aa395750a6} + + + {a495c9fc-5276-476d-ba6b-5d627b31ef30} + + + {87a7d557-f382-477f-b183-69901a320c17} + + + {9ac3f4cb-fb7b-4bcc-8b5b-1d454f2ff564} + + + {fdea951b-e91d-45da-b5bd-22a1b875960a} + + + {3622d05e-fcef-4d4b-a51d-771d1c13a2ef} + + + {a565f213-2d13-4d2d-a3a0-5b2d06cbd05f} + + + {ec174f10-2de3-4568-9f30-b2f0a4e9396e} + + + {364c3b8c-77eb-46ed-a866-a8686b1b65bc} + + + {589928bf-e550-41f1-ae21-64443dd5fe21} + + + {1849ae10-8a10-4784-bbad-66fa67a1ed04} + + {6c1e4a6b-c168-436b-aa63-0af7f4caebf9} + + {b4e2b1e5-2d79-44a3-af45-728d47b7bdb2} + @@ -120,262 +69,6 @@ physics - - base_nodes - - - base_nodes - - - effects - - - effects - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - menu_nodes - - - menu_nodes - - - misc_nodes - - - misc_nodes - - - misc_nodes - - - misc_nodes - - - particle_nodes - - - particle_nodes - - - particle_nodes - - - particle_nodes - - - script_support - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - draw_nodes - - - draw_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - platform\etc - - - platform\win32 - - - platform\win32 - - - platform\win32 - - - platform\win32 - - - platform\win32 - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - text_input_node - - - text_input_node - - - textures - - - textures - - - textures - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - - support - - - support - - - support\component - - - support\component - - - support\data_support - - - support\image_support - - - support\tinyxml2 - - - support\user_default - - - support\zip_support - - - support\zip_support - - - support - physics\chipmunk @@ -391,23 +84,8 @@ physics\chipmunk - - misc_nodes - - - label_nodes - - - label_nodes - - - platform\desktop - - - platform - - xxhash + external\xxhash deprecated @@ -428,12 +106,213 @@ deprecated + + external\ConvertUTF + + + external\ConvertUTF + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + base + base base + + base + base @@ -461,6 +340,9 @@ base + + base + base @@ -473,6 +355,9 @@ base + + base + base @@ -488,6 +373,9 @@ base + + base + base @@ -500,51 +388,63 @@ base + + base + base base + + base + + + base + + + base + + + base + base + + base + + + base + + + base + base - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - - - math - renderer renderer + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + renderer @@ -557,38 +457,95 @@ renderer - - base - - - base - - - renderer - - - renderer - - - renderer - - - renderer - renderer - + renderer - - ConvertUTF + + renderer - - ConvertUTF + + renderer - - actions + + platform\desktop + + + platform\win32 + + + platform\win32 + + + platform\win32 + + + platform\win32 + + + platform\win32 + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + platform + + + platform + + + platform + + + platform + + + platform + + + external\tinyxml2 + + + external\unzip + + + external\unzip + + + external\edtaa + + + base @@ -607,292 +564,6 @@ physics - - base_nodes - - - base_nodes - - - effects - - - effects - - - include - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - menu_nodes - - - menu_nodes - - - misc_nodes - - - misc_nodes - - - misc_nodes - - - misc_nodes - - - particle_nodes - - - particle_nodes - - - particle_nodes - - - particle_nodes - - - script_support - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - draw_nodes - - - draw_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - platform\etc - - - platform\win32 - - - platform\win32 - - - platform\win32 - - - platform\win32 - - - platform\win32 - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - text_input_node - - - text_input_node - - - text_input_node - - - textures - - - textures - - - textures - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - - support - - - support - - - support - - - support\component - - - support\component - - - support\data_support - - - support\data_support - - - support\data_support - - - support\image_support - - - support\tinyxml2 - - - support\user_default - - - support\zip_support - - - support\zip_support - physics\chipmunk @@ -911,20 +582,8 @@ physics\chipmunk - - misc_nodes - - - label_nodes - - - label_nodes - - - platform\desktop - - xxhash + external\xxhash deprecated @@ -957,12 +616,210 @@ deprecated + + external\ConvertUTF + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + base + base base + + base + base @@ -993,6 +850,9 @@ base + + base + base @@ -1005,6 +865,9 @@ base + + base + base @@ -1023,6 +886,9 @@ base + + base + base @@ -1032,9 +898,18 @@ base + + base + + + base + base + + base + base @@ -1044,53 +919,50 @@ base + + base + base base + + base + + + base + + + base + base base - + base - - math + + base - - math + + base - - math + + base - - math + + base - - math + + base - - math - - - math - - - math - - - math - - - math - - - math + + base renderer @@ -1098,6 +970,21 @@ renderer + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + renderer @@ -1113,120 +1000,139 @@ renderer - - base - - - base - - - renderer - - - renderer - - - renderer - - - renderer - renderer - + renderer - - ConvertUTF + + renderer - - actions + + renderer - - - + + platform\desktop + + + platform\win32\compat + + + platform\win32 + + + platform\win32 + + + platform\win32 + + + platform\win32 + + + platform\win32 + + math - + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + math + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform + + + platform + + + external\tinyxml2 + + + external\unzip + + + external\unzip + + + external\edtaa + + + base + + + base + + + math + math math - - math - math - + math - + math - + math - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - - - renderer\shaders - \ No newline at end of file diff --git a/cocos/2d/cocos2d_headers.props b/cocos/2d/cocos2d_headers.props index 51362bbae4..afdcd49a10 100644 --- a/cocos/2d/cocos2d_headers.props +++ b/cocos/2d/cocos2d_headers.props @@ -7,7 +7,7 @@ - $(EngineRoot)cocos;$(EngineRoot)cocos\2d\platform\win32;$(EngineRoot)cocos\2d\platform\desktop;$(EngineRoot)external\glfw3\include\win32;$(EngineRoot)external\win32-specific\gles\include\OGLES + $(EngineRoot)cocos;$(EngineRoot)cocos\platform\win32;$(EngineRoot)cocos\platform\desktop;$(EngineRoot)external\glfw3\include\win32;$(EngineRoot)external\win32-specific\gles\include\OGLES _VARIADIC_MAX=10;%(PreprocessorDefinitions) diff --git a/cocos/2d/cocos2d_winrt_headers.props b/cocos/2d/cocos2d_winrt_headers.props index a9c86090e4..fd510616e4 100644 --- a/cocos/2d/cocos2d_winrt_headers.props +++ b/cocos/2d/cocos2d_winrt_headers.props @@ -7,7 +7,7 @@ - $(EngineRoot)cocos;$(EngineRoot)cocos\2d\platform\winrt;$(EngineRoot)\external\winrt-specific\angle\include;$(EngineRoot)\external\xxhash;$(EngineRoot)\external\winrt-specific;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\2d\renderer;$(EngineRoot)cocos\math\kazmath;$(EngineRoot)cocos\ui;$(EngineRoot)cocos\base;$(EngineRoot)cocos\physics;$(EngineRoot)cocos\math\kazmath\include;$(GeneratedFilesDir);$(EngineRoot)external\ConvertUTF; + $(EngineRoot)cocos;$(EngineRoot)cocos\platform\winrt;$(EngineRoot)\external\winrt-specific\angle\include;$(EngineRoot)\external\xxhash;$(EngineRoot)\external\winrt-specific;$(GeneratedFilesDir);$(EngineRoot)external\ConvertUTF; diff --git a/cocos/2d/cocos2d_wp8.vcxproj b/cocos/2d/cocos2d_wp8.vcxproj index 1b145bce6f..7a47583a8a 100644 --- a/cocos/2d/cocos2d_wp8.vcxproj +++ b/cocos/2d/cocos2d_wp8.vcxproj @@ -75,7 +75,7 @@ %(PreprocessorDefinitions) - Use + NotUsing pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) $(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories) @@ -100,7 +100,7 @@ _LIB;NDEBUG;%(PreprocessorDefinitions) - Use + NotUsing pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) $(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories) @@ -225,6 +225,7 @@ + @@ -245,15 +246,34 @@ + + false + false + + + + + + + + + + + + + + + + @@ -264,13 +284,14 @@ + + - - - - + + + @@ -281,6 +302,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -293,6 +337,9 @@ + + + @@ -309,7 +356,6 @@ - @@ -321,28 +367,9 @@ - - false - false - false - false - NotUsing - NotUsing - NotUsing - NotUsing - - - - - - - - - + - - @@ -353,6 +380,7 @@ + @@ -361,15 +389,11 @@ - - - - @@ -379,54 +403,6 @@ - - - - - - - - - - - - - - - - - - - true - true - true - true - Create - Create - pch.h - Cdecl - Cdecl - Cdecl - Cdecl - Create - Create - pch.h - - - - Create - Create - Create - Create - false - false - false - false - - - - - @@ -438,6 +414,7 @@ + @@ -460,21 +437,33 @@ + + + + + + + + + + + + @@ -490,13 +479,14 @@ + + - - - - + + + @@ -508,6 +498,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -521,6 +540,9 @@ + + + @@ -537,55 +559,44 @@ - - - - + - - - - + - - - - - @@ -594,49 +605,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + + + @@ -661,6 +639,6 @@ - + \ No newline at end of file diff --git a/cocos/2d/cocos2d_wp8.vcxproj.filters b/cocos/2d/cocos2d_wp8.vcxproj.filters index 10ccab392c..347e3dc121 100644 --- a/cocos/2d/cocos2d_wp8.vcxproj.filters +++ b/cocos/2d/cocos2d_wp8.vcxproj.filters @@ -1,87 +1,15 @@  - - {cc64f5ad-2234-494c-9c51-b7a20c8887aa} - - - {736cf4ab-e0d6-40ba-912a-b062d28d318a} - - - {1c7c61b8-3d36-4ba0-a87c-457eb4c782d0} - - - {0b3a64bd-79fa-476a-a461-6b97e5072453} - - - {e455af5e-da09-4f41-b79f-df4dd311820d} - - - {206bd96b-f80e-4722-8675-d7c6ff9b3639} - - - {075492ba-08bc-404c-92da-32029797a600} - - - {41abe422-1602-4fe0-ac1c-6b04a14c1abb} - - - {8bf0f517-2ac3-4fc3-a1ad-999d9ea103cd} - {926fc31c-8742-4984-9940-c972dd02fc8a} - - {755e5282-111e-46a5-9169-7c12b37f5ffc} - - - {d94bbf20-8de9-49a7-ae20-6a1140cf633b} - - - {4a64789e-cc8d-4f84-a869-e6dae2e0d58c} - - - {bb98a889-9a48-4e31-af2f-117f14da388a} - - - {fdea327e-b905-47db-8c33-b70d7866166b} - - - {46c8d130-b8b5-47f5-a063-ca700e1c32cc} - - - {f2671200-b2d8-4d2e-9728-06719cf6f835} - - - {535c04b0-fe2b-44c9-9a8c-9029e2b6de5c} - - - {5b082c5c-d396-43ca-b3b1-997d0f6247d0} - - - {1179d205-d065-49f0-8457-bc4c3f1d0cb3} - - - {cc25bb83-527d-4218-8d68-ebf963ce7698} - - - {c45b97e8-fa1f-4e58-8ec5-d46371c2dd26} - - - {caa78ce0-9b58-4314-b117-1acae278691e} - - - {47fda93e-6eb4-4abc-b5bc-725bf667a395} - {08593631-5bf5-46aa-9436-62595c4f7bf6} {aeadfa95-9c89-4212-98ae-89ad57db596a} - - {aec8225f-81a7-4213-b97b-7004d5535398} - {cba0f362-878c-438b-ad0f-43d287516357} @@ -91,21 +19,42 @@ {14e6de7a-f7ef-4249-9141-abf17033d9c2} - - {a36c6808-a8d6-43f4-bfb0-e08ee2747a21} - {5598fb0c-c012-45b6-8e43-447e7891b61d} + + {fdee8fd3-05f9-46a1-aa15-6ceb16358145} + + + {f3673af7-9bbd-463b-a3a9-a081e67248d8} + + + {fbaf3e74-09dc-4f89-9d5a-0e7ccabbfbff} + - {9bbf7050-757b-41b1-ab15-418db52c2023} + {41c1aef6-86c9-42e3-b68c-6da3107ff587} - - {3237780d-1154-4049-bf53-151c421f26e9} + + {a03a9ca0-013a-4082-bb45-43f024ff0f4e} - + + {0e7c99cb-0b41-4120-9773-49c31345d829} + + + {729473cd-a9e2-4133-b78e-37a6c3687550} + + + {54949861-d861-4eea-89bf-0498ef3c338c} + + + {64846670-6658-45f9-84cf-29e013870c37} + + {026f880b-7918-49f8-8f0d-00f7593ce326} + + {a36c6808-a8d6-43f4-bfb0-e08ee2747a21} + @@ -123,247 +72,6 @@ physics - - base_nodes - - - base_nodes - - - effects - - - effects - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - menu_nodes - - - menu_nodes - - - misc_nodes - - - misc_nodes - - - misc_nodes - - - misc_nodes - - - particle_nodes - - - particle_nodes - - - particle_nodes - - - particle_nodes - - - script_support - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - draw_nodes - - - draw_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - platform\etc - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - text_input_node - - - text_input_node - - - textures - - - textures - - - textures - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - - support - - - support - - - support\component - - - support\component - - - support\data_support - - - support\image_support - - - support\tinyxml2 - - - support\user_default - - - support\zip_support - - - support\zip_support - - - support - physics\chipmunk @@ -379,57 +87,8 @@ physics\chipmunk - - misc_nodes - - - label_nodes - - - label_nodes - - - platform - - - - platform\wp8 - - - platform\wp8 - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - xxhash + external\xxhash deprecated @@ -449,37 +108,301 @@ deprecated - - platform\winrt - - - platform\winrt - - + + external\ConvertUTF + + + external\ConvertUTF + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + math - + + math + + + math + + + math + + math math - + math - + math - + math + + math + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + external\tinyxml2 + + + external\unzip + + + external\unzip + + + external\edtaa + + + base + base base + + base + base @@ -507,6 +430,9 @@ base + + base + base @@ -519,6 +445,9 @@ base + + base + base @@ -534,6 +463,9 @@ base + + base + base @@ -546,75 +478,114 @@ base + + base + base base + + base + + + base + + + base + + + base + base + + base + + + base + + + base + base - - renderer + + platform - - renderer + + platform - - renderer + + platform - - renderer + + platform - - renderer + + platform - - renderer + + platform\wp8 - - math + + platform\wp8 - - math + + platform\wp8 - - math + + platform\winrt - + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + base - - base - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - ConvertUTF - - - ConvertUTF - @@ -632,292 +603,6 @@ physics - - base_nodes - - - base_nodes - - - effects - - - effects - - - include - - - include - - - include - - - include - - - include - - - include - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - layers_scenes_transitions_nodes - - - menu_nodes - - - menu_nodes - - - misc_nodes - - - misc_nodes - - - misc_nodes - - - misc_nodes - - - particle_nodes - - - particle_nodes - - - particle_nodes - - - particle_nodes - - - script_support - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - actions - - - draw_nodes - - - draw_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - label_nodes - - - platform\etc - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - platform - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - sprite_nodes - - - text_input_node - - - text_input_node - - - text_input_node - - - textures - - - textures - - - textures - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - tilemap_parallax_nodes - - - - support - - - support - - - support - - - support\component - - - support\component - - - support\data_support - - - support\data_support - - - support\data_support - - - support\image_support - - - support\tinyxml2 - - - support\user_default - - - support\zip_support - - - support\zip_support - physics\chipmunk @@ -936,57 +621,8 @@ physics\chipmunk - - misc_nodes - - - label_nodes - - - label_nodes - - - - platform\wp8 - - - platform\wp8 - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - - platform\winrt - - xxhash + external\xxhash deprecated @@ -1018,14 +654,203 @@ deprecated - - platform\winrt + + external\ConvertUTF - - platform\winrt + + 2d - - platform\winrt + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + 2d + + + math + + + math math @@ -1033,30 +858,102 @@ math - + math - + + math + + math math - + math - + math - + math + + math + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + renderer + + + external\tinyxml2 + + + external\unzip + + + external\unzip + + + external\edtaa + + + base + base base + + base + base @@ -1087,6 +984,9 @@ base + + base + base @@ -1099,6 +999,9 @@ base + + base + base @@ -1117,6 +1020,9 @@ base + + base + base @@ -1126,9 +1032,18 @@ base + + base + + + base + base + + base + base @@ -1138,171 +1053,237 @@ base + + base + base base + + base + + + base + + + base + base base + + base + + + base + + + base + + + base + + + base + + + base + base - - renderer + + platform - - renderer + + platform - - renderer + + platform - - renderer + + platform - - renderer + + platform - - renderer + + platform - - renderer + + platform - - math + + platform - - math + + platform\wp8 - - math + + platform\wp8 - + + platform\wp8 + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + + platform\winrt + + base - + base - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - renderer - - - ConvertUTF - + + math + math math - - math - math - + math - + math - + math - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - renderer\Shaders + renderer\shaders - - base + + renderer \ No newline at end of file diff --git a/cocos/2d/cocos2d_wp8_headers.props b/cocos/2d/cocos2d_wp8_headers.props index 0ff1cd875e..d9e60d6d8c 100644 --- a/cocos/2d/cocos2d_wp8_headers.props +++ b/cocos/2d/cocos2d_wp8_headers.props @@ -7,7 +7,7 @@ - $(EngineRoot)cocos\2d\platform\wp8;$(EngineRoot)cocos\2d\platform\winrt;$(EngineRoot)\external\winrt-specific\angle\include;$(EngineRoot)\external\curl\include\wp8;$(EngineRoot)\external\winrt-specific;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\math\kazmath;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\2d\renderer;$(EngineRoot)cocos\ui;$(EngineRoot)cocos;$(EngineRoot)cocos\base;$(EngineRoot)cocos\physics;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external;$(EngineRoot)cocos\editor-support;$(EngineRoot);$(EngineRoot)cocos\math\kazmath\include;$(EngineRoot)cocos\deprecated;$(EngineRoot)external\ConvertUTF;$(GeneratedFilesDir) + $(EngineRoot)cocos\platform\wp8;$(EngineRoot)cocos\platform\winrt;$(EngineRoot)\external\winrt-specific\angle\include;$(EngineRoot)\external\curl\include\wp8;$(EngineRoot)\external\winrt-specific;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external;$(EngineRoot)cocos\editor-support;$(EngineRoot);$(EngineRoot)external\ConvertUTF;$(GeneratedFilesDir) _VARIADIC_MAX=10;NOMINMAX;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true diff --git a/cocos/2d/platform/android/java/project.properties b/cocos/2d/platform/android/java/project.properties deleted file mode 100644 index 88ca83f9d0..0000000000 --- a/cocos/2d/platform/android/java/project.properties +++ /dev/null @@ -1,15 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -android.library=true -# Project target. -target=android-10 diff --git a/cocos/2d/platform/wp8-xaml/CopyTemplateFiles.vcxproj.user b/cocos/2d/platform/wp8-xaml/CopyTemplateFiles.vcxproj.user deleted file mode 100644 index 17f726ed50..0000000000 --- a/cocos/2d/platform/wp8-xaml/CopyTemplateFiles.vcxproj.user +++ /dev/null @@ -1,6 +0,0 @@ - - - - true - - \ No newline at end of file diff --git a/cocos/Android.mk b/cocos/Android.mk index 297a26e97a..22112f4be5 100644 --- a/cocos/Android.mk +++ b/cocos/Android.mk @@ -12,8 +12,8 @@ cocos2d.cpp \ 2d/CCActionCamera.cpp \ 2d/CCActionCatmullRom.cpp \ 2d/CCActionEase.cpp \ -2d/CCActionGrid3D.cpp \ 2d/CCActionGrid.cpp \ +2d/CCActionGrid3D.cpp \ 2d/CCActionInstant.cpp \ 2d/CCActionInterval.cpp \ 2d/CCActionManager.cpp \ @@ -21,30 +21,28 @@ cocos2d.cpp \ 2d/CCActionProgressTimer.cpp \ 2d/CCActionTiledGrid.cpp \ 2d/CCActionTween.cpp \ -2d/CCAnimationCache.cpp \ 2d/CCAnimation.cpp \ +2d/CCAnimationCache.cpp \ 2d/CCAtlasNode.cpp \ -2d/ccCArray.cpp \ 2d/CCClippingNode.cpp \ -2d/CCComponentContainer.cpp \ 2d/CCComponent.cpp \ -2d/CCDrawingPrimitives.cpp \ +2d/CCComponentContainer.cpp \ 2d/CCDrawNode.cpp \ -2d/CCFontAtlasCache.cpp \ -2d/CCFontAtlas.cpp \ -2d/CCFontCharMap.cpp \ +2d/CCDrawingPrimitives.cpp \ 2d/CCFont.cpp \ +2d/CCFontAtlas.cpp \ +2d/CCFontAtlasCache.cpp \ +2d/CCFontCharMap.cpp \ 2d/CCFontFNT.cpp \ 2d/CCFontFreeType.cpp \ 2d/CCGLBufferedNode.cpp \ 2d/CCGrabber.cpp \ 2d/CCGrid.cpp \ -2d/CCIMEDispatcher.cpp \ +2d/CCLabel.cpp \ 2d/CCLabelAtlas.cpp \ 2d/CCLabelBMFont.cpp \ -2d/CCLabel.cpp \ -2d/CCLabelTextFormatter.cpp \ 2d/CCLabelTTF.cpp \ +2d/CCLabelTextFormatter.cpp \ 2d/CCLayer.cpp \ 2d/CCMenu.cpp \ 2d/CCMenuItem.cpp \ @@ -59,45 +57,35 @@ cocos2d.cpp \ 2d/CCProgressTimer.cpp \ 2d/CCRenderTexture.cpp \ 2d/CCScene.cpp \ -2d/CCScriptSupport.cpp \ -2d/CCSpriteBatchNode.cpp \ 2d/CCSprite.cpp \ -2d/CCSpriteFrameCache.cpp \ +2d/CCSpriteBatchNode.cpp \ 2d/CCSpriteFrame.cpp \ -2d/CCTextFieldTTF.cpp \ -2d/CCTexture2D.cpp \ -2d/CCTextureAtlas.cpp \ -2d/CCTextureCache.cpp \ -2d/CCTileMapAtlas.cpp \ +2d/CCSpriteFrameCache.cpp \ 2d/CCTMXLayer.cpp \ 2d/CCTMXObjectGroup.cpp \ 2d/CCTMXTiledMap.cpp \ 2d/CCTMXXMLParser.cpp \ +2d/CCTextFieldTTF.cpp \ +2d/CCTileMapAtlas.cpp \ 2d/CCTransition.cpp \ 2d/CCTransitionPageTurn.cpp \ 2d/CCTransitionProgress.cpp \ 2d/CCTweenFunction.cpp \ -2d/CCUserDefaultAndroid.cpp \ -2d/CCUserDefault.cpp \ -2d/ccUTF8.cpp \ -2d/ccUtils.cpp \ -2d/CCVertex.cpp \ -2d/TGAlib.cpp \ -2d/ccFPSImages.c \ -2d/platform/CCGLViewProtocol.cpp \ -2d/platform/CCFileUtils.cpp \ -2d/platform/CCSAXParser.cpp \ -2d/platform/CCThread.cpp \ -2d/platform/CCImage.cpp \ +platform/CCGLViewProtocol.cpp \ +platform/CCFileUtils.cpp \ +platform/CCSAXParser.cpp \ +platform/CCThread.cpp \ +platform/CCImage.cpp \ math/CCAffineTransform.cpp \ math/CCGeometry.cpp \ +math/CCVertex.cpp \ +math/Mat4.cpp \ math/MathUtil.cpp \ -math/Matrix.cpp \ math/Quaternion.cpp \ math/TransformUtils.cpp \ -math/Vector2.cpp \ -math/Vector3.cpp \ -math/Vector4.cpp \ +math/Vec2.cpp \ +math/Vec3.cpp \ +math/Vec4.cpp \ base/CCAutoreleasePool.cpp \ base/CCConfiguration.cpp \ base/CCConsole.cpp \ @@ -108,40 +96,52 @@ base/CCEvent.cpp \ base/CCEventAcceleration.cpp \ base/CCEventCustom.cpp \ base/CCEventDispatcher.cpp \ +base/CCEventFocus.cpp \ base/CCEventKeyboard.cpp \ base/CCEventListener.cpp \ base/CCEventListenerAcceleration.cpp \ base/CCEventListenerCustom.cpp \ +base/CCEventListenerFocus.cpp \ base/CCEventListenerKeyboard.cpp \ base/CCEventListenerMouse.cpp \ base/CCEventListenerTouch.cpp \ base/CCEventMouse.cpp \ base/CCEventTouch.cpp \ -base/CCEventFocus.cpp \ -base/CCEventListenerFocus.cpp \ +base/CCIMEDispatcher.cpp \ base/CCNS.cpp \ base/CCProfiling.cpp \ base/CCRef.cpp \ base/CCScheduler.cpp \ +base/CCScriptSupport.cpp \ base/CCTouch.cpp \ +base/CCUserDefault.cpp \ +base/CCUserDefaultAndroid.cpp \ base/CCValue.cpp \ +base/TGAlib.cpp \ base/ZipUtils.cpp \ base/atitc.cpp \ base/base64.cpp \ +base/ccCArray.cpp \ +base/ccFPSImages.c \ base/ccTypes.cpp \ +base/ccUTF8.cpp \ +base/ccUtils.cpp \ base/etc1.cpp \ base/s3tc.cpp \ renderer/CCBatchCommand.cpp \ renderer/CCCustomCommand.cpp \ renderer/CCGLProgram.cpp \ +renderer/CCGLProgramCache.cpp \ renderer/CCGLProgramState.cpp \ renderer/CCGLProgramStateCache.cpp \ -renderer/ccGLStateCache.cpp \ renderer/CCGroupCommand.cpp \ renderer/CCQuadCommand.cpp \ renderer/CCRenderCommand.cpp \ renderer/CCRenderer.cpp \ -renderer/CCGLProgramCache.cpp \ +renderer/CCTexture2D.cpp \ +renderer/CCTextureAtlas.cpp \ +renderer/CCTextureCache.cpp \ +renderer/ccGLStateCache.cpp \ renderer/ccShaders.cpp \ deprecated/CCArray.cpp \ deprecated/CCSet.cpp \ @@ -170,8 +170,7 @@ physics/chipmunk/CCPhysicsWorldInfo_chipmunk.cpp \ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \ $(LOCAL_PATH)/. \ - $(LOCAL_PATH)/2d \ - $(LOCAL_PATH)/2d/platform/android \ + $(LOCAL_PATH)/platform/android \ $(LOCAL_PATH)/../external/tinyxml2 \ $(LOCAL_PATH)/../external/unzip \ $(LOCAL_PATH)/../external/chipmunk/include/chipmunk \ @@ -179,7 +178,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) \ LOCAL_C_INCLUDES := $(LOCAL_PATH) \ $(LOCAL_PATH)/. \ - $(LOCAL_PATH)/2d/platform/android \ + $(LOCAL_PATH)/platform/android \ $(LOCAL_PATH)/../external/tinyxml2 \ $(LOCAL_PATH)/../external/unzip \ $(LOCAL_PATH)/../external/chipmunk/include/chipmunk \ @@ -212,4 +211,4 @@ include $(BUILD_STATIC_LIBRARY) $(call import-module,freetype2/prebuilt/android) $(call import-module,chipmunk) -$(call import-module,2d/platform/android) +$(call import-module,platform/android) diff --git a/cocos/CMakeLists.txt b/cocos/CMakeLists.txt index ecc42fc558..7541b3c039 100644 --- a/cocos/CMakeLists.txt +++ b/cocos/CMakeLists.txt @@ -8,6 +8,7 @@ set(COCOS_SRC ) include(2d/CMakeLists.txt) +include(platform/CMakeLists.txt) include(physics/CMakeLists.txt) include(math/CMakeLists.txt) include(renderer/CMakeLists.txt) @@ -20,7 +21,7 @@ include(storage/CMakeLists.txt) add_library(cocos2d STATIC ${COCOS_SRC} ${COCOS_2D_SRC} - ${COCOS_2D_PLATFORM_SRC} + ${COCOS_PLATFORM_SRC} ${COCOS_BASE_SRC} ${COCOS_RENDERER_SRC} ${COCOS_MATH_SRC} diff --git a/cocos/audio/android/Android.mk b/cocos/audio/android/Android.mk index 3da9a20b15..e5f3261840 100644 --- a/cocos/audio/android/Android.mk +++ b/cocos/audio/android/Android.mk @@ -13,11 +13,7 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../include LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include \ $(LOCAL_PATH)/../.. \ - $(LOCAL_PATH)/../../math \ - $(LOCAL_PATH)/../../2d \ - $(LOCAL_PATH)/../../2d/platform/android \ - $(LOCAL_PATH)/../../base \ - $(LOCAL_PATH)/../../physics + $(LOCAL_PATH)/../../platform/android LOCAL_CFLAGS += -Wno-psabi LOCAL_EXPORT_CFLAGS += -Wno-psabi diff --git a/cocos/base/CCConfiguration.cpp b/cocos/base/CCConfiguration.cpp index 4490e975e0..c5b8bd61f1 100644 --- a/cocos/base/CCConfiguration.cpp +++ b/cocos/base/CCConfiguration.cpp @@ -28,7 +28,7 @@ THE SOFTWARE. #include #include "base/ccMacros.h" #include "base/ccConfig.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" NS_CC_BEGIN diff --git a/cocos/base/CCConsole.cpp b/cocos/base/CCConsole.cpp index 7f95c2e595..1eaf59e458 100644 --- a/cocos/base/CCConsole.cpp +++ b/cocos/base/CCConsole.cpp @@ -59,8 +59,8 @@ #include "base/CCPlatformConfig.h" #include "base/CCConfiguration.h" #include "2d/CCScene.h" -#include "2d/platform/CCFileUtils.h" -#include "2d/CCTextureCache.h" +#include "platform/CCFileUtils.h" +#include "renderer/CCTextureCache.h" #include "CCGLView.h" #include "base/base64.h" NS_CC_BEGIN diff --git a/cocos/base/CCData.cpp b/cocos/base/CCData.cpp index 9cff6809e8..fda70d44b7 100644 --- a/cocos/base/CCData.cpp +++ b/cocos/base/CCData.cpp @@ -24,7 +24,7 @@ ****************************************************************************/ #include "base/CCData.h" -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include "base/ccMacros.h" #include diff --git a/cocos/base/CCDirector.cpp b/cocos/base/CCDirector.cpp index 5ac02909d9..791482c1b8 100644 --- a/cocos/base/CCDirector.cpp +++ b/cocos/base/CCDirector.cpp @@ -31,23 +31,24 @@ THE SOFTWARE. // standard includes #include -#include "2d/ccFPSImages.h" #include "2d/CCDrawingPrimitives.h" #include "2d/CCScene.h" #include "2d/CCSpriteFrameCache.h" -#include "2d/platform/CCFileUtils.h" -#include "renderer/ccGLStateCache.h" -#include "2d/platform/CCImage.h" +#include "platform/CCFileUtils.h" +#include "platform/CCImage.h" #include "2d/CCActionManager.h" #include "2d/CCFontFNT.h" #include "2d/CCFontAtlasCache.h" #include "2d/CCAnimationCache.h" -#include "2d/CCUserDefault.h" +#include "2d/CCTransition.h" +#include "2d/CCFontFreeType.h" #include "renderer/CCGLProgramCache.h" #include "renderer/CCGLProgramStateCache.h" -#include "2d/CCTransition.h" -#include "2d/CCTextureCache.h" -#include "2d/CCFontFreeType.h" +#include "renderer/CCTextureCache.h" +#include "renderer/ccGLStateCache.h" +#include "renderer/CCRenderer.h" +#include "base/CCUserDefault.h" +#include "base/ccFPSImages.h" #include "base/CCScheduler.h" #include "base/ccMacros.h" #include "base/CCEventDispatcher.h" @@ -57,7 +58,6 @@ THE SOFTWARE. #include "base/CCAutoreleasePool.h" #include "base/CCProfiling.h" #include "base/CCConfiguration.h" -#include "renderer/CCRenderer.h" #include "base/CCNS.h" #include "math/CCMath.h" #include "CCApplication.h" diff --git a/cocos/base/CCEventListener.cpp b/cocos/base/CCEventListener.cpp index 2c0985b6fd..c6f6acaccd 100644 --- a/cocos/base/CCEventListener.cpp +++ b/cocos/base/CCEventListener.cpp @@ -23,7 +23,7 @@ ****************************************************************************/ #include "base/CCEventListener.h" -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" NS_CC_BEGIN diff --git a/cocos/2d/CCIMEDelegate.h b/cocos/base/CCIMEDelegate.h similarity index 100% rename from cocos/2d/CCIMEDelegate.h rename to cocos/base/CCIMEDelegate.h diff --git a/cocos/2d/CCIMEDispatcher.cpp b/cocos/base/CCIMEDispatcher.cpp similarity index 99% rename from cocos/2d/CCIMEDispatcher.cpp rename to cocos/base/CCIMEDispatcher.cpp index 589d2f8189..c5b59c0110 100644 --- a/cocos/2d/CCIMEDispatcher.cpp +++ b/cocos/base/CCIMEDispatcher.cpp @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "2d/CCIMEDispatcher.h" +#include "base/CCIMEDispatcher.h" #include diff --git a/cocos/2d/CCIMEDispatcher.h b/cocos/base/CCIMEDispatcher.h similarity index 99% rename from cocos/2d/CCIMEDispatcher.h rename to cocos/base/CCIMEDispatcher.h index 6b6a4b1fc7..09b212bff4 100644 --- a/cocos/2d/CCIMEDispatcher.h +++ b/cocos/base/CCIMEDispatcher.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __CC_IME_DISPATCHER_H__ #define __CC_IME_DISPATCHER_H__ -#include "2d/CCIMEDelegate.h" +#include "base/CCIMEDelegate.h" NS_CC_BEGIN diff --git a/cocos/base/CCPlatformConfig.h b/cocos/base/CCPlatformConfig.h index f9e5e698a3..12c1735256 100644 --- a/cocos/base/CCPlatformConfig.h +++ b/cocos/base/CCPlatformConfig.h @@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#ifndef __CC_PLATFORM_CONFIG_H__ -#define __CC_PLATFORM_CONFIG_H__ +#ifndef __BASE_CC_PLATFORM_CONFIG_H__ +#define __BASE_CC_PLATFORM_CONFIG_H__ /** Config of cocos2d-x project, per target platform. @@ -154,5 +154,5 @@ Config of cocos2d-x project, per target platform. #endif #endif // CC_PLATFORM_WIN32 -#endif // __CC_PLATFORM_CONFIG_H__ +#endif // __BASE_CC_PLATFORM_CONFIG_H__ diff --git a/cocos/2d/CCProtocols.h b/cocos/base/CCProtocols.h similarity index 98% rename from cocos/2d/CCProtocols.h rename to cocos/base/CCProtocols.h index 13535409df..b12daa781f 100644 --- a/cocos/2d/CCProtocols.h +++ b/cocos/base/CCProtocols.h @@ -24,12 +24,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#ifndef __CCPROTOCOLS_H__ -#define __CCPROTOCOLS_H__ +#ifndef __BASE_CCPROTOCOLS_H__ +#define __BASE_CCPROTOCOLS_H__ + +#include #include "base/ccTypes.h" -#include "2d/CCTexture2D.h" -#include +#include "renderer/CCTexture2D.h" NS_CC_BEGIN @@ -267,4 +268,4 @@ public: NS_CC_END -#endif // __CCPROTOCOLS_H__ +#endif // __BASE_CCPROTOCOLS_H__ diff --git a/cocos/base/CCRef.cpp b/cocos/base/CCRef.cpp index 9163a32409..1f2c3a4ce7 100644 --- a/cocos/base/CCRef.cpp +++ b/cocos/base/CCRef.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "base/CCRef.h" #include "base/CCAutoreleasePool.h" #include "base/ccMacros.h" -#include "2d/CCScriptSupport.h" +#include "base/CCScriptSupport.h" #if CC_USE_MEM_LEAK_DETECTION #include // std::find diff --git a/cocos/base/CCRef.h b/cocos/base/CCRef.h index e418d3d659..50f8c8b05c 100644 --- a/cocos/base/CCRef.h +++ b/cocos/base/CCRef.h @@ -23,8 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#ifndef __CCREF_H__ -#define __CCREF_H__ +#ifndef __BASE_CCREF_H__ +#define __BASE_CCREF_H__ #include "base/CCPlatformMacros.h" #include "base/ccConfig.h" @@ -172,4 +172,4 @@ typedef void (Ref::*SEL_SCHEDULE)(float); NS_CC_END -#endif // __CCREF_H__ +#endif // __BASE_CCREF_H__ diff --git a/cocos/base/CCScheduler.cpp b/cocos/base/CCScheduler.cpp index 08a6cb6186..3688f74a3c 100644 --- a/cocos/base/CCScheduler.cpp +++ b/cocos/base/CCScheduler.cpp @@ -28,9 +28,9 @@ THE SOFTWARE. #include "base/CCScheduler.h" #include "base/ccMacros.h" #include "base/CCDirector.h" -#include "2d/utlist.h" -#include "2d/ccCArray.h" -#include "2d/CCScriptSupport.h" +#include "base/utlist.h" +#include "base/ccCArray.h" +#include "base/CCScriptSupport.h" NS_CC_BEGIN diff --git a/cocos/base/CCScheduler.h b/cocos/base/CCScheduler.h index 7c7a0a5d6b..51f352770a 100644 --- a/cocos/base/CCScheduler.h +++ b/cocos/base/CCScheduler.h @@ -34,7 +34,7 @@ THE SOFTWARE. #include "base/CCRef.h" #include "base/CCVector.h" -#include "2d/uthash.h" +#include "base/uthash.h" NS_CC_BEGIN diff --git a/cocos/2d/CCScriptSupport.cpp b/cocos/base/CCScriptSupport.cpp similarity index 99% rename from cocos/2d/CCScriptSupport.cpp rename to cocos/base/CCScriptSupport.cpp index 0bf83ef912..f5400c436a 100644 --- a/cocos/2d/CCScriptSupport.cpp +++ b/cocos/base/CCScriptSupport.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "2d/CCScriptSupport.h" +#include "base/CCScriptSupport.h" #if CC_ENABLE_SCRIPT_BINDING diff --git a/cocos/2d/CCScriptSupport.h b/cocos/base/CCScriptSupport.h similarity index 99% rename from cocos/2d/CCScriptSupport.h rename to cocos/base/CCScriptSupport.h index 8bf06a0dcb..ee649a1f9a 100644 --- a/cocos/2d/CCScriptSupport.h +++ b/cocos/base/CCScriptSupport.h @@ -29,7 +29,7 @@ #include "base/ccConfig.h" #if CC_ENABLE_SCRIPT_BINDING -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include "base/CCTouch.h" #include "base/CCEventTouch.h" #include "base/CCEventKeyboard.h" diff --git a/cocos/2d/CCUserDefault.cpp b/cocos/base/CCUserDefault.cpp similarity index 99% rename from cocos/2d/CCUserDefault.cpp rename to cocos/base/CCUserDefault.cpp index 7344507f7c..884e383171 100644 --- a/cocos/2d/CCUserDefault.cpp +++ b/cocos/base/CCUserDefault.cpp @@ -22,9 +22,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "2d/CCUserDefault.h" -#include "2d/platform/CCCommon.h" -#include "2d/platform/CCFileUtils.h" +#include "base/CCUserDefault.h" +#include "platform/CCCommon.h" +#include "platform/CCFileUtils.h" #include "tinyxml2.h" #include "base/base64.h" diff --git a/cocos/2d/CCUserDefault.h b/cocos/base/CCUserDefault.h similarity index 100% rename from cocos/2d/CCUserDefault.h rename to cocos/base/CCUserDefault.h diff --git a/cocos/2d/CCUserDefault.mm b/cocos/base/CCUserDefault.mm similarity index 100% rename from cocos/2d/CCUserDefault.mm rename to cocos/base/CCUserDefault.mm diff --git a/cocos/2d/CCUserDefaultAndroid.cpp b/cocos/base/CCUserDefaultAndroid.cpp similarity index 98% rename from cocos/2d/CCUserDefaultAndroid.cpp rename to cocos/base/CCUserDefaultAndroid.cpp index f24a6a8010..fb96d39e37 100644 --- a/cocos/2d/CCUserDefaultAndroid.cpp +++ b/cocos/base/CCUserDefaultAndroid.cpp @@ -22,13 +22,13 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "2d/CCUserDefault.h" +#include "base/CCUserDefault.h" #include "base/CCPlatformConfig.h" -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include "base/base64.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include "2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" +#include "platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" // root name of xml #define USERDEFAULT_ROOT_NAME "userDefaultRoot" @@ -38,7 +38,7 @@ THE SOFTWARE. #define XML_FILE_NAME "UserDefault.xml" #ifdef KEEP_COMPATABILITY -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "../tinyxml2/tinyxml2.h" #endif diff --git a/cocos/base/CMakeLists.txt b/cocos/base/CMakeLists.txt index 2c7faeb78f..0b628db4ac 100644 --- a/cocos/base/CMakeLists.txt +++ b/cocos/base/CMakeLists.txt @@ -1,36 +1,44 @@ set(COCOS_BASE_SRC - base/atitc.cpp - base/base64.cpp base/CCAutoreleasePool.cpp base/CCConfiguration.cpp base/CCConsole.cpp base/CCData.cpp base/CCDataVisitor.cpp base/CCDirector.cpp - base/CCEventAcceleration.cpp base/CCEvent.cpp + base/CCEventAcceleration.cpp base/CCEventCustom.cpp base/CCEventDispatcher.cpp + base/CCEventFocus.cpp base/CCEventKeyboard.cpp - base/CCEventListenerAcceleration.cpp base/CCEventListener.cpp + base/CCEventListenerAcceleration.cpp base/CCEventListenerCustom.cpp + base/CCEventListenerFocus.cpp base/CCEventListenerKeyboard.cpp base/CCEventListenerMouse.cpp base/CCEventListenerTouch.cpp base/CCEventMouse.cpp base/CCEventTouch.cpp - base/CCEventFocus.cpp - base/CCEventListenerFocus.cpp + base/CCIMEDispatcher.cpp base/CCNS.cpp base/CCProfiling.cpp base/CCRef.cpp base/CCScheduler.cpp + base/CCScriptSupport.cpp base/CCTouch.cpp - base/ccTypes.cpp + base/CCUserDefault.cpp + base/CCUserDefaultAndroid.cpp base/CCValue.cpp + base/TGAlib.cpp + base/ZipUtils.cpp + base/atitc.cpp + base/base64.cpp + base/ccCArray.cpp + base/ccFPSImages.c + base/ccTypes.cpp + base/ccUTF8.cpp + base/ccUtils.cpp base/etc1.cpp base/s3tc.cpp - base/ZipUtils.cpp ) - diff --git a/cocos/2d/TGAlib.cpp b/cocos/base/TGAlib.cpp similarity index 99% rename from cocos/2d/TGAlib.cpp rename to cocos/base/TGAlib.cpp index abcd90ebb3..5c097f6c46 100644 --- a/cocos/2d/TGAlib.cpp +++ b/cocos/base/TGAlib.cpp @@ -28,7 +28,7 @@ THE SOFTWARE. #include "TGAlib.h" #include "base/CCData.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" NS_CC_BEGIN diff --git a/cocos/2d/TGAlib.h b/cocos/base/TGAlib.h similarity index 100% rename from cocos/2d/TGAlib.h rename to cocos/base/TGAlib.h diff --git a/cocos/base/ZipUtils.cpp b/cocos/base/ZipUtils.cpp index ffe6b5941c..c5f7e26011 100644 --- a/cocos/base/ZipUtils.cpp +++ b/cocos/base/ZipUtils.cpp @@ -29,7 +29,7 @@ #include "base/ZipUtils.h" #include "base/CCData.h" #include "base/ccMacros.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "unzip.h" #include diff --git a/cocos/base/ZipUtils.h b/cocos/base/ZipUtils.h index 9df427e943..d6b1e20c9a 100644 --- a/cocos/base/ZipUtils.h +++ b/cocos/base/ZipUtils.h @@ -31,7 +31,7 @@ THE SOFTWARE. #include "base/CCPlatformMacros.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) -#include "2d/platform/android/CCFileUtilsAndroid.h" +#include "platform/android/CCFileUtilsAndroid.h" #elif(CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) || (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) // for import ssize_t on win32 platform #include "CCStdC.h" diff --git a/cocos/2d/ccCArray.cpp b/cocos/base/ccCArray.cpp similarity index 99% rename from cocos/2d/ccCArray.cpp rename to cocos/base/ccCArray.cpp index 78e7c2cfc7..a9a463e624 100644 --- a/cocos/2d/ccCArray.cpp +++ b/cocos/base/ccCArray.cpp @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "2d/ccCArray.h" +#include "base/ccCArray.h" #include "base/CCRef.h" #include "base/ccTypes.h" diff --git a/cocos/2d/ccCArray.h b/cocos/base/ccCArray.h similarity index 100% rename from cocos/2d/ccCArray.h rename to cocos/base/ccCArray.h diff --git a/cocos/2d/ccFPSImages.c b/cocos/base/ccFPSImages.c similarity index 99% rename from cocos/2d/ccFPSImages.c rename to cocos/base/ccFPSImages.c index 7beb7309e3..725491f9b1 100644 --- a/cocos/2d/ccFPSImages.c +++ b/cocos/base/ccFPSImages.c @@ -23,7 +23,7 @@ * THE SOFTWARE. */ -#include "ccFPSImages.h" +#include "base/ccFPSImages.h" unsigned char cc_fps_images_png[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, diff --git a/cocos/2d/ccFPSImages.h b/cocos/base/ccFPSImages.h similarity index 93% rename from cocos/2d/ccFPSImages.h rename to cocos/base/ccFPSImages.h index ad9f012692..02fd5a83dd 100644 --- a/cocos/2d/ccFPSImages.h +++ b/cocos/base/ccFPSImages.h @@ -22,8 +22,8 @@ * THE SOFTWARE. */ -#ifndef __CCFPSIMAGES__H -#define __CCFPSIMAGES__H +#ifndef __BASE_CCFPSIMAGES__H +#define __BASE_CCFPSIMAGES__H #ifdef __cplusplus extern "C" { @@ -36,4 +36,4 @@ unsigned int cc_fps_images_len(void); } #endif -#endif // __CCFPSIMAGES__H +#endif // __BASE_CCFPSIMAGES__H diff --git a/cocos/base/ccMacros.h b/cocos/base/ccMacros.h index 476a1e0de7..165dbab7cf 100644 --- a/cocos/base/ccMacros.h +++ b/cocos/base/ccMacros.h @@ -25,8 +25,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#ifndef __CCMACROS_H__ -#define __CCMACROS_H__ +#ifndef __BASE_CCMACROS_H__ +#define __BASE_CCMACROS_H__ #ifndef _USE_MATH_DEFINES #define _USE_MATH_DEFINES @@ -276,4 +276,4 @@ It should work same as apples CFSwapInt32LittleToHost(..) #define CC_CALLBACK_2(__selector__,__target__, ...) std::bind(&__selector__,__target__, std::placeholders::_1, std::placeholders::_2, ##__VA_ARGS__) #define CC_CALLBACK_3(__selector__,__target__, ...) std::bind(&__selector__,__target__, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, ##__VA_ARGS__) -#endif // __CCMACROS_H__ +#endif // __BASE_CCMACROS_H__ diff --git a/cocos/base/ccTypes.h b/cocos/base/ccTypes.h index 3b884d55a8..f447c4de5b 100644 --- a/cocos/base/ccTypes.h +++ b/cocos/base/ccTypes.h @@ -25,10 +25,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#ifndef __CCTYPES_H__ -#define __CCTYPES_H__ +#ifndef __BASE_CCTYPES_H__ +#define __BASE_CCTYPES_H__ #include + #include "math/CCGeometry.h" #include "math/CCMath.h" #include "CCGL.h" @@ -478,4 +479,4 @@ extern const ssize_t CC_INVALID_INDEX; NS_CC_END -#endif //__CCTYPES_H__ +#endif //__BASE_CCTYPES_H__ diff --git a/cocos/2d/ccUTF8.cpp b/cocos/base/ccUTF8.cpp similarity index 99% rename from cocos/2d/ccUTF8.cpp rename to cocos/base/ccUTF8.cpp index b3a68da20a..fd9514f4c9 100644 --- a/cocos/2d/ccUTF8.cpp +++ b/cocos/base/ccUTF8.cpp @@ -24,7 +24,7 @@ ****************************************************************************/ #include "ccUTF8.h" -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include "base/CCConsole.h" #include "ConvertUTF.h" diff --git a/cocos/2d/ccUTF8.h b/cocos/base/ccUTF8.h similarity index 100% rename from cocos/2d/ccUTF8.h rename to cocos/base/ccUTF8.h diff --git a/cocos/2d/ccUtils.cpp b/cocos/base/ccUtils.cpp similarity index 98% rename from cocos/2d/ccUtils.cpp rename to cocos/base/ccUtils.cpp index 456cb573a3..55182df253 100644 --- a/cocos/2d/ccUtils.cpp +++ b/cocos/base/ccUtils.cpp @@ -22,7 +22,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "2d/ccUtils.h" + +#include "base/ccUtils.h" namespace cocos2d { diff --git a/cocos/2d/ccUtils.h b/cocos/base/ccUtils.h similarity index 100% rename from cocos/2d/ccUtils.h rename to cocos/base/ccUtils.h diff --git a/cocos/2d/firePngData.h b/cocos/base/firePngData.h similarity index 100% rename from cocos/2d/firePngData.h rename to cocos/base/firePngData.h diff --git a/cocos/2d/uthash.h b/cocos/base/uthash.h similarity index 100% rename from cocos/2d/uthash.h rename to cocos/base/uthash.h diff --git a/cocos/2d/utlist.h b/cocos/base/utlist.h similarity index 100% rename from cocos/2d/utlist.h rename to cocos/base/utlist.h diff --git a/cocos/2d/cocos2dx-Prefix.pch b/cocos/cocos2d-prefix.pch similarity index 100% rename from cocos/2d/cocos2dx-Prefix.pch rename to cocos/cocos2d-prefix.pch diff --git a/cocos/cocos2d.h b/cocos/cocos2d.h index 143678e877..b26c4026e1 100644 --- a/cocos/cocos2d.h +++ b/cocos/cocos2d.h @@ -56,8 +56,13 @@ THE SOFTWARE. #include "base/ZipUtils.h" #include "base/CCProfiling.h" #include "base/CCConsole.h" +#include "base/ccUTF8.h" +#include "base/CCUserDefault.h" +#include "base/CCIMEDelegate.h" +#include "base/CCIMEDispatcher.h" // EventDispatcher +#include "base/CCEventType.h" #include "base/CCEventDispatcher.h" #include "base/CCEventListenerTouch.h" #include "base/CCEventTouch.h" @@ -75,12 +80,13 @@ THE SOFTWARE. // math #include "math/CCAffineTransform.h" #include "math/CCGeometry.h" -#include "math/Vector2.h" -#include "math/Vector3.h" -#include "math/Vector4.h" -#include "math/Matrix.h" +#include "math/Vec2.h" +#include "math/Vec3.h" +#include "math/Vec4.h" +#include "math/Mat4.h" #include "math/Quaternion.h" #include "math/MathUtil.h" +#include "math/CCVertex.h" // actions #include "2d/CCAction.h" @@ -130,10 +136,9 @@ THE SOFTWARE. #include "2d/CCGrid.h" // include -#include "base/CCEventType.h" -#include "2d/CCProtocols.h" +#include "base/CCProtocols.h" -// new renderer +// renderer #include "renderer/CCCustomCommand.h" #include "renderer/CCGroupCommand.h" #include "renderer/CCQuadCommand.h" @@ -145,6 +150,8 @@ THE SOFTWARE. #include "renderer/CCGLProgramState.h" #include "renderer/ccGLStateCache.h" #include "renderer/ccShaders.h" +#include "renderer/CCTexture2D.h" +#include "renderer/CCTextureCache.h" // physics #include "physics/CCPhysicsBody.h" @@ -154,75 +161,75 @@ THE SOFTWARE. #include "physics/CCPhysicsWorld.h" // platform -#include "2d/platform/CCDevice.h" -#include "2d/platform/CCCommon.h" -#include "2d/platform/CCFileUtils.h" -#include "2d/platform/CCImage.h" -#include "2d/platform/CCSAXParser.h" -#include "2d/platform/CCThread.h" +#include "platform/CCDevice.h" +#include "platform/CCCommon.h" +#include "platform/CCFileUtils.h" +#include "platform/CCImage.h" +#include "platform/CCSAXParser.h" +#include "platform/CCThread.h" #include "base/CCPlatformConfig.h" #include "base/CCPlatformMacros.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) - #include "2d/platform/ios/CCApplication.h" - #include "2d/platform/ios/CCGLView.h" - #include "2d/platform/ios/CCGL.h" - #include "2d/platform/ios/CCStdC.h" + #include "platform/ios/CCApplication.h" + #include "platform/ios/CCGLView.h" + #include "platform/ios/CCGL.h" + #include "platform/ios/CCStdC.h" #endif // CC_TARGET_PLATFORM == CC_PLATFORM_IOS #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) - #include "2d/platform/android/CCApplication.h" - #include "2d/platform/android/CCGLView.h" - #include "2d/platform/android/CCGL.h" - #include "2d/platform/android/CCStdC.h" + #include "platform/android/CCApplication.h" + #include "platform/android/CCGLView.h" + #include "platform/android/CCGL.h" + #include "platform/android/CCStdC.h" #endif // CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID #if (CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY) - #include "2d/platform/blackberry/CCApplication.h" - #include "2d/platform/blackberry/CCGLView.h" - #include "2d/platform/blackberry/CCGL.h" - #include "2d/platform/blackberry/CCStdC.h" + #include "platform/blackberry/CCApplication.h" + #include "platform/blackberry/CCGLView.h" + #include "platform/blackberry/CCGL.h" + #include "platform/blackberry/CCStdC.h" #endif // CC_TARGET_PLATFORM == CC_PLATFORM_BLACKBERRY #if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) - #include "2d/platform/win32/CCApplication.h" - #include "2d/platform/desktop/CCGLView.h" - #include "2d/platform/win32/CCGL.h" - #include "2d/platform/win32/CCStdC.h" + #include "platform/win32/CCApplication.h" + #include "platform/desktop/CCGLView.h" + #include "platform/win32/CCGL.h" + #include "platform/win32/CCStdC.h" #endif // CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) - #include "2d/platform/mac/CCApplication.h" - #include "2d/platform/desktop/CCGLView.h" - #include "2d/platform/mac/CCGL.h" - #include "2d/platform/mac/CCStdC.h" + #include "platform/mac/CCApplication.h" + #include "platform/desktop/CCGLView.h" + #include "platform/mac/CCGL.h" + #include "platform/mac/CCStdC.h" #endif // CC_TARGET_PLATFORM == CC_PLATFORM_MAC #if (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX) - #include "2d/platform/linux/CCApplication.h" - #include "2d/platform/desktop/CCGLView.h" - #include "2d/platform/linux/CCGL.h" - #include "2d/platform/linux/CCStdC.h" + #include "platform/linux/CCApplication.h" + #include "platform/desktop/CCGLView.h" + #include "platform/linux/CCGL.h" + #include "platform/linux/CCStdC.h" #endif // CC_TARGET_PLATFORM == CC_PLATFORM_LINUX #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) - #include "2d/platform/winrt/CCApplication.h" - #include "2d/platform/winrt/CCGLView.h" - #include "2d/platform/winrt/CCGL.h" - #include "2d/platform/winrt/CCStdC.h" - #include "2d/platform/winrt/CCPrecompiledShaders.h" + #include "platform/winrt/CCApplication.h" + #include "platform/winrt/CCGLView.h" + #include "platform/winrt/CCGL.h" + #include "platform/winrt/CCStdC.h" + #include "platform/winrt/CCPrecompiledShaders.h" #endif // CC_TARGET_PLATFORM == CC_PLATFORM_WINRT #if (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) - #include "2d/platform/winrt/CCApplication.h" - #include "2d/platform/wp8/CCGLView.h" - #include "2d/platform/winrt/CCGL.h" - #include "2d/platform/winrt/CCStdC.h" - #include "2d/platform/winrt/CCPrecompiledShaders.h" + #include "platform/winrt/CCApplication.h" + #include "platform/wp8/CCGLView.h" + #include "platform/winrt/CCGL.h" + #include "platform/winrt/CCStdC.h" + #include "platform/winrt/CCPrecompiledShaders.h" #endif // CC_TARGET_PLATFORM == CC_PLATFORM_WP8 // script_support -#include "2d/CCScriptSupport.h" +#include "base/CCScriptSupport.h" // sprite_nodes #include "2d/CCAnimation.h" @@ -232,20 +239,11 @@ THE SOFTWARE. #include "2d/CCSpriteFrame.h" #include "2d/CCSpriteFrameCache.h" -// support -#include "2d/ccUTF8.h" -#include "2d/CCUserDefault.h" -#include "2d/CCVertex.h" - // text_input_node -#include "2d/CCIMEDelegate.h" -#include "2d/CCIMEDispatcher.h" #include "2d/CCTextFieldTTF.h" // textures -#include "2d/CCTexture2D.h" -#include "2d/CCTextureAtlas.h" -#include "2d/CCTextureCache.h" +#include "renderer/CCTextureAtlas.h" // tilemap_parallax_nodes #include "2d/CCParallaxNode.h" diff --git a/cocos/deprecated/CCArray.cpp b/cocos/deprecated/CCArray.cpp index a3778e19fc..80118faa74 100644 --- a/cocos/deprecated/CCArray.cpp +++ b/cocos/deprecated/CCArray.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "CCArray.h" #include "deprecated/CCString.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" NS_CC_BEGIN diff --git a/cocos/deprecated/CCArray.h b/cocos/deprecated/CCArray.h index a6361e1b80..c06bd5e6b0 100644 --- a/cocos/deprecated/CCArray.h +++ b/cocos/deprecated/CCArray.h @@ -34,7 +34,7 @@ THE SOFTWARE. #include "base/CCRef.h" #include "base/ccMacros.h" #else -#include "2d/ccCArray.h" +#include "base/ccCArray.h" #endif #include "base/CCDataVisitor.h" diff --git a/cocos/deprecated/CCDictionary.cpp b/cocos/deprecated/CCDictionary.cpp index 7552d9285b..96ae7dcc7a 100644 --- a/cocos/deprecated/CCDictionary.cpp +++ b/cocos/deprecated/CCDictionary.cpp @@ -26,7 +26,7 @@ #include "CCDictionary.h" #include "deprecated/CCString.h" #include "CCInteger.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "deprecated/CCString.h" #include "CCBool.h" #include "CCInteger.h" diff --git a/cocos/deprecated/CCDictionary.h b/cocos/deprecated/CCDictionary.h index 1993a81d56..5bd701c10a 100644 --- a/cocos/deprecated/CCDictionary.h +++ b/cocos/deprecated/CCDictionary.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __CCDICTIONARY_H__ #define __CCDICTIONARY_H__ -#include "2d/uthash.h" +#include "base/uthash.h" #include "base/CCRef.h" #include "CCArray.h" #include "deprecated/CCString.h" diff --git a/cocos/deprecated/CCInteger.h b/cocos/deprecated/CCInteger.h index c78d5eba74..c3710eaf49 100644 --- a/cocos/deprecated/CCInteger.h +++ b/cocos/deprecated/CCInteger.h @@ -27,7 +27,7 @@ #include "base/CCRef.h" #include "base/CCDataVisitor.h" -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" NS_CC_BEGIN diff --git a/cocos/deprecated/CCNotificationCenter.cpp b/cocos/deprecated/CCNotificationCenter.cpp index 837ac6f8dc..7fec442329 100644 --- a/cocos/deprecated/CCNotificationCenter.cpp +++ b/cocos/deprecated/CCNotificationCenter.cpp @@ -24,11 +24,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCNotificationCenter.h" -#include "deprecated/CCArray.h" -#include "2d/CCScriptSupport.h" +#include "deprecated/CCNotificationCenter.h" + #include +#include "base/CCScriptSupport.h" +#include "deprecated/CCArray.h" + using namespace std; NS_CC_BEGIN diff --git a/cocos/deprecated/CCString.cpp b/cocos/deprecated/CCString.cpp index 311c250bc0..8492573d70 100644 --- a/cocos/deprecated/CCString.cpp +++ b/cocos/deprecated/CCString.cpp @@ -24,7 +24,7 @@ Copyright (c) 2013-2014 Chukong Technologies ****************************************************************************/ #include "deprecated/CCString.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "base/ccMacros.h" #include #include diff --git a/cocos/editor-support/cocosbuilder/CCBReader.cpp b/cocos/editor-support/cocosbuilder/CCBReader.cpp index a224629a71..60bb3119fd 100644 --- a/cocos/editor-support/cocosbuilder/CCBReader.cpp +++ b/cocos/editor-support/cocosbuilder/CCBReader.cpp @@ -2,10 +2,10 @@ #include #include "base/CCDirector.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "2d/CCScene.h" -#include "2d/CCTextureCache.h" #include "2d/CCSpriteFrameCache.h" +#include "renderer/CCTextureCache.h" #include "CCBReader.h" #include "CCNodeLoader.h" diff --git a/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp b/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp index a2ab0aecf7..cea37b4e63 100644 --- a/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp +++ b/cocos/editor-support/cocostudio/CCDataReaderHelper.cpp @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "base/CCDirector.h" #include "base/CCScheduler.h" diff --git a/cocos/editor-support/cocostudio/CCInputDelegate.cpp b/cocos/editor-support/cocostudio/CCInputDelegate.cpp index 6f1dc7a5ed..7bc3d50526 100644 --- a/cocos/editor-support/cocostudio/CCInputDelegate.cpp +++ b/cocos/editor-support/cocostudio/CCInputDelegate.cpp @@ -24,7 +24,7 @@ THE SOFTWARE. #include "cocostudio/CCInputDelegate.h" #include "base/CCDirector.h" -#include "2d/platform/CCDevice.h" +#include "platform/CCDevice.h" #include "base/CCEventListenerTouch.h" #include "base/CCEventListenerAcceleration.h" #include "base/CCEventListenerKeyboard.h" diff --git a/cocos/editor-support/spine/CCSkeleton.h b/cocos/editor-support/spine/CCSkeleton.h index 3b44e667df..dbcde2fb2c 100644 --- a/cocos/editor-support/spine/CCSkeleton.h +++ b/cocos/editor-support/spine/CCSkeleton.h @@ -37,8 +37,8 @@ #include #include "2d/CCNode.h" -#include "2d/CCProtocols.h" -#include "2d/CCTextureAtlas.h" +#include "base/CCProtocols.h" +#include "renderer/CCTextureAtlas.h" #include "renderer/CCCustomCommand.h" namespace spine { diff --git a/cocos/math/CCMath.h b/cocos/math/CCMath.h index e5f1daa130..7ea6798945 100644 --- a/cocos/math/CCMath.h +++ b/cocos/math/CCMath.h @@ -1,10 +1,10 @@ #ifndef __CC_MATH_H__ #define __CC_MATH_H__ -#include "Vector2.h" -#include "Vector3.h" -#include "Vector4.h" -#include "Matrix.h" +#include "Vec2.h" +#include "Vec3.h" +#include "Vec4.h" +#include "Mat4.h" #include "Quaternion.h" #endif \ No newline at end of file diff --git a/cocos/2d/CCVertex.cpp b/cocos/math/CCVertex.cpp similarity index 99% rename from cocos/2d/CCVertex.cpp rename to cocos/math/CCVertex.cpp index 8a96b2c2ee..5a9673d0db 100644 --- a/cocos/2d/CCVertex.cpp +++ b/cocos/math/CCVertex.cpp @@ -24,7 +24,7 @@ THE SOFTWARE. ****************************************************************************/ -#include "2d/CCVertex.h" +#include "math/CCVertex.h" #include "base/ccMacros.h" NS_CC_BEGIN diff --git a/cocos/2d/CCVertex.h b/cocos/math/CCVertex.h similarity index 100% rename from cocos/2d/CCVertex.h rename to cocos/math/CCVertex.h diff --git a/cocos/math/CMakeLists.txt b/cocos/math/CMakeLists.txt index df76392225..e7f2a0012b 100644 --- a/cocos/math/CMakeLists.txt +++ b/cocos/math/CMakeLists.txt @@ -1,12 +1,13 @@ set(COCOS_MATH_SRC - math/CCAffineTransform.cpp - math/CCGeometry.cpp - math/MathUtil.cpp - math/Matrix.cpp - math/Quaternion.cpp - math/TransformUtils.cpp - math/Vector2.cpp - math/Vector3.cpp - math/Vector4.cpp + math/CCAffineTransform.cpp + math/CCGeometry.cpp + math/CCVertex.cpp + math/Mat4.cpp + math/MathUtil.cpp + math/Quaternion.cpp + math/TransformUtils.cpp + math/Vec2.cpp + math/Vec3.cpp + math/Vec4.cpp ) diff --git a/cocos/math/Matrix.cpp b/cocos/math/Mat4.cpp similarity index 99% rename from cocos/math/Matrix.cpp rename to cocos/math/Mat4.cpp index c904b758f4..cd6217f1ad 100644 --- a/cocos/math/Matrix.cpp +++ b/cocos/math/Mat4.cpp @@ -18,9 +18,9 @@ This file was modified to fit the cocos2d-x project */ -#include "Matrix.h" -#include "Quaternion.h" -#include "MathUtil.h" +#include "math/Mat4.h" +#include "math/Quaternion.h" +#include "math/MathUtil.h" #include "base/ccMacros.h" NS_CC_MATH_BEGIN diff --git a/cocos/math/Matrix.h b/cocos/math/Mat4.h similarity index 99% rename from cocos/math/Matrix.h rename to cocos/math/Mat4.h index 1513599f53..077e5c0882 100644 --- a/cocos/math/Matrix.h +++ b/cocos/math/Mat4.h @@ -21,8 +21,8 @@ #ifndef MATH_MAT4_H #define MATH_MAT4_H -#include "math/Vector3.h" -#include "math/Vector4.h" +#include "math/Vec3.h" +#include "math/Vec4.h" NS_CC_MATH_BEGIN @@ -980,6 +980,6 @@ inline const Vec4 operator*(const Mat4& m, const Vec4& v); NS_CC_MATH_END -#include "Matrix.inl" +#include "math/Mat4.inl" #endif // MATH_MAT4_H diff --git a/cocos/math/Matrix.inl b/cocos/math/Mat4.inl similarity index 98% rename from cocos/math/Matrix.inl rename to cocos/math/Mat4.inl index 3ae3fc8c2d..ca01271d7c 100644 --- a/cocos/math/Matrix.inl +++ b/cocos/math/Mat4.inl @@ -18,7 +18,7 @@ This file was modified to fit the cocos2d-x project */ -#include "Matrix.h" +#include "math/Mat4.h" NS_CC_MATH_BEGIN diff --git a/cocos/math/Quaternion.h b/cocos/math/Quaternion.h index 73a7163807..bd8bc47db3 100644 --- a/cocos/math/Quaternion.h +++ b/cocos/math/Quaternion.h @@ -21,8 +21,8 @@ #ifndef QUATERNION_H_ #define QUATERNION_H_ -#include "Vector3.h" -#include "Matrix.h" +#include "math/Vec3.h" +#include "math/Mat4.h" //#include "Plane.h" NS_CC_MATH_BEGIN diff --git a/cocos/math/Vector2.cpp b/cocos/math/Vec2.cpp similarity index 98% rename from cocos/math/Vector2.cpp rename to cocos/math/Vec2.cpp index 0b0df415cd..c12a8e5ad3 100644 --- a/cocos/math/Vector2.cpp +++ b/cocos/math/Vec2.cpp @@ -18,7 +18,7 @@ This file was modified to fit the cocos2d-x project */ -#include "math/Vector2.h" +#include "math/Vec2.h" #include "math/MathUtil.h" #include "base/ccMacros.h" @@ -27,10 +27,10 @@ NS_CC_MATH_BEGIN // returns true if segment A-B intersects with segment C-D. S->E is the ovderlap part bool isOneDimensionSegmentOverlap(float A, float B, float C, float D, float *S, float * E) { - float ABmin = MIN(A, B); - float ABmax = MAX(A, B); - float CDmin = MIN(C, D); - float CDmax = MAX(C, D); + float ABmin = std::min(A, B); + float ABmax = std::max(A, B); + float CDmin = std::min(C, D); + float CDmax = std::max(C, D); if (ABmax < CDmin || CDmax < ABmin) { diff --git a/cocos/math/Vector2.h b/cocos/math/Vec2.h similarity index 99% rename from cocos/math/Vector2.h rename to cocos/math/Vec2.h index 0b5d9cb9c7..059d646c88 100644 --- a/cocos/math/Vector2.h +++ b/cocos/math/Vec2.h @@ -747,6 +747,6 @@ typedef Vec2 Point2; NS_CC_MATH_END -#include "Vector2.inl" +#include "Vec2.inl" #endif // MATH_VEC2_H diff --git a/cocos/math/Vector2.inl b/cocos/math/Vec2.inl similarity index 98% rename from cocos/math/Vector2.inl rename to cocos/math/Vec2.inl index 9108765efc..329208b1e5 100644 --- a/cocos/math/Vector2.inl +++ b/cocos/math/Vec2.inl @@ -18,7 +18,7 @@ This file was modified to fit the cocos2d-x project */ -#include "Vector2.h" +#include "math/Vec2.h" NS_CC_MATH_BEGIN diff --git a/cocos/math/Vector3.cpp b/cocos/math/Vec3.cpp similarity index 99% rename from cocos/math/Vector3.cpp rename to cocos/math/Vec3.cpp index 766aa822e3..63955842c0 100644 --- a/cocos/math/Vector3.cpp +++ b/cocos/math/Vec3.cpp @@ -18,8 +18,8 @@ This file was modified to fit the cocos2d-x project */ -#include "Vector3.h" -#include "MathUtil.h" +#include "math/Vec3.h" +#include "math/MathUtil.h" #include "base/ccMacros.h" NS_CC_MATH_BEGIN diff --git a/cocos/math/Vector3.h b/cocos/math/Vec3.h similarity index 99% rename from cocos/math/Vector3.h rename to cocos/math/Vec3.h index 2ebfa8fd88..5521ab1505 100644 --- a/cocos/math/Vector3.h +++ b/cocos/math/Vec3.h @@ -471,6 +471,6 @@ typedef Vec3 Point3; NS_CC_MATH_END -#include "Vector3.inl" +#include "Vec3.inl" #endif // MATH_VEC3_H diff --git a/cocos/math/Vector3.inl b/cocos/math/Vec3.inl similarity index 97% rename from cocos/math/Vector3.inl rename to cocos/math/Vec3.inl index 8bd30d61c0..2bfbc74d8d 100644 --- a/cocos/math/Vector3.inl +++ b/cocos/math/Vec3.inl @@ -18,8 +18,8 @@ This file was modified to fit the cocos2d-x project */ -#include "Vector3.h" -#include "Matrix.h" +#include "math/Vec3.h" +#include "math/Mat4.h" NS_CC_MATH_BEGIN diff --git a/cocos/math/Vector4.cpp b/cocos/math/Vec4.cpp similarity index 99% rename from cocos/math/Vector4.cpp rename to cocos/math/Vec4.cpp index 3c8f8223c1..c78281300b 100644 --- a/cocos/math/Vector4.cpp +++ b/cocos/math/Vec4.cpp @@ -18,8 +18,8 @@ This file was modified to fit the cocos2d-x project */ -#include "Vector4.h" -#include "MathUtil.h" +#include "math/Vec4.h" +#include "math/MathUtil.h" #include "base/ccMacros.h" NS_CC_MATH_BEGIN diff --git a/cocos/math/Vector4.h b/cocos/math/Vec4.h similarity index 99% rename from cocos/math/Vector4.h rename to cocos/math/Vec4.h index ce12686b92..2523978ce4 100644 --- a/cocos/math/Vector4.h +++ b/cocos/math/Vec4.h @@ -446,6 +446,6 @@ inline const Vec4 operator*(float x, const Vec4& v); NS_CC_MATH_END -#include "Vector4.inl" +#include "math/Vec4.inl" #endif // MATH_VEC4_H diff --git a/cocos/math/Vector4.inl b/cocos/math/Vec4.inl similarity index 97% rename from cocos/math/Vector4.inl rename to cocos/math/Vec4.inl index 9bdd7a9920..d69aee16f1 100644 --- a/cocos/math/Vector4.inl +++ b/cocos/math/Vec4.inl @@ -18,8 +18,8 @@ This file was modified to fit the cocos2d-x project */ -#include "Matrix.h" -#include "Vector4.h" +#include "math/Mat4.h" +#include "math/Vec4.h" NS_CC_MATH_BEGIN diff --git a/cocos/network/HttpClient.cpp b/cocos/network/HttpClient.cpp index da18c9f2b9..2af83c8dee 100644 --- a/cocos/network/HttpClient.cpp +++ b/cocos/network/HttpClient.cpp @@ -38,7 +38,7 @@ #include "curl/curl.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/CCApplicationProtocol.h b/cocos/platform/CCApplicationProtocol.h similarity index 100% rename from cocos/2d/platform/CCApplicationProtocol.h rename to cocos/platform/CCApplicationProtocol.h diff --git a/cocos/2d/platform/CCCommon.h b/cocos/platform/CCCommon.h similarity index 100% rename from cocos/2d/platform/CCCommon.h rename to cocos/platform/CCCommon.h diff --git a/cocos/2d/platform/CCDevice.h b/cocos/platform/CCDevice.h similarity index 100% rename from cocos/2d/platform/CCDevice.h rename to cocos/platform/CCDevice.h diff --git a/cocos/2d/platform/CCFileUtils.cpp b/cocos/platform/CCFileUtils.cpp similarity index 99% rename from cocos/2d/platform/CCFileUtils.cpp rename to cocos/platform/CCFileUtils.cpp index e615f70e21..af4a22ab26 100644 --- a/cocos/2d/platform/CCFileUtils.cpp +++ b/cocos/platform/CCFileUtils.cpp @@ -24,13 +24,17 @@ THE SOFTWARE. ****************************************************************************/ #include "CCFileUtils.h" + +#include + #include "base/CCData.h" #include "base/ccMacros.h" #include "base/CCDirector.h" -#include "CCSAXParser.h" +#include "platform/CCSAXParser.h" + #include "tinyxml2.h" #include "unzip.h" -#include + using namespace std; diff --git a/cocos/2d/platform/CCFileUtils.h b/cocos/platform/CCFileUtils.h similarity index 100% rename from cocos/2d/platform/CCFileUtils.h rename to cocos/platform/CCFileUtils.h index 567f17249c..60e899ed35 100644 --- a/cocos/2d/platform/CCFileUtils.h +++ b/cocos/platform/CCFileUtils.h @@ -25,15 +25,15 @@ THE SOFTWARE. #ifndef __CC_FILEUTILS_H__ #define __CC_FILEUTILS_H__ +#include +#include +#include + #include "base/CCPlatformMacros.h" #include "base/ccTypes.h" #include "base/CCValue.h" #include "base/CCData.h" -#include -#include -#include - NS_CC_BEGIN /** diff --git a/cocos/2d/platform/CCGLViewProtocol.cpp b/cocos/platform/CCGLViewProtocol.cpp similarity index 99% rename from cocos/2d/platform/CCGLViewProtocol.cpp rename to cocos/platform/CCGLViewProtocol.cpp index ffd2632bce..d2f821ac8b 100644 --- a/cocos/2d/platform/CCGLViewProtocol.cpp +++ b/cocos/platform/CCGLViewProtocol.cpp @@ -23,7 +23,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCGLViewProtocol.h" +#include "platform/CCGLViewProtocol.h" + #include "base/CCTouch.h" #include "base/CCDirector.h" #include "base/CCEventDispatcher.h" diff --git a/cocos/2d/platform/CCGLViewProtocol.h b/cocos/platform/CCGLViewProtocol.h similarity index 100% rename from cocos/2d/platform/CCGLViewProtocol.h rename to cocos/platform/CCGLViewProtocol.h diff --git a/cocos/2d/platform/CCImage.cpp b/cocos/platform/CCImage.cpp similarity index 99% rename from cocos/2d/platform/CCImage.cpp rename to cocos/platform/CCImage.cpp index 254ab5b880..193fe50d53 100644 --- a/cocos/2d/platform/CCImage.cpp +++ b/cocos/platform/CCImage.cpp @@ -24,12 +24,14 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCImage.h" -#include "base/CCData.h" +#include "platform/CCImage.h" #include #include +#include "base/CCData.h" + + #ifdef EMSCRIPTEN #include #include @@ -44,7 +46,7 @@ extern "C" } #include "base/s3tc.h" #include "base/atitc.h" -#include "2d/TGAlib.h" +#include "base/TGAlib.h" #if (CC_TARGET_PLATFORM != CC_PLATFORM_WP8) && (CC_TARGET_PLATFORM != CC_PLATFORM_WINRT) #include "decode.h" @@ -55,7 +57,7 @@ extern "C" #include "CCStdC.h" #include "CCFileUtils.h" #include "base/CCConfiguration.h" -#include "2d/ccUtils.h" +#include "base/ccUtils.h" #include "base/ZipUtils.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) #include "android/CCFileUtilsAndroid.h" diff --git a/cocos/2d/platform/CCImage.h b/cocos/platform/CCImage.h similarity index 99% rename from cocos/2d/platform/CCImage.h rename to cocos/platform/CCImage.h index 000beace1a..6762204b05 100644 --- a/cocos/2d/platform/CCImage.h +++ b/cocos/platform/CCImage.h @@ -27,7 +27,7 @@ THE SOFTWARE. #define __CC_IMAGE_H__ #include "base/CCRef.h" -#include "2d/CCTexture2D.h" +#include "renderer/CCTexture2D.h" // premultiply alpha, or the effect will wrong when want to use other pixel format in Texture2D, // such as RGB888, RGB5A1 diff --git a/cocos/2d/platform/CCSAXParser.cpp b/cocos/platform/CCSAXParser.cpp similarity index 98% rename from cocos/2d/platform/CCSAXParser.cpp rename to cocos/platform/CCSAXParser.cpp index 75dd1c0415..e9c0acf702 100644 --- a/cocos/2d/platform/CCSAXParser.cpp +++ b/cocos/platform/CCSAXParser.cpp @@ -22,12 +22,14 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCSAXParser.h" -#include "CCFileUtils.h" -#include "tinyxml2.h" +#include "platform/CCSAXParser.h" #include // because its based on windows 8 build :P +#include "platform/CCFileUtils.h" +#include "tinyxml2.h" + + NS_CC_BEGIN class XmlSaxHander : public tinyxml2::XMLVisitor diff --git a/cocos/2d/platform/CCSAXParser.h b/cocos/platform/CCSAXParser.h similarity index 98% rename from cocos/2d/platform/CCSAXParser.h rename to cocos/platform/CCSAXParser.h index 2564bb0a40..601e87d831 100644 --- a/cocos/2d/platform/CCSAXParser.h +++ b/cocos/platform/CCSAXParser.h @@ -25,7 +25,7 @@ #define __CCSAXPARSER_H__ #include "base/CCPlatformConfig.h" -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include NS_CC_BEGIN diff --git a/cocos/2d/platform/CCThread.cpp b/cocos/platform/CCThread.cpp similarity index 98% rename from cocos/2d/platform/CCThread.cpp rename to cocos/platform/CCThread.cpp index b3e9e96c39..08c9588b7f 100644 --- a/cocos/2d/platform/CCThread.cpp +++ b/cocos/platform/CCThread.cpp @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCThread.h" +#include "platform/CCThread.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/CCThread.h b/cocos/platform/CCThread.h similarity index 98% rename from cocos/2d/platform/CCThread.h rename to cocos/platform/CCThread.h index 8783b82413..f2c6453f9f 100644 --- a/cocos/2d/platform/CCThread.h +++ b/cocos/platform/CCThread.h @@ -29,7 +29,8 @@ THE SOFTWARE. #include #include #include -#include "2d/platform/CCCommon.h" + +#include "platform/CCCommon.h" #include "base/CCPlatformMacros.h" #include "base/CCDirector.h" diff --git a/cocos/platform/CMakeLists.txt b/cocos/platform/CMakeLists.txt new file mode 100644 index 0000000000..c3ab0850e5 --- /dev/null +++ b/cocos/platform/CMakeLists.txt @@ -0,0 +1,43 @@ +if(WIN32) + +ADD_DEFINITIONS(-DUNICODE -D_UNICODE) + +set(COCOS_PLATFORM_SPECIFIC_SRC + platform/win32/CCStdC.cpp + platform/win32/CCFileUtilsWin32.cpp + platform/win32/CCCommon.cpp + platform/win32/CCApplication.cpp + platform/win32/CCDevice.cpp +) + +elseif(APPLE) + +else() + +set(COCOS_PLATFORM_SPECIFIC_SRC + platform/linux/CCStdC.cpp + platform/linux/CCFileUtilsLinux.cpp + platform/linux/CCCommon.cpp + platform/linux/CCApplication.cpp + platform/linux/CCDevice.cpp +) + +endif() + +include_directories( + ../external/ConvertUTF +) + +set(COCOS_PLATFORM_SRC + platform/CCSAXParser.cpp + platform/CCThread.cpp + platform/CCGLViewProtocol.cpp + platform/CCFileUtils.cpp + platform/CCImage.cpp + platform/desktop/CCGLView.cpp + ../external/edtaa3func/edtaa3func.cpp + ../external/ConvertUTF/ConvertUTFWrapper.cpp + ../external/ConvertUTF/ConvertUTF.c + ${COCOS_PLATFORM_SPECIFIC_SRC} +) + diff --git a/cocos/2d/platform/android/Android.mk b/cocos/platform/android/Android.mk similarity index 100% rename from cocos/2d/platform/android/Android.mk rename to cocos/platform/android/Android.mk diff --git a/cocos/2d/platform/android/CCApplication.cpp b/cocos/platform/android/CCApplication.cpp similarity index 100% rename from cocos/2d/platform/android/CCApplication.cpp rename to cocos/platform/android/CCApplication.cpp diff --git a/cocos/2d/platform/android/CCApplication.h b/cocos/platform/android/CCApplication.h similarity index 97% rename from cocos/2d/platform/android/CCApplication.h rename to cocos/platform/android/CCApplication.h index 226a006fce..9a921d7b75 100644 --- a/cocos/2d/platform/android/CCApplication.h +++ b/cocos/platform/android/CCApplication.h @@ -29,8 +29,8 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID -#include "2d/platform/CCCommon.h" -#include "2d/platform/CCApplicationProtocol.h" +#include "platform/CCCommon.h" +#include "platform/CCApplicationProtocol.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/android/CCCommon.cpp b/cocos/platform/android/CCCommon.cpp similarity index 98% rename from cocos/2d/platform/android/CCCommon.cpp rename to cocos/platform/android/CCCommon.cpp index c8a96de0fd..0692077c21 100644 --- a/cocos/2d/platform/android/CCCommon.cpp +++ b/cocos/platform/android/CCCommon.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include "jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" #include #include diff --git a/cocos/2d/platform/android/CCDevice.cpp b/cocos/platform/android/CCDevice.cpp similarity index 99% rename from cocos/2d/platform/android/CCDevice.cpp rename to cocos/platform/android/CCDevice.cpp index 2a4cca9c5f..fc5a0902f8 100644 --- a/cocos/2d/platform/android/CCDevice.cpp +++ b/cocos/platform/android/CCDevice.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID -#include "2d/platform/CCDevice.h" +#include "platform/CCDevice.h" #include #include #include @@ -34,7 +34,7 @@ THE SOFTWARE. #include "jni/DPIJni.h" #include "jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" #include "jni/JniHelper.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/android/CCFileUtilsAndroid.cpp b/cocos/platform/android/CCFileUtilsAndroid.cpp similarity index 99% rename from cocos/2d/platform/android/CCFileUtilsAndroid.cpp rename to cocos/platform/android/CCFileUtilsAndroid.cpp index 700e721922..e4ff00dec6 100644 --- a/cocos/2d/platform/android/CCFileUtilsAndroid.cpp +++ b/cocos/platform/android/CCFileUtilsAndroid.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID #include "CCFileUtilsAndroid.h" -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include "jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" #include "android/asset_manager.h" #include "android/asset_manager_jni.h" diff --git a/cocos/2d/platform/android/CCFileUtilsAndroid.h b/cocos/platform/android/CCFileUtilsAndroid.h similarity index 98% rename from cocos/2d/platform/android/CCFileUtilsAndroid.h rename to cocos/platform/android/CCFileUtilsAndroid.h index cad3d13a29..9639c0daed 100644 --- a/cocos/2d/platform/android/CCFileUtilsAndroid.h +++ b/cocos/platform/android/CCFileUtilsAndroid.h @@ -28,7 +28,7 @@ Copyright (c) 2013-2014 Chukong Technologies Inc. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "base/CCPlatformMacros.h" #include "base/ccTypes.h" #include diff --git a/cocos/2d/platform/android/CCGL.h b/cocos/platform/android/CCGL.h similarity index 100% rename from cocos/2d/platform/android/CCGL.h rename to cocos/platform/android/CCGL.h diff --git a/cocos/2d/platform/android/CCGLView.cpp b/cocos/platform/android/CCGLView.cpp similarity index 100% rename from cocos/2d/platform/android/CCGLView.cpp rename to cocos/platform/android/CCGLView.cpp diff --git a/cocos/2d/platform/android/CCGLView.h b/cocos/platform/android/CCGLView.h similarity index 98% rename from cocos/2d/platform/android/CCGLView.h rename to cocos/platform/android/CCGLView.h index d8ea2b93de..6423d7019d 100644 --- a/cocos/2d/platform/android/CCGLView.h +++ b/cocos/platform/android/CCGLView.h @@ -31,7 +31,7 @@ THE SOFTWARE. #include "base/CCRef.h" #include "math/CCGeometry.h" -#include "2d/platform/CCGLViewProtocol.h" +#include "platform/CCGLViewProtocol.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/android/CCPlatformDefine.h b/cocos/platform/android/CCPlatformDefine.h similarity index 100% rename from cocos/2d/platform/android/CCPlatformDefine.h rename to cocos/platform/android/CCPlatformDefine.h diff --git a/cocos/2d/platform/android/CCStdC.h b/cocos/platform/android/CCStdC.h similarity index 100% rename from cocos/2d/platform/android/CCStdC.h rename to cocos/platform/android/CCStdC.h diff --git a/cocos/2d/platform/android/java/.classpath b/cocos/platform/android/java/.classpath similarity index 100% rename from cocos/2d/platform/android/java/.classpath rename to cocos/platform/android/java/.classpath diff --git a/cocos/2d/platform/android/java/.project b/cocos/platform/android/java/.project similarity index 100% rename from cocos/2d/platform/android/java/.project rename to cocos/platform/android/java/.project diff --git a/cocos/2d/platform/android/java/.settings/org.eclipse.jdt.core.prefs b/cocos/platform/android/java/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from cocos/2d/platform/android/java/.settings/org.eclipse.jdt.core.prefs rename to cocos/platform/android/java/.settings/org.eclipse.jdt.core.prefs diff --git a/cocos/2d/platform/android/java/AndroidManifest.xml b/cocos/platform/android/java/AndroidManifest.xml similarity index 100% rename from cocos/2d/platform/android/java/AndroidManifest.xml rename to cocos/platform/android/java/AndroidManifest.xml diff --git a/cocos/2d/platform/android/java/ant.properties b/cocos/platform/android/java/ant.properties similarity index 100% rename from cocos/2d/platform/android/java/ant.properties rename to cocos/platform/android/java/ant.properties diff --git a/cocos/2d/platform/android/java/build.xml b/cocos/platform/android/java/build.xml similarity index 100% rename from cocos/2d/platform/android/java/build.xml rename to cocos/platform/android/java/build.xml diff --git a/cocos/2d/platform/android/java/proguard-project.txt b/cocos/platform/android/java/proguard-project.txt similarity index 100% rename from cocos/2d/platform/android/java/proguard-project.txt rename to cocos/platform/android/java/proguard-project.txt diff --git a/cocos/2d/platform/android/java/res/.gitignore b/cocos/platform/android/java/res/.gitignore similarity index 100% rename from cocos/2d/platform/android/java/res/.gitignore rename to cocos/platform/android/java/res/.gitignore diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxBitmap.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxBitmap.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxBitmap.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxBitmap.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxETCLoader.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxETCLoader.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxETCLoader.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxETCLoader.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditBoxDialog.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditBoxDialog.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditBoxDialog.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditBoxDialog.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditText.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditText.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditText.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditText.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHandler.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHandler.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHandler.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHandler.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLocalStorage.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLocalStorage.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLocalStorage.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLocalStorage.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLuaJavaBridge.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLuaJavaBridge.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLuaJavaBridge.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLuaJavaBridge.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxMusic.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxMusic.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxMusic.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxMusic.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxSound.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxSound.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxSound.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxSound.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTextInputWraper.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTextInputWraper.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTextInputWraper.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTextInputWraper.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTypefaces.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTypefaces.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTypefaces.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTypefaces.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoHelper.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoHelper.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoHelper.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoHelper.java diff --git a/cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java similarity index 100% rename from cocos/2d/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java rename to cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java diff --git a/cocos/2d/platform/android/javaactivity.cpp b/cocos/platform/android/javaactivity.cpp similarity index 89% rename from cocos/2d/platform/android/javaactivity.cpp rename to cocos/platform/android/javaactivity.cpp index b4d265d162..58524d839a 100644 --- a/cocos/2d/platform/android/javaactivity.cpp +++ b/cocos/platform/android/javaactivity.cpp @@ -22,14 +22,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ +#include "base/CCPlatformConfig.h" +#if CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID + #include "CCApplication.h" -#include "CCDirector.h" -#include "CCDrawingPrimitives.h" -#include "CCEventCustom.h" -#include "CCEventType.h" +#include "base/CCDirector.h" +#include "base/CCEventCustom.h" +#include "base/CCEventType.h" +#include "renderer/CCGLProgramCache.h" +#include "renderer/CCTextureCache.h" +#include "2d/CCDrawingPrimitives.h" #include "CCGLView.h" -#include "CCGLProgramCache.h" -#include "CCTextureCache.h" #include "platform/android/jni/JniHelper.h" #include #include @@ -83,6 +86,8 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeOnSurfaceChanged(JNIEnv* env, { cocos2d::Application::getInstance()->applicationScreenSizeChanged(w, h); } - - + } + +#endif // CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID + diff --git a/cocos/2d/platform/android/jni/DPIJni.cpp b/cocos/platform/android/jni/DPIJni.cpp similarity index 100% rename from cocos/2d/platform/android/jni/DPIJni.cpp rename to cocos/platform/android/jni/DPIJni.cpp diff --git a/cocos/2d/platform/android/jni/DPIJni.h b/cocos/platform/android/jni/DPIJni.h similarity index 100% rename from cocos/2d/platform/android/jni/DPIJni.h rename to cocos/platform/android/jni/DPIJni.h diff --git a/cocos/2d/platform/android/jni/IMEJni.cpp b/cocos/platform/android/jni/IMEJni.cpp similarity index 98% rename from cocos/2d/platform/android/jni/IMEJni.cpp rename to cocos/platform/android/jni/IMEJni.cpp index ea96931c28..8d9c00d5ee 100644 --- a/cocos/2d/platform/android/jni/IMEJni.cpp +++ b/cocos/platform/android/jni/IMEJni.cpp @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ #include "IMEJni.h" -#include "CCIMEDispatcher.h" +#include "base/CCIMEDispatcher.h" #include "JniHelper.h" #include diff --git a/cocos/2d/platform/android/jni/IMEJni.h b/cocos/platform/android/jni/IMEJni.h similarity index 100% rename from cocos/2d/platform/android/jni/IMEJni.h rename to cocos/platform/android/jni/IMEJni.h diff --git a/cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp similarity index 86% rename from cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp rename to cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp index d61ddc4dc6..23199fe053 100644 --- a/cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp +++ b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxAccelerometer.cpp @@ -1,8 +1,8 @@ #include "JniHelper.h" #include -#include "CCDirector.h" -#include "CCEventDispatcher.h" -#include "CCEventAcceleration.h" +#include "base/CCDirector.h" +#include "base/CCEventDispatcher.h" +#include "base/CCEventAcceleration.h" #define TG3_GRAVITY_EARTH (9.80665f) diff --git a/cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp similarity index 98% rename from cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp rename to cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp index bdd9ee815f..1218a08dd4 100644 --- a/cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp +++ b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.cpp @@ -25,7 +25,7 @@ THE SOFTWARE. #include "JniHelper.h" #include -#include "CCDirector.h" +#include "base/CCDirector.h" #include "../CCApplication.h" #include "platform/CCFileUtils.h" #include diff --git a/cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.h b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.h similarity index 100% rename from cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.h rename to cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.h diff --git a/cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp similarity index 100% rename from cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp rename to cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp diff --git a/cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h similarity index 100% rename from cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h rename to cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h diff --git a/cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp similarity index 94% rename from cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp rename to cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp index 38886285df..28b4ba3bbf 100644 --- a/cocos/2d/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp +++ b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp @@ -1,8 +1,8 @@ -#include "CCIMEDispatcher.h" -#include "CCDirector.h" +#include "base/CCIMEDispatcher.h" +#include "base/CCDirector.h" +#include "base/CCEventType.h" #include "../CCApplication.h" #include "platform/CCFileUtils.h" -#include "CCEventType.h" #include "JniHelper.h" #include diff --git a/cocos/2d/platform/android/jni/JniHelper.cpp b/cocos/platform/android/jni/JniHelper.cpp similarity index 100% rename from cocos/2d/platform/android/jni/JniHelper.cpp rename to cocos/platform/android/jni/JniHelper.cpp diff --git a/cocos/2d/platform/android/jni/JniHelper.h b/cocos/platform/android/jni/JniHelper.h similarity index 100% rename from cocos/2d/platform/android/jni/JniHelper.h rename to cocos/platform/android/jni/JniHelper.h diff --git a/cocos/2d/platform/android/jni/TouchesJni.cpp b/cocos/platform/android/jni/TouchesJni.cpp similarity index 98% rename from cocos/2d/platform/android/jni/TouchesJni.cpp rename to cocos/platform/android/jni/TouchesJni.cpp index 3d53f3204b..023b7fba93 100644 --- a/cocos/2d/platform/android/jni/TouchesJni.cpp +++ b/cocos/platform/android/jni/TouchesJni.cpp @@ -21,8 +21,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCDirector.h" -#include "CCEventKeyboard.h" +#include "base/CCDirector.h" +#include "base/CCEventKeyboard.h" #include "CCGLView.h" #include diff --git a/cocos/2d/platform/apple/CCFileUtilsApple.h b/cocos/platform/apple/CCFileUtilsApple.h similarity index 100% rename from cocos/2d/platform/apple/CCFileUtilsApple.h rename to cocos/platform/apple/CCFileUtilsApple.h diff --git a/cocos/2d/platform/apple/CCFileUtilsApple.mm b/cocos/platform/apple/CCFileUtilsApple.mm similarity index 100% rename from cocos/2d/platform/apple/CCFileUtilsApple.mm rename to cocos/platform/apple/CCFileUtilsApple.mm diff --git a/cocos/2d/platform/apple/CCLock.cpp b/cocos/platform/apple/CCLock.cpp similarity index 100% rename from cocos/2d/platform/apple/CCLock.cpp rename to cocos/platform/apple/CCLock.cpp diff --git a/cocos/2d/platform/apple/CCLock.h b/cocos/platform/apple/CCLock.h similarity index 100% rename from cocos/2d/platform/apple/CCLock.h rename to cocos/platform/apple/CCLock.h diff --git a/cocos/2d/platform/apple/CCThread.mm b/cocos/platform/apple/CCThread.mm similarity index 100% rename from cocos/2d/platform/apple/CCThread.mm rename to cocos/platform/apple/CCThread.mm diff --git a/cocos/2d/platform/desktop/CCGLView.cpp b/cocos/platform/desktop/CCGLView.cpp similarity index 99% rename from cocos/2d/platform/desktop/CCGLView.cpp rename to cocos/platform/desktop/CCGLView.cpp index 30077f7130..702244a29e 100644 --- a/cocos/2d/platform/desktop/CCGLView.cpp +++ b/cocos/platform/desktop/CCGLView.cpp @@ -29,7 +29,7 @@ THE SOFTWARE. #include "base/CCEventDispatcher.h" #include "base/CCEventKeyboard.h" #include "base/CCEventMouse.h" -#include "2d/CCIMEDispatcher.h" +#include "base/CCIMEDispatcher.h" #include diff --git a/cocos/2d/platform/desktop/CCGLView.h b/cocos/platform/desktop/CCGLView.h similarity index 98% rename from cocos/2d/platform/desktop/CCGLView.h rename to cocos/platform/desktop/CCGLView.h index 8160855ea8..065578730f 100644 --- a/cocos/2d/platform/desktop/CCGLView.h +++ b/cocos/platform/desktop/CCGLView.h @@ -27,8 +27,8 @@ THE SOFTWARE. #define __CC_EGLVIEW_DESKTOP_H__ #include "base/CCRef.h" -#include "2d/platform/CCCommon.h" -#include "2d/platform/CCGLViewProtocol.h" +#include "platform/CCCommon.h" +#include "platform/CCGLViewProtocol.h" #include "glfw3.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/ios/CCApplication.h b/cocos/platform/ios/CCApplication.h similarity index 97% rename from cocos/2d/platform/ios/CCApplication.h rename to cocos/platform/ios/CCApplication.h index 64073ca7f7..b41cabd53a 100644 --- a/cocos/2d/platform/ios/CCApplication.h +++ b/cocos/platform/ios/CCApplication.h @@ -29,8 +29,8 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS -#include "2d/platform/CCCommon.h" -#include "2d/platform/CCApplicationProtocol.h" +#include "platform/CCCommon.h" +#include "platform/CCApplicationProtocol.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/ios/CCApplication.mm b/cocos/platform/ios/CCApplication.mm similarity index 100% rename from cocos/2d/platform/ios/CCApplication.mm rename to cocos/platform/ios/CCApplication.mm diff --git a/cocos/2d/platform/ios/CCCommon.mm b/cocos/platform/ios/CCCommon.mm similarity index 97% rename from cocos/2d/platform/ios/CCCommon.mm rename to cocos/platform/ios/CCCommon.mm index 4607ba6e9f..6f1ee35d76 100644 --- a/cocos/2d/platform/ios/CCCommon.mm +++ b/cocos/platform/ios/CCCommon.mm @@ -26,7 +26,7 @@ #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include #include diff --git a/cocos/2d/platform/ios/CCDevice.mm b/cocos/platform/ios/CCDevice.mm similarity index 100% rename from cocos/2d/platform/ios/CCDevice.mm rename to cocos/platform/ios/CCDevice.mm diff --git a/cocos/2d/platform/ios/CCDirectorCaller.h b/cocos/platform/ios/CCDirectorCaller.h similarity index 92% rename from cocos/2d/platform/ios/CCDirectorCaller.h rename to cocos/platform/ios/CCDirectorCaller.h index f3b4ee4c92..c48a0598f4 100644 --- a/cocos/2d/platform/ios/CCDirectorCaller.h +++ b/cocos/platform/ios/CCDirectorCaller.h @@ -22,6 +22,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ + +#include "base/CCPlatformConfig.h" +#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS + #import @interface CCDirectorCaller : NSObject { @@ -35,3 +39,6 @@ +(id) sharedDirectorCaller; +(void) destroy; @end + +#endif // CC_TARGET_PLATFORM == CC_PLATFORM_IOS + diff --git a/cocos/2d/platform/ios/CCDirectorCaller.mm b/cocos/platform/ios/CCDirectorCaller.mm similarity index 96% rename from cocos/2d/platform/ios/CCDirectorCaller.mm rename to cocos/platform/ios/CCDirectorCaller.mm index f254530736..4adf295793 100644 --- a/cocos/2d/platform/ios/CCDirectorCaller.mm +++ b/cocos/platform/ios/CCDirectorCaller.mm @@ -22,6 +22,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ + +#include "base/CCPlatformConfig.h" +#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS + #import #import #import "CCDirectorCaller.h" @@ -101,3 +105,6 @@ static id s_sharedDirectorCaller; } @end + +#endif // CC_TARGET_PLATFORM == CC_PLATFORM_IOS + diff --git a/cocos/2d/platform/ios/CCEAGLView.h b/cocos/platform/ios/CCEAGLView.h similarity index 100% rename from cocos/2d/platform/ios/CCEAGLView.h rename to cocos/platform/ios/CCEAGLView.h diff --git a/cocos/2d/platform/ios/CCEAGLView.mm b/cocos/platform/ios/CCEAGLView.mm similarity index 100% rename from cocos/2d/platform/ios/CCEAGLView.mm rename to cocos/platform/ios/CCEAGLView.mm diff --git a/cocos/2d/platform/ios/CCES2Renderer.h b/cocos/platform/ios/CCES2Renderer.h similarity index 100% rename from cocos/2d/platform/ios/CCES2Renderer.h rename to cocos/platform/ios/CCES2Renderer.h diff --git a/cocos/2d/platform/ios/CCES2Renderer.m b/cocos/platform/ios/CCES2Renderer.m similarity index 100% rename from cocos/2d/platform/ios/CCES2Renderer.m rename to cocos/platform/ios/CCES2Renderer.m diff --git a/cocos/2d/platform/ios/CCESRenderer.h b/cocos/platform/ios/CCESRenderer.h similarity index 100% rename from cocos/2d/platform/ios/CCESRenderer.h rename to cocos/platform/ios/CCESRenderer.h diff --git a/cocos/2d/platform/ios/CCGL.h b/cocos/platform/ios/CCGL.h similarity index 100% rename from cocos/2d/platform/ios/CCGL.h rename to cocos/platform/ios/CCGL.h diff --git a/cocos/2d/platform/ios/CCGLView.h b/cocos/platform/ios/CCGLView.h similarity index 97% rename from cocos/2d/platform/ios/CCGLView.h rename to cocos/platform/ios/CCGLView.h index 8529ee1bfd..d5a62dd084 100644 --- a/cocos/2d/platform/ios/CCGLView.h +++ b/cocos/platform/ios/CCGLView.h @@ -30,8 +30,8 @@ #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #include "base/CCRef.h" -#include "2d/platform/CCCommon.h" -#include "2d/platform/CCGLViewProtocol.h" +#include "platform/CCCommon.h" +#include "platform/CCGLViewProtocol.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/ios/CCGLView.mm b/cocos/platform/ios/CCGLView.mm similarity index 99% rename from cocos/2d/platform/ios/CCGLView.mm rename to cocos/platform/ios/CCGLView.mm index c5490ebf08..fa7844a2fb 100644 --- a/cocos/2d/platform/ios/CCGLView.mm +++ b/cocos/platform/ios/CCGLView.mm @@ -24,7 +24,6 @@ ****************************************************************************/ #include "base/CCPlatformConfig.h" - #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #import diff --git a/cocos/2d/platform/ios/CCImage.mm b/cocos/platform/ios/CCImage.mm similarity index 98% rename from cocos/2d/platform/ios/CCImage.mm rename to cocos/platform/ios/CCImage.mm index 4a49ec0eb5..71ebce91a2 100644 --- a/cocos/2d/platform/ios/CCImage.mm +++ b/cocos/platform/ios/CCImage.mm @@ -26,14 +26,14 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS -#import "2d/platform/CCImage.h" -#import "2d/platform/CCCommon.h" +#import "platform/CCImage.h" +#import "platform/CCCommon.h" #import #import #import -#include +#include NS_CC_BEGIN diff --git a/cocos/2d/platform/ios/CCPlatformDefine.h b/cocos/platform/ios/CCPlatformDefine.h similarity index 100% rename from cocos/2d/platform/ios/CCPlatformDefine.h rename to cocos/platform/ios/CCPlatformDefine.h diff --git a/cocos/2d/platform/ios/CCStdC.h b/cocos/platform/ios/CCStdC.h similarity index 100% rename from cocos/2d/platform/ios/CCStdC.h rename to cocos/platform/ios/CCStdC.h diff --git a/cocos/2d/platform/ios/OpenGL_Internal.h b/cocos/platform/ios/OpenGL_Internal.h similarity index 100% rename from cocos/2d/platform/ios/OpenGL_Internal.h rename to cocos/platform/ios/OpenGL_Internal.h diff --git a/cocos/2d/platform/linux/CCApplication.cpp b/cocos/platform/linux/CCApplication.cpp similarity index 99% rename from cocos/2d/platform/linux/CCApplication.cpp rename to cocos/platform/linux/CCApplication.cpp index 89529c8553..ad4e47bc0a 100644 --- a/cocos/2d/platform/linux/CCApplication.cpp +++ b/cocos/platform/linux/CCApplication.cpp @@ -31,7 +31,7 @@ THE SOFTWARE. #include #include #include "base/CCDirector.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "CCGLView.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/linux/CCApplication.h b/cocos/platform/linux/CCApplication.h similarity index 97% rename from cocos/2d/platform/linux/CCApplication.h rename to cocos/platform/linux/CCApplication.h index 2582e89a0d..f8fadac55e 100644 --- a/cocos/2d/platform/linux/CCApplication.h +++ b/cocos/platform/linux/CCApplication.h @@ -29,8 +29,8 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_LINUX -#include "2d/platform/CCCommon.h" -#include "2d/platform/CCApplicationProtocol.h" +#include "platform/CCCommon.h" +#include "platform/CCApplicationProtocol.h" #include NS_CC_BEGIN diff --git a/cocos/2d/platform/linux/CCCommon.cpp b/cocos/platform/linux/CCCommon.cpp similarity index 97% rename from cocos/2d/platform/linux/CCCommon.cpp rename to cocos/platform/linux/CCCommon.cpp index adf4576bd0..320f96d108 100644 --- a/cocos/2d/platform/linux/CCCommon.cpp +++ b/cocos/platform/linux/CCCommon.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_LINUX -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include "CCStdC.h" #include "base/CCConsole.h" diff --git a/cocos/2d/platform/linux/CCDevice.cpp b/cocos/platform/linux/CCDevice.cpp similarity index 99% rename from cocos/2d/platform/linux/CCDevice.cpp rename to cocos/platform/linux/CCDevice.cpp index 262c4301e7..5e007f7d28 100644 --- a/cocos/2d/platform/linux/CCDevice.cpp +++ b/cocos/platform/linux/CCDevice.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_LINUX -#include "2d/platform/CCDevice.h" +#include "platform/CCDevice.h" #include #include @@ -36,7 +36,7 @@ THE SOFTWARE. #include #include #include -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "ft2build.h" #include FT_FREETYPE_H diff --git a/cocos/2d/platform/linux/CCFileUtilsLinux.cpp b/cocos/platform/linux/CCFileUtilsLinux.cpp similarity index 99% rename from cocos/2d/platform/linux/CCFileUtilsLinux.cpp rename to cocos/platform/linux/CCFileUtilsLinux.cpp index f65f4da3e9..dfb882c885 100644 --- a/cocos/2d/platform/linux/CCFileUtilsLinux.cpp +++ b/cocos/platform/linux/CCFileUtilsLinux.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #if CC_TARGET_PLATFORM == CC_PLATFORM_LINUX #include "CCFileUtilsLinux.h" -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include "base/ccMacros.h" #include "CCApplication.h" #include "deprecated/CCString.h" diff --git a/cocos/2d/platform/linux/CCFileUtilsLinux.h b/cocos/platform/linux/CCFileUtilsLinux.h similarity index 98% rename from cocos/2d/platform/linux/CCFileUtilsLinux.h rename to cocos/platform/linux/CCFileUtilsLinux.h index a1b45e8e29..e9a38a61eb 100644 --- a/cocos/2d/platform/linux/CCFileUtilsLinux.h +++ b/cocos/platform/linux/CCFileUtilsLinux.h @@ -28,7 +28,7 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_LINUX -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "base/CCPlatformMacros.h" #include "base/ccTypes.h" #include diff --git a/cocos/2d/platform/linux/CCGL.h b/cocos/platform/linux/CCGL.h similarity index 100% rename from cocos/2d/platform/linux/CCGL.h rename to cocos/platform/linux/CCGL.h diff --git a/cocos/2d/platform/linux/CCPlatformDefine.h b/cocos/platform/linux/CCPlatformDefine.h similarity index 100% rename from cocos/2d/platform/linux/CCPlatformDefine.h rename to cocos/platform/linux/CCPlatformDefine.h diff --git a/cocos/2d/platform/linux/CCStdC.cpp b/cocos/platform/linux/CCStdC.cpp similarity index 100% rename from cocos/2d/platform/linux/CCStdC.cpp rename to cocos/platform/linux/CCStdC.cpp diff --git a/cocos/2d/platform/linux/CCStdC.h b/cocos/platform/linux/CCStdC.h similarity index 100% rename from cocos/2d/platform/linux/CCStdC.h rename to cocos/platform/linux/CCStdC.h diff --git a/cocos/2d/platform/mac/CCApplication.h b/cocos/platform/mac/CCApplication.h similarity index 97% rename from cocos/2d/platform/mac/CCApplication.h rename to cocos/platform/mac/CCApplication.h index 1e8f52d130..0655b4120b 100644 --- a/cocos/2d/platform/mac/CCApplication.h +++ b/cocos/platform/mac/CCApplication.h @@ -29,8 +29,8 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC -#include "2d/platform/CCCommon.h" -#include "2d/platform/CCApplicationProtocol.h" +#include "platform/CCCommon.h" +#include "platform/CCApplicationProtocol.h" #include NS_CC_BEGIN diff --git a/cocos/2d/platform/mac/CCApplication.mm b/cocos/platform/mac/CCApplication.mm similarity index 99% rename from cocos/2d/platform/mac/CCApplication.mm rename to cocos/platform/mac/CCApplication.mm index d311c1d1b4..2f352d57d5 100644 --- a/cocos/2d/platform/mac/CCApplication.mm +++ b/cocos/platform/mac/CCApplication.mm @@ -27,12 +27,13 @@ THE SOFTWARE. #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC #import "CCApplication.h" + #import #include -#include "2d/platform/CCFileUtils.h" + +#include "platform/CCFileUtils.h" #include "math/CCGeometry.h" #include "base/CCDirector.h" -#import "CCDirectorCaller.h" #include "CCGLView.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/mac/CCCommon.mm b/cocos/platform/mac/CCCommon.mm similarity index 98% rename from cocos/2d/platform/mac/CCCommon.mm rename to cocos/platform/mac/CCCommon.mm index be3c7b3cad..4e042bd14e 100644 --- a/cocos/2d/platform/mac/CCCommon.mm +++ b/cocos/platform/mac/CCCommon.mm @@ -26,7 +26,7 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include "base/CCDirector.h" #include "CCGLView.h" diff --git a/cocos/2d/platform/mac/CCDevice.mm b/cocos/platform/mac/CCDevice.mm similarity index 99% rename from cocos/2d/platform/mac/CCDevice.mm rename to cocos/platform/mac/CCDevice.mm index 9130d39315..0d13a3a586 100644 --- a/cocos/2d/platform/mac/CCDevice.mm +++ b/cocos/platform/mac/CCDevice.mm @@ -26,7 +26,7 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC -#include "2d/platform/CCDevice.h" +#include "platform/CCDevice.h" #include #include #include diff --git a/cocos/2d/platform/mac/CCGL.h b/cocos/platform/mac/CCGL.h similarity index 100% rename from cocos/2d/platform/mac/CCGL.h rename to cocos/platform/mac/CCGL.h diff --git a/cocos/2d/platform/mac/CCPlatformDefine.h b/cocos/platform/mac/CCPlatformDefine.h similarity index 100% rename from cocos/2d/platform/mac/CCPlatformDefine.h rename to cocos/platform/mac/CCPlatformDefine.h diff --git a/cocos/2d/platform/mac/CCStdC.h b/cocos/platform/mac/CCStdC.h similarity index 100% rename from cocos/2d/platform/mac/CCStdC.h rename to cocos/platform/mac/CCStdC.h diff --git a/cocos/2d/platform/win32/CCApplication.cpp b/cocos/platform/win32/CCApplication.cpp similarity index 99% rename from cocos/2d/platform/win32/CCApplication.cpp rename to cocos/platform/win32/CCApplication.cpp index a67ba66439..2afa94595b 100644 --- a/cocos/2d/platform/win32/CCApplication.cpp +++ b/cocos/platform/win32/CCApplication.cpp @@ -30,7 +30,7 @@ THE SOFTWARE. #include "CCGLView.h" #include "base/CCDirector.h" #include -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" /** @brief This function change the PVRFrame show/hide setting in register. @param bEnable If true show the PVRFrame window, otherwise hide. diff --git a/cocos/2d/platform/win32/CCApplication.h b/cocos/platform/win32/CCApplication.h similarity index 97% rename from cocos/2d/platform/win32/CCApplication.h rename to cocos/platform/win32/CCApplication.h index b56cc0cc4c..7167a4d747 100644 --- a/cocos/2d/platform/win32/CCApplication.h +++ b/cocos/platform/win32/CCApplication.h @@ -29,8 +29,8 @@ THE SOFTWARE. #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 #include "CCStdC.h" -#include "2d/platform/CCCommon.h" -#include "2d/platform/CCApplicationProtocol.h" +#include "platform/CCCommon.h" +#include "platform/CCApplicationProtocol.h" #include NS_CC_BEGIN diff --git a/cocos/2d/platform/win32/CCCommon.cpp b/cocos/platform/win32/CCCommon.cpp similarity index 98% rename from cocos/2d/platform/win32/CCCommon.cpp rename to cocos/platform/win32/CCCommon.cpp index d605e5bf91..a95ed75d00 100644 --- a/cocos/2d/platform/win32/CCCommon.cpp +++ b/cocos/platform/win32/CCCommon.cpp @@ -26,7 +26,7 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include "CCStdC.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/win32/CCDevice.cpp b/cocos/platform/win32/CCDevice.cpp similarity index 99% rename from cocos/2d/platform/win32/CCDevice.cpp rename to cocos/platform/win32/CCDevice.cpp index 839e67e495..ab9b3e489b 100644 --- a/cocos/2d/platform/win32/CCDevice.cpp +++ b/cocos/platform/win32/CCDevice.cpp @@ -26,8 +26,8 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 -#include "2d/platform/CCDevice.h" -#include "2d/platform/CCFileUtils.h" +#include "platform/CCDevice.h" +#include "platform/CCFileUtils.h" #include "CCStdC.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/win32/CCFileUtilsWin32.cpp b/cocos/platform/win32/CCFileUtilsWin32.cpp similarity index 99% rename from cocos/2d/platform/win32/CCFileUtilsWin32.cpp rename to cocos/platform/win32/CCFileUtilsWin32.cpp index a146025d4e..2d036c5dfc 100644 --- a/cocos/2d/platform/win32/CCFileUtilsWin32.cpp +++ b/cocos/platform/win32/CCFileUtilsWin32.cpp @@ -27,7 +27,7 @@ THE SOFTWARE. #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 #include "CCFileUtilsWin32.h" -#include "2d/platform/CCCommon.h" +#include "platform/CCCommon.h" #include using namespace std; diff --git a/cocos/2d/platform/win32/CCFileUtilsWin32.h b/cocos/platform/win32/CCFileUtilsWin32.h similarity index 99% rename from cocos/2d/platform/win32/CCFileUtilsWin32.h rename to cocos/platform/win32/CCFileUtilsWin32.h index d075aa94e9..fdb2b9106b 100644 --- a/cocos/2d/platform/win32/CCFileUtilsWin32.h +++ b/cocos/platform/win32/CCFileUtilsWin32.h @@ -28,7 +28,7 @@ THE SOFTWARE. #include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 -#include "2d/platform/CCFileUtils.h" +#include "platform/CCFileUtils.h" #include "base/CCPlatformMacros.h" #include "base/ccTypes.h" #include diff --git a/cocos/2d/platform/win32/CCGL.h b/cocos/platform/win32/CCGL.h similarity index 100% rename from cocos/2d/platform/win32/CCGL.h rename to cocos/platform/win32/CCGL.h diff --git a/cocos/2d/platform/win32/CCPlatformDefine.h b/cocos/platform/win32/CCPlatformDefine.h similarity index 100% rename from cocos/2d/platform/win32/CCPlatformDefine.h rename to cocos/platform/win32/CCPlatformDefine.h diff --git a/cocos/2d/platform/win32/CCStdC.cpp b/cocos/platform/win32/CCStdC.cpp similarity index 100% rename from cocos/2d/platform/win32/CCStdC.cpp rename to cocos/platform/win32/CCStdC.cpp diff --git a/cocos/2d/platform/win32/CCStdC.h b/cocos/platform/win32/CCStdC.h similarity index 100% rename from cocos/2d/platform/win32/CCStdC.h rename to cocos/platform/win32/CCStdC.h diff --git a/cocos/2d/platform/win32/compat/stdint.h b/cocos/platform/win32/compat/stdint.h similarity index 100% rename from cocos/2d/platform/win32/compat/stdint.h rename to cocos/platform/win32/compat/stdint.h diff --git a/cocos/2d/platform/winrt/CCApplication.cpp b/cocos/platform/winrt/CCApplication.cpp similarity index 99% rename from cocos/2d/platform/winrt/CCApplication.cpp rename to cocos/platform/winrt/CCApplication.cpp index 139981cdca..7925bfa6ba 100644 --- a/cocos/2d/platform/winrt/CCApplication.cpp +++ b/cocos/platform/winrt/CCApplication.cpp @@ -28,7 +28,7 @@ THE SOFTWARE. #else #include "platform/wp8/CCGLView.h" #endif -#include "CCDirector.h" +#include "base/CCDirector.h" #include #include "platform/CCFileUtils.h" #include "CCWinRTUtils.h" diff --git a/cocos/2d/platform/winrt/CCApplication.h b/cocos/platform/winrt/CCApplication.h similarity index 98% rename from cocos/2d/platform/winrt/CCApplication.h rename to cocos/platform/winrt/CCApplication.h index 7d2deb39db..97028820e4 100644 --- a/cocos/2d/platform/winrt/CCApplication.h +++ b/cocos/platform/winrt/CCApplication.h @@ -25,7 +25,7 @@ THE SOFTWARE. #ifndef __CC_APPLICATION_WINRT_H__ #define __CC_APPLICATION_WINRT_H__ -#include "CCPlatformConfig.h" +#include "base/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) #include "CCStdC.h" diff --git a/cocos/2d/platform/winrt/CCCommon.cpp b/cocos/platform/winrt/CCCommon.cpp similarity index 100% rename from cocos/2d/platform/winrt/CCCommon.cpp rename to cocos/platform/winrt/CCCommon.cpp diff --git a/cocos/2d/platform/winrt/CCDevice.cpp b/cocos/platform/winrt/CCDevice.cpp similarity index 99% rename from cocos/2d/platform/winrt/CCDevice.cpp rename to cocos/platform/winrt/CCDevice.cpp index 46c9b0cd43..bbbad71687 100644 --- a/cocos/2d/platform/winrt/CCDevice.cpp +++ b/cocos/platform/winrt/CCDevice.cpp @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCPlatformConfig.h" +#include "base/CCPlatformConfig.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) #include "cocos2d.h" diff --git a/cocos/2d/platform/winrt/CCFileUtilsWinRT.cpp b/cocos/platform/winrt/CCFileUtilsWinRT.cpp similarity index 100% rename from cocos/2d/platform/winrt/CCFileUtilsWinRT.cpp rename to cocos/platform/winrt/CCFileUtilsWinRT.cpp diff --git a/cocos/2d/platform/winrt/CCFileUtilsWinRT.h b/cocos/platform/winrt/CCFileUtilsWinRT.h similarity index 97% rename from cocos/2d/platform/winrt/CCFileUtilsWinRT.h rename to cocos/platform/winrt/CCFileUtilsWinRT.h index 2ace3f6f22..8e130e496e 100644 --- a/cocos/2d/platform/winrt/CCFileUtilsWinRT.h +++ b/cocos/platform/winrt/CCFileUtilsWinRT.h @@ -25,12 +25,13 @@ #ifndef __CC_FILEUTILS_WINRT_H__ #define __CC_FILEUTILS_WINRT_H__ -#include "platform/CCFileUtils.h" -#include "CCPlatformMacros.h" -#include "ccTypes.h" #include #include +#include "platform/CCFileUtils.h" +#include "base/CCPlatformMacros.h" +#include "base/ccTypes.h" + NS_CC_BEGIN /** diff --git a/cocos/2d/platform/winrt/CCFreeTypeFont.cpp b/cocos/platform/winrt/CCFreeTypeFont.cpp similarity index 99% rename from cocos/2d/platform/winrt/CCFreeTypeFont.cpp rename to cocos/platform/winrt/CCFreeTypeFont.cpp index 9f5b4acc58..5acba12a9d 100644 --- a/cocos/2d/platform/winrt/CCFreeTypeFont.cpp +++ b/cocos/platform/winrt/CCFreeTypeFont.cpp @@ -22,7 +22,7 @@ ****************************************************************************/ #include "CCFreeTypeFont.h" -#include "CCDirector.h" +#include "base/CCDirector.h" #include "platform/CCFileUtils.h" #if (CC_TARGET_PLATFORM != CC_PLATFORM_WP8) diff --git a/cocos/2d/platform/winrt/CCFreeTypeFont.h b/cocos/platform/winrt/CCFreeTypeFont.h similarity index 100% rename from cocos/2d/platform/winrt/CCFreeTypeFont.h rename to cocos/platform/winrt/CCFreeTypeFont.h diff --git a/cocos/2d/platform/winrt/CCGL.h b/cocos/platform/winrt/CCGL.h similarity index 100% rename from cocos/2d/platform/winrt/CCGL.h rename to cocos/platform/winrt/CCGL.h diff --git a/cocos/2d/platform/winrt/CCGLView.cpp b/cocos/platform/winrt/CCGLView.cpp similarity index 98% rename from cocos/2d/platform/winrt/CCGLView.cpp rename to cocos/platform/winrt/CCGLView.cpp index f78be18d6c..118449fa25 100644 --- a/cocos/2d/platform/winrt/CCGLView.cpp +++ b/cocos/platform/winrt/CCGLView.cpp @@ -23,11 +23,14 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ +#include "base/CCPlatformConfig.h" +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) + #include "CCGLView.h" -#include "ccMacros.h" -#include "CCDirector.h" -#include "CCTouch.h" -#include "CCIMEDispatcher.h" +#include "base/ccMacros.h" +#include "base/CCDirector.h" +#include "base/CCTouch.h" +#include "2d/CCIMEDispatcher.h" #include "CCApplication.h" #include "CCWinRTUtils.h" @@ -577,3 +580,5 @@ void GLView::QueueEvent(std::shared_ptr& event) } NS_CC_END + +#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) diff --git a/cocos/2d/platform/winrt/CCGLView.h b/cocos/platform/winrt/CCGLView.h similarity index 97% rename from cocos/2d/platform/winrt/CCGLView.h rename to cocos/platform/winrt/CCGLView.h index 6864805e59..96b403a3c1 100644 --- a/cocos/2d/platform/winrt/CCGLView.h +++ b/cocos/platform/winrt/CCGLView.h @@ -26,6 +26,9 @@ THE SOFTWARE. #ifndef __CC_EGLVIEW_WINRT_H__ #define __CC_EGLVIEW_WINRT_H__ +#include "base/CCPlatformConfig.h" +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) + #include "CCStdC.h" #include "CCGL.h" #include "platform/CCCommon.h" @@ -164,4 +167,6 @@ private: NS_CC_END +#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) + #endif // end of __CC_EGLVIEW_WINRT_H__ diff --git a/cocos/2d/platform/winrt/CCGL_Angle.h b/cocos/platform/winrt/CCGL_Angle.h similarity index 100% rename from cocos/2d/platform/winrt/CCGL_Angle.h rename to cocos/platform/winrt/CCGL_Angle.h diff --git a/cocos/2d/platform/winrt/CCPThreadWinRT.cpp b/cocos/platform/winrt/CCPThreadWinRT.cpp similarity index 92% rename from cocos/2d/platform/winrt/CCPThreadWinRT.cpp rename to cocos/platform/winrt/CCPThreadWinRT.cpp index 3d63daf631..5bd691eb9f 100644 --- a/cocos/2d/platform/winrt/CCPThreadWinRT.cpp +++ b/cocos/platform/winrt/CCPThreadWinRT.cpp @@ -22,9 +22,13 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCPThreadWinRT.h" +#include "base/CCPlatformConfig.h" +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) + +#include "CCPThreadWinRT.h" + NS_CC_BEGIN void pthread_mutex_init(pthread_mutex_t* m, void* attributes) { @@ -49,3 +53,5 @@ void pthread_mutex_destroy(pthread_mutex_t* m) NS_CC_END + +#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) diff --git a/cocos/2d/platform/winrt/CCPThreadWinRT.h b/cocos/platform/winrt/CCPThreadWinRT.h similarity index 91% rename from cocos/2d/platform/winrt/CCPThreadWinRT.h rename to cocos/platform/winrt/CCPThreadWinRT.h index 042d10e36a..2a75a9535a 100644 --- a/cocos/2d/platform/winrt/CCPThreadWinRT.h +++ b/cocos/platform/winrt/CCPThreadWinRT.h @@ -26,7 +26,11 @@ THE SOFTWARE. #ifndef __CCPTHREADWINRT_H__ #define __CCPTHREADWINRT_H__ -#include "CCPlatformMacros.h" + +#include "base/CCPlatformConfig.h" +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) + +#include "base/CCPlatformMacros.h" #include @@ -49,9 +53,9 @@ void pthread_mutex_destroy(pthread_mutex_t* m); #define pthread_cond_signal(x) #define pthread_cond_init(x, y) - - - NS_CC_END + +#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) + #endif // __CCPTHREADWINRT_H__ diff --git a/cocos/2d/platform/winrt/CCPlatformDefine.h b/cocos/platform/winrt/CCPlatformDefine.h similarity index 100% rename from cocos/2d/platform/winrt/CCPlatformDefine.h rename to cocos/platform/winrt/CCPlatformDefine.h diff --git a/cocos/2d/platform/winrt/CCPrecompiledShaders.cpp b/cocos/platform/winrt/CCPrecompiledShaders.cpp similarity index 100% rename from cocos/2d/platform/winrt/CCPrecompiledShaders.cpp rename to cocos/platform/winrt/CCPrecompiledShaders.cpp diff --git a/cocos/2d/platform/winrt/CCPrecompiledShaders.h b/cocos/platform/winrt/CCPrecompiledShaders.h similarity index 100% rename from cocos/2d/platform/winrt/CCPrecompiledShaders.h rename to cocos/platform/winrt/CCPrecompiledShaders.h diff --git a/cocos/2d/platform/winrt/CCStdC.cpp b/cocos/platform/winrt/CCStdC.cpp similarity index 100% rename from cocos/2d/platform/winrt/CCStdC.cpp rename to cocos/platform/winrt/CCStdC.cpp diff --git a/cocos/2d/platform/winrt/CCStdC.h b/cocos/platform/winrt/CCStdC.h similarity index 97% rename from cocos/2d/platform/winrt/CCStdC.h rename to cocos/platform/winrt/CCStdC.h index 99992001ba..21d91faea6 100644 --- a/cocos/2d/platform/winrt/CCStdC.h +++ b/cocos/platform/winrt/CCStdC.h @@ -26,11 +26,11 @@ THE SOFTWARE. #ifndef __CC_STD_C_H__ #define __CC_STD_C_H__ -#include "CCPlatformConfig.h" +#include "base/CCPlatformConfig.h" #if CC_TARGET_PLATFORM == CC_PLATFORM_WINRT || CC_TARGET_PLATFORM == CC_PLATFORM_WP8 -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" #include #include diff --git a/cocos/2d/platform/winrt/CCWinRTUtils.cpp b/cocos/platform/winrt/CCWinRTUtils.cpp similarity index 100% rename from cocos/2d/platform/winrt/CCWinRTUtils.cpp rename to cocos/platform/winrt/CCWinRTUtils.cpp diff --git a/cocos/2d/platform/winrt/CCWinRTUtils.h b/cocos/platform/winrt/CCWinRTUtils.h similarity index 98% rename from cocos/2d/platform/winrt/CCWinRTUtils.h rename to cocos/platform/winrt/CCWinRTUtils.h index d3db742355..f289ead8c4 100644 --- a/cocos/2d/platform/winrt/CCWinRTUtils.h +++ b/cocos/platform/winrt/CCWinRTUtils.h @@ -26,7 +26,7 @@ THE SOFTWARE. #ifndef __CCWINRT_UTILS_H__ #define __CCWINRT_UTILS_H__ -#include "CCPlatformMacros.h" +#include "base/CCPlatformMacros.h" #include #include diff --git a/cocos/2d/platform/winrt/DirectXBase.cpp b/cocos/platform/winrt/DirectXBase.cpp similarity index 99% rename from cocos/2d/platform/winrt/DirectXBase.cpp rename to cocos/platform/winrt/DirectXBase.cpp index 7f6a2c6655..27166a9758 100644 --- a/cocos/2d/platform/winrt/DirectXBase.cpp +++ b/cocos/platform/winrt/DirectXBase.cpp @@ -16,6 +16,10 @@ // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. //----------------------------------------------------------------------------------------------- + +#include "base/CCPlatformConfig.h" +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) + #include "DirectXBase.h" #include #include @@ -463,4 +467,4 @@ float DirectXBase::ConvertDipsToPixels(float dips) return floor(dips * m_dpi / dipsPerInch + 0.5f); // Round to nearest integer. } - +#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) diff --git a/cocos/2d/platform/winrt/DirectXBase.h b/cocos/platform/winrt/DirectXBase.h similarity index 96% rename from cocos/2d/platform/winrt/DirectXBase.h rename to cocos/platform/winrt/DirectXBase.h index eb37bfb87d..73e7a1276b 100644 --- a/cocos/2d/platform/winrt/DirectXBase.h +++ b/cocos/platform/winrt/DirectXBase.h @@ -18,6 +18,9 @@ //----------------------------------------------------------------------------------------------- #pragma once +#include "base/CCPlatformConfig.h" +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) + #include #include #include @@ -76,3 +79,5 @@ protected private: }; #pragma warning (default: 4449) + +#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) diff --git a/cocos/2d/platform/winrt/DirectXHelper.h b/cocos/platform/winrt/DirectXHelper.h similarity index 92% rename from cocos/2d/platform/winrt/DirectXHelper.h rename to cocos/platform/winrt/DirectXHelper.h index 2166d0c91c..6065191353 100644 --- a/cocos/2d/platform/winrt/DirectXHelper.h +++ b/cocos/platform/winrt/DirectXHelper.h @@ -18,6 +18,10 @@ //----------------------------------------------------------------------------------------------- #pragma once + +#include "base/CCPlatformConfig.h" +#if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) + // Helper utilities to make Win32 APIs work with exceptions. namespace DX { @@ -30,3 +34,5 @@ namespace DX } } } + +#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) diff --git a/cocos/2d/platform/winrt/InputEvent.cpp b/cocos/platform/winrt/InputEvent.cpp similarity index 98% rename from cocos/2d/platform/winrt/InputEvent.cpp rename to cocos/platform/winrt/InputEvent.cpp index 44ac44c240..ccc49a5ad0 100644 --- a/cocos/2d/platform/winrt/InputEvent.cpp +++ b/cocos/platform/winrt/InputEvent.cpp @@ -25,7 +25,7 @@ THE SOFTWARE. #include "InputEvent.h" #include "CCGLView.h" -#include "CCEventAcceleration.h" +#include "base/CCEventAcceleration.h" NS_CC_BEGIN diff --git a/cocos/2d/platform/winrt/InputEvent.h b/cocos/platform/winrt/InputEvent.h similarity index 100% rename from cocos/2d/platform/winrt/InputEvent.h rename to cocos/platform/winrt/InputEvent.h diff --git a/cocos/2d/platform/winrt/InputEventTypes.h b/cocos/platform/winrt/InputEventTypes.h similarity index 100% rename from cocos/2d/platform/winrt/InputEventTypes.h rename to cocos/platform/winrt/InputEventTypes.h diff --git a/cocos/2d/platform/winrt/inet_ntop_winrt.cpp b/cocos/platform/winrt/inet_ntop_winrt.cpp similarity index 100% rename from cocos/2d/platform/winrt/inet_ntop_winrt.cpp rename to cocos/platform/winrt/inet_ntop_winrt.cpp diff --git a/cocos/2d/platform/winrt/inet_ntop_winrt.h b/cocos/platform/winrt/inet_ntop_winrt.h similarity index 100% rename from cocos/2d/platform/winrt/inet_ntop_winrt.h rename to cocos/platform/winrt/inet_ntop_winrt.h diff --git a/cocos/2d/platform/winrt/pch.cpp b/cocos/platform/winrt/pch.cpp similarity index 100% rename from cocos/2d/platform/winrt/pch.cpp rename to cocos/platform/winrt/pch.cpp diff --git a/cocos/2d/platform/winrt/pch.h b/cocos/platform/winrt/pch.h similarity index 100% rename from cocos/2d/platform/winrt/pch.h rename to cocos/platform/winrt/pch.h diff --git a/cocos/2d/platform/winrt/sha1.cpp b/cocos/platform/winrt/sha1.cpp similarity index 100% rename from cocos/2d/platform/winrt/sha1.cpp rename to cocos/platform/winrt/sha1.cpp diff --git a/cocos/2d/platform/winrt/sha1.h b/cocos/platform/winrt/sha1.h similarity index 100% rename from cocos/2d/platform/winrt/sha1.h rename to cocos/platform/winrt/sha1.h diff --git a/cocos/2d/platform/winrt/shaders/precompiledshaders.h b/cocos/platform/winrt/shaders/precompiledshaders.h similarity index 100% rename from cocos/2d/platform/winrt/shaders/precompiledshaders.h rename to cocos/platform/winrt/shaders/precompiledshaders.h diff --git a/cocos/2d/platform/wp8-xaml/CopyTemplateFiles.vcxproj b/cocos/platform/wp8-xaml/CopyTemplateFiles.vcxproj similarity index 100% rename from cocos/2d/platform/wp8-xaml/CopyTemplateFiles.vcxproj rename to cocos/platform/wp8-xaml/CopyTemplateFiles.vcxproj diff --git a/cocos/2d/platform/wp8-xaml/CopyTemplateFiles.vcxproj.filters b/cocos/platform/wp8-xaml/CopyTemplateFiles.vcxproj.filters similarity index 100% rename from cocos/2d/platform/wp8-xaml/CopyTemplateFiles.vcxproj.filters rename to cocos/platform/wp8-xaml/CopyTemplateFiles.vcxproj.filters diff --git a/cocos/2d/platform/wp8-xaml/cpp/Cocos2dRenderer.cpp b/cocos/platform/wp8-xaml/cpp/Cocos2dRenderer.cpp similarity index 100% rename from cocos/2d/platform/wp8-xaml/cpp/Cocos2dRenderer.cpp rename to cocos/platform/wp8-xaml/cpp/Cocos2dRenderer.cpp diff --git a/cocos/2d/platform/wp8-xaml/cpp/Cocos2dRenderer.h b/cocos/platform/wp8-xaml/cpp/Cocos2dRenderer.h similarity index 100% rename from cocos/2d/platform/wp8-xaml/cpp/Cocos2dRenderer.h rename to cocos/platform/wp8-xaml/cpp/Cocos2dRenderer.h diff --git a/cocos/2d/platform/wp8-xaml/cpp/Direct3DContentProvider.cpp b/cocos/platform/wp8-xaml/cpp/Direct3DContentProvider.cpp similarity index 100% rename from cocos/2d/platform/wp8-xaml/cpp/Direct3DContentProvider.cpp rename to cocos/platform/wp8-xaml/cpp/Direct3DContentProvider.cpp diff --git a/cocos/2d/platform/wp8-xaml/cpp/Direct3DContentProvider.h b/cocos/platform/wp8-xaml/cpp/Direct3DContentProvider.h similarity index 100% rename from cocos/2d/platform/wp8-xaml/cpp/Direct3DContentProvider.h rename to cocos/platform/wp8-xaml/cpp/Direct3DContentProvider.h diff --git a/cocos/2d/platform/wp8-xaml/cpp/Direct3DInterop.cpp b/cocos/platform/wp8-xaml/cpp/Direct3DInterop.cpp similarity index 100% rename from cocos/2d/platform/wp8-xaml/cpp/Direct3DInterop.cpp rename to cocos/platform/wp8-xaml/cpp/Direct3DInterop.cpp diff --git a/cocos/2d/platform/wp8-xaml/cpp/Direct3DInterop.h b/cocos/platform/wp8-xaml/cpp/Direct3DInterop.h similarity index 100% rename from cocos/2d/platform/wp8-xaml/cpp/Direct3DInterop.h rename to cocos/platform/wp8-xaml/cpp/Direct3DInterop.h diff --git a/cocos/2d/platform/wp8-xaml/cpp/DirectXBase.cpp b/cocos/platform/wp8-xaml/cpp/DirectXBase.cpp similarity index 100% rename from cocos/2d/platform/wp8-xaml/cpp/DirectXBase.cpp rename to cocos/platform/wp8-xaml/cpp/DirectXBase.cpp diff --git a/cocos/2d/platform/wp8-xaml/cpp/DirectXBase.h b/cocos/platform/wp8-xaml/cpp/DirectXBase.h similarity index 100% rename from cocos/2d/platform/wp8-xaml/cpp/DirectXBase.h rename to cocos/platform/wp8-xaml/cpp/DirectXBase.h diff --git a/cocos/2d/platform/wp8-xaml/cpp/DirectXHelper.h b/cocos/platform/wp8-xaml/cpp/DirectXHelper.h similarity index 100% rename from cocos/2d/platform/wp8-xaml/cpp/DirectXHelper.h rename to cocos/platform/wp8-xaml/cpp/DirectXHelper.h diff --git a/cocos/2d/platform/wp8-xaml/cpp/EditBoxEvent.cpp b/cocos/platform/wp8-xaml/cpp/EditBoxEvent.cpp similarity index 100% rename from cocos/2d/platform/wp8-xaml/cpp/EditBoxEvent.cpp rename to cocos/platform/wp8-xaml/cpp/EditBoxEvent.cpp diff --git a/cocos/2d/platform/wp8-xaml/cpp/EditBoxEvent.h b/cocos/platform/wp8-xaml/cpp/EditBoxEvent.h similarity index 100% rename from cocos/2d/platform/wp8-xaml/cpp/EditBoxEvent.h rename to cocos/platform/wp8-xaml/cpp/EditBoxEvent.h diff --git a/cocos/2d/platform/wp8-xaml/xaml/App.xaml b/cocos/platform/wp8-xaml/xaml/App.xaml similarity index 100% rename from cocos/2d/platform/wp8-xaml/xaml/App.xaml rename to cocos/platform/wp8-xaml/xaml/App.xaml diff --git a/cocos/2d/platform/wp8-xaml/xaml/App.xaml.cs b/cocos/platform/wp8-xaml/xaml/App.xaml.cs similarity index 100% rename from cocos/2d/platform/wp8-xaml/xaml/App.xaml.cs rename to cocos/platform/wp8-xaml/xaml/App.xaml.cs diff --git a/cocos/2d/platform/wp8-xaml/xaml/EditBox.xaml b/cocos/platform/wp8-xaml/xaml/EditBox.xaml similarity index 100% rename from cocos/2d/platform/wp8-xaml/xaml/EditBox.xaml rename to cocos/platform/wp8-xaml/xaml/EditBox.xaml diff --git a/cocos/2d/platform/wp8-xaml/xaml/EditBox.xaml.cs b/cocos/platform/wp8-xaml/xaml/EditBox.xaml.cs similarity index 100% rename from cocos/2d/platform/wp8-xaml/xaml/EditBox.xaml.cs rename to cocos/platform/wp8-xaml/xaml/EditBox.xaml.cs diff --git a/cocos/2d/platform/wp8-xaml/xaml/MainPage.xaml b/cocos/platform/wp8-xaml/xaml/MainPage.xaml similarity index 100% rename from cocos/2d/platform/wp8-xaml/xaml/MainPage.xaml rename to cocos/platform/wp8-xaml/xaml/MainPage.xaml diff --git a/cocos/2d/platform/wp8-xaml/xaml/MainPage.xaml.cs b/cocos/platform/wp8-xaml/xaml/MainPage.xaml.cs similarity index 100% rename from cocos/2d/platform/wp8-xaml/xaml/MainPage.xaml.cs rename to cocos/platform/wp8-xaml/xaml/MainPage.xaml.cs diff --git a/cocos/2d/platform/wp8/CCGLView.cpp b/cocos/platform/wp8/CCGLView.cpp similarity index 98% rename from cocos/2d/platform/wp8/CCGLView.cpp rename to cocos/platform/wp8/CCGLView.cpp index d89fab28f5..c6869b3fe8 100644 --- a/cocos/2d/platform/wp8/CCGLView.cpp +++ b/cocos/platform/wp8/CCGLView.cpp @@ -24,14 +24,14 @@ THE SOFTWARE. ****************************************************************************/ #include "CCGLView.h" -#include "CCSet.h" -#include "ccMacros.h" -#include "CCDirector.h" -#include "CCTouch.h" -#include "CCIMEDispatcher.h" +#include "deprecated/CCSet.h" +#include "base/ccMacros.h" +#include "base/CCDirector.h" +#include "base/CCTouch.h" +#include "base/CCIMEDispatcher.h" #include "CCApplication.h" #include "CCWinRTUtils.h" -#include "CCNotificationCenter.h" +#include "deprecated/CCNotificationCenter.h" using namespace Platform; using namespace Windows::Foundation; @@ -397,7 +397,7 @@ void GLView::UpdateWindowSize() } } -const Matrix& GLView::getOrientationMatrix() const +const Mat4& GLView::getOrientationMatrix() const { return m_orientationMatrix; }; diff --git a/cocos/2d/platform/wp8/CCGLView.h b/cocos/platform/wp8/CCGLView.h similarity index 96% rename from cocos/2d/platform/wp8/CCGLView.h rename to cocos/platform/wp8/CCGLView.h index 9ffa1f9d29..69914a8aa2 100644 --- a/cocos/2d/platform/wp8/CCGLView.h +++ b/cocos/platform/wp8/CCGLView.h @@ -61,8 +61,8 @@ public: virtual void swapBuffers(); virtual void setViewPortInPoints(float x , float y , float w , float h); virtual void setScissorInPoints(float x , float y , float w , float h); - const Matrix& getOrientationMatrix() const; - const Matrix& getReverseOrientationMatrix () const {return m_reverseOrientationMatrix;}; + const Mat4& getOrientationMatrix() const; + const Mat4& getReverseOrientationMatrix () const {return m_reverseOrientationMatrix;}; Windows::Graphics::Display::DisplayOrientations getDeviceOrientation() {return m_orientation;}; @@ -162,8 +162,8 @@ private: bool m_lastPointValid; bool m_windowClosed; bool m_windowVisible; - Matrix m_orientationMatrix; - Matrix m_reverseOrientationMatrix; + Mat4 m_orientationMatrix; + Mat4 m_reverseOrientationMatrix; bool m_running; diff --git a/cocos/2d/platform/wp8/Direct3DBase.cpp b/cocos/platform/wp8/Direct3DBase.cpp similarity index 95% rename from cocos/2d/platform/wp8/Direct3DBase.cpp rename to cocos/platform/wp8/Direct3DBase.cpp index f909b07507..7d378b3ef0 100644 --- a/cocos/2d/platform/wp8/Direct3DBase.cpp +++ b/cocos/platform/wp8/Direct3DBase.cpp @@ -1,4 +1,8 @@ -#include "Direct3DBase.h" +// XXX: For some reason, this file must not be compiled +// XXX: Ask MS why +#if 0 + +#include "Direct3DBase.h" using namespace DirectX; @@ -330,9 +334,9 @@ void Direct3DBase::ComputeOrientationMatrices() } } -Vec2 Direct3DBase::TransformToOrientation(Vec2 point, bool dipsToPixels) +Point Direct3DBase::TransformToOrientation(Point point, bool dipsToPixels) { - Vec2 returnValue; + Point returnValue; switch (m_orientation) { @@ -340,20 +344,22 @@ Vec2 Direct3DBase::TransformToOrientation(Vec2 point, bool dipsToPixels) returnValue = point; break; case DisplayOrientations::Landscape: - returnValue = Vec2(point.Y, m_windowBounds.Width - point.X); + returnValue = Point(point.Y, m_windowBounds.Width - point.X); break; case DisplayOrientations::PortraitFlipped: - returnValue = Vec2(m_windowBounds.Width - point.X, m_windowBounds.Height - point.Y); + returnValue = Point(m_windowBounds.Width - point.X, m_windowBounds.Height - point.Y); break; case DisplayOrientations::LandscapeFlipped: - returnValue = Vec2(m_windowBounds.Height -point.Y, point.X); + returnValue = Point(m_windowBounds.Height - point.Y, point.X); break; default: throw ref new Platform::FailureException(); break; } - return dipsToPixels ? Vec2(ConvertDipsToPixels(returnValue.X), + return dipsToPixels ? Point(ConvertDipsToPixels(returnValue.X), ConvertDipsToPixels(returnValue.Y)) : returnValue; } + +#endif // 0 diff --git a/cocos/2d/platform/wp8/Direct3DBase.h b/cocos/platform/wp8/Direct3DBase.h similarity index 89% rename from cocos/2d/platform/wp8/Direct3DBase.h rename to cocos/platform/wp8/Direct3DBase.h index dfc4bfd3af..d5737bbbde 100644 --- a/cocos/2d/platform/wp8/Direct3DBase.h +++ b/cocos/platform/wp8/Direct3DBase.h @@ -1,5 +1,10 @@ #pragma once +// XXX: For some reason, this file must not be compiled +// XXX: Ask MS why +#if 0 + + #include #include #include @@ -24,7 +29,7 @@ public: virtual void Present(); virtual float ConvertDipsToPixels(float dips); virtual void ComputeOrientationMatrices(); - virtual Windows::Foundation::Vec2 TransformToOrientation(Windows::Foundation::Vec2 point, bool dipsToPixels=true); + virtual Windows::Foundation::Point TransformToOrientation(Windows::Foundation::Point point, bool dipsToPixels=true); float getOrientedWindowWidth() {return m_orientedScreenSize.Width;}; float getOrientedWindowHeight() {return m_orientedScreenSize.Height;}; @@ -53,4 +58,6 @@ protected private: // Transforms used for rendering 2D and 3D elements in proper orientation DirectX::XMMATRIX m_orientationTransform3D; DirectX::XMMATRIX m_orientationTransform2D; -}; \ No newline at end of file +}; + +#endif // 0 diff --git a/cocos/2d/platform/wp8/DirectXBase.cpp b/cocos/platform/wp8/DirectXBase.cpp similarity index 100% rename from cocos/2d/platform/wp8/DirectXBase.cpp rename to cocos/platform/wp8/DirectXBase.cpp diff --git a/cocos/2d/platform/wp8/DirectXBase.h b/cocos/platform/wp8/DirectXBase.h similarity index 100% rename from cocos/2d/platform/wp8/DirectXBase.h rename to cocos/platform/wp8/DirectXBase.h diff --git a/cocos/2d/platform/wp8/shaders/precompiledshaders.h b/cocos/platform/wp8/shaders/precompiledshaders.h similarity index 100% rename from cocos/2d/platform/wp8/shaders/precompiledshaders.h rename to cocos/platform/wp8/shaders/precompiledshaders.h diff --git a/cocos/renderer/CCBatchCommand.cpp b/cocos/renderer/CCBatchCommand.cpp index 8cd92c148d..e122fc1344 100644 --- a/cocos/renderer/CCBatchCommand.cpp +++ b/cocos/renderer/CCBatchCommand.cpp @@ -25,8 +25,8 @@ #include "renderer/CCBatchCommand.h" #include "renderer/ccGLStateCache.h" -#include "2d/CCTextureAtlas.h" -#include "2d/CCTexture2D.h" +#include "renderer/CCTextureAtlas.h" +#include "renderer/CCTexture2D.h" NS_CC_BEGIN diff --git a/cocos/renderer/CCBatchCommand.h b/cocos/renderer/CCBatchCommand.h index d5920b369b..a91abdac22 100644 --- a/cocos/renderer/CCBatchCommand.h +++ b/cocos/renderer/CCBatchCommand.h @@ -25,7 +25,7 @@ #ifndef _CC_BATCHCOMMAND_H_ #define _CC_BATCHCOMMAND_H_ -#include "CCRenderCommand.h" +#include "renderer/CCRenderCommand.h" #include "renderer/CCGLProgram.h" #include "CCRenderCommandPool.h" diff --git a/cocos/renderer/CCCustomCommand.h b/cocos/renderer/CCCustomCommand.h index 03fdead69a..a1f1ea04f2 100644 --- a/cocos/renderer/CCCustomCommand.h +++ b/cocos/renderer/CCCustomCommand.h @@ -26,8 +26,8 @@ #ifndef _CC_CUSTOMCOMMAND_H_ #define _CC_CUSTOMCOMMAND_H_ -#include "CCRenderCommand.h" -#include "CCRenderCommandPool.h" +#include "renderer/CCRenderCommand.h" +#include "renderer/CCRenderCommandPool.h" NS_CC_BEGIN diff --git a/cocos/renderer/CCGLProgram.cpp b/cocos/renderer/CCGLProgram.cpp index 8d43154f2c..9806874f03 100644 --- a/cocos/renderer/CCGLProgram.cpp +++ b/cocos/renderer/CCGLProgram.cpp @@ -26,19 +26,21 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "base/CCDirector.h" #include "renderer/CCGLProgram.h" -#include "renderer/ccGLStateCache.h" -#include "base/ccMacros.h" -#include "2d/platform/CCFileUtils.h" -#include "2d/uthash.h" -#include "deprecated/CCString.h" -#include "CCGL.h" #ifndef WIN32 #include #endif +#include "base/CCDirector.h" +#include "base/ccMacros.h" +#include "base/uthash.h" +#include "renderer/ccGLStateCache.h" +#include "platform/CCFileUtils.h" +#include "CCGL.h" + +#include "deprecated/CCString.h" + #if (CC_TARGET_PLATFORM == CC_PLATFORM_WINRT) || (CC_TARGET_PLATFORM == CC_PLATFORM_WP8) #include "CCPrecompiledShaders.h" #endif diff --git a/cocos/renderer/CCGLProgram.h b/cocos/renderer/CCGLProgram.h index d77847e5a4..0958ed8ebb 100644 --- a/cocos/renderer/CCGLProgram.h +++ b/cocos/renderer/CCGLProgram.h @@ -30,12 +30,13 @@ THE SOFTWARE. #ifndef __CCGLPROGRAM_H__ #define __CCGLPROGRAM_H__ +#include + #include "base/ccMacros.h" #include "base/CCRef.h" #include "base/ccTypes.h" #include "CCGL.h" #include "math/CCMath.h" -#include NS_CC_BEGIN diff --git a/cocos/renderer/CCGLProgramCache.cpp b/cocos/renderer/CCGLProgramCache.cpp index 9ea37905e0..c2ce9c9dbf 100644 --- a/cocos/renderer/CCGLProgramCache.cpp +++ b/cocos/renderer/CCGLProgramCache.cpp @@ -26,6 +26,7 @@ THE SOFTWARE. ****************************************************************************/ #include "renderer/CCGLProgramCache.h" + #include "renderer/CCGLProgram.h" #include "renderer/ccShaders.h" #include "base/ccMacros.h" diff --git a/cocos/renderer/CCGLProgramCache.h b/cocos/renderer/CCGLProgramCache.h index 1f9914f0f8..b57cf35563 100644 --- a/cocos/renderer/CCGLProgramCache.h +++ b/cocos/renderer/CCGLProgramCache.h @@ -28,11 +28,11 @@ THE SOFTWARE. #ifndef __CCGLPROGRAMCACHE_H__ #define __CCGLPROGRAMCACHE_H__ -#include "base/CCRef.h" - #include #include +#include "base/CCRef.h" + NS_CC_BEGIN class GLProgram; diff --git a/cocos/renderer/CCGLProgramState.cpp b/cocos/renderer/CCGLProgramState.cpp index e0af0859b7..eadae38e75 100644 --- a/cocos/renderer/CCGLProgramState.cpp +++ b/cocos/renderer/CCGLProgramState.cpp @@ -27,11 +27,12 @@ THE SOFTWARE. ****************************************************************************/ #include "renderer/CCGLProgramState.h" + #include "renderer/CCGLProgram.h" #include "renderer/CCGLProgramStateCache.h" #include "renderer/CCGLProgramCache.h" #include "renderer/ccGLStateCache.h" -#include "2d/CCTexture2D.h" +#include "renderer/CCTexture2D.h" NS_CC_BEGIN diff --git a/cocos/renderer/CCGLProgramState.h b/cocos/renderer/CCGLProgramState.h index fb117a9eed..babfed8fed 100644 --- a/cocos/renderer/CCGLProgramState.h +++ b/cocos/renderer/CCGLProgramState.h @@ -25,13 +25,13 @@ THE SOFTWARE. #ifndef __CCGLPROGRAMSTATE_H__ #define __CCGLPROGRAMSTATE_H__ +#include + #include "base/ccTypes.h" #include "base/CCVector.h" -#include "math/Vector2.h" -#include "math/Vector3.h" -#include "math/Vector4.h" - -#include +#include "math/Vec2.h" +#include "math/Vec3.h" +#include "math/Vec4.h" NS_CC_BEGIN diff --git a/cocos/renderer/CCGLProgramStateCache.cpp b/cocos/renderer/CCGLProgramStateCache.cpp index 51ddef546a..dd80d592b4 100644 --- a/cocos/renderer/CCGLProgramStateCache.cpp +++ b/cocos/renderer/CCGLProgramStateCache.cpp @@ -23,6 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include "renderer/CCGLProgramStateCache.h" + #include "renderer/CCGLProgramState.h" #include "renderer/CCGLProgram.h" diff --git a/cocos/renderer/CCGLProgramStateCache.h b/cocos/renderer/CCGLProgramStateCache.h index ed0bdbe499..88b6b41a9a 100644 --- a/cocos/renderer/CCGLProgramStateCache.h +++ b/cocos/renderer/CCGLProgramStateCache.h @@ -27,11 +27,10 @@ THE SOFTWARE. #include "base/ccTypes.h" #include "base/CCVector.h" -#include "math/Vector2.h" -#include "math/Vector3.h" -#include "math/Vector4.h" - #include "base/CCMap.h" +#include "math/Vec2.h" +#include "math/Vec3.h" +#include "math/Vec4.h" NS_CC_BEGIN diff --git a/cocos/renderer/CCGroupCommand.h b/cocos/renderer/CCGroupCommand.h index 2fe829a8e7..56748468f0 100644 --- a/cocos/renderer/CCGroupCommand.h +++ b/cocos/renderer/CCGroupCommand.h @@ -26,12 +26,12 @@ #ifndef _CC_GROUPCOMMAND_H_ #define _CC_GROUPCOMMAND_H_ +#include + #include "base/CCRef.h" #include "CCRenderCommand.h" #include "CCRenderCommandPool.h" -#include - NS_CC_BEGIN class GroupCommandManager : public Ref diff --git a/cocos/renderer/CCQuadCommand.cpp b/cocos/renderer/CCQuadCommand.cpp index 1aae065718..4b497ff253 100644 --- a/cocos/renderer/CCQuadCommand.cpp +++ b/cocos/renderer/CCQuadCommand.cpp @@ -24,6 +24,7 @@ #include "renderer/CCQuadCommand.h" + #include "renderer/ccGLStateCache.h" #include "renderer/CCGLProgram.h" #include "renderer/CCGLProgramState.h" diff --git a/cocos/renderer/CCRenderCommand.cpp b/cocos/renderer/CCRenderCommand.cpp index 578f28d426..0c11c5699b 100644 --- a/cocos/renderer/CCRenderCommand.cpp +++ b/cocos/renderer/CCRenderCommand.cpp @@ -23,7 +23,7 @@ ****************************************************************************/ -#include "CCRenderCommand.h" +#include "renderer/CCRenderCommand.h" NS_CC_BEGIN diff --git a/cocos/renderer/CCRenderCommand.h b/cocos/renderer/CCRenderCommand.h index a8eeb5a45a..2caf58e2a0 100644 --- a/cocos/renderer/CCRenderCommand.h +++ b/cocos/renderer/CCRenderCommand.h @@ -26,8 +26,9 @@ #ifndef __CCRENDERCOMMAND_H_ #define __CCRENDERCOMMAND_H_ -#include "base/CCPlatformMacros.h" #include + +#include "base/CCPlatformMacros.h" #include "base/ccTypes.h" NS_CC_BEGIN diff --git a/cocos/renderer/CCRenderCommandPool.h b/cocos/renderer/CCRenderCommandPool.h index cfc52ab416..a90ef31f76 100644 --- a/cocos/renderer/CCRenderCommandPool.h +++ b/cocos/renderer/CCRenderCommandPool.h @@ -28,7 +28,9 @@ #include #include + #include "base/CCPlatformMacros.h" + NS_CC_BEGIN template diff --git a/cocos/renderer/CCRenderer.h b/cocos/renderer/CCRenderer.h index cadb5acd4e..434214db09 100644 --- a/cocos/renderer/CCRenderer.h +++ b/cocos/renderer/CCRenderer.h @@ -26,13 +26,14 @@ #ifndef __CC_RENDERER_H_ #define __CC_RENDERER_H_ -#include "base/CCPlatformMacros.h" -#include "CCRenderCommand.h" -#include "renderer/CCGLProgram.h" -#include "CCGL.h" #include #include +#include "base/CCPlatformMacros.h" +#include "renderer/CCRenderCommand.h" +#include "renderer/CCGLProgram.h" +#include "CCGL.h" + NS_CC_BEGIN class EventListenerCustom; diff --git a/cocos/2d/CCTexture2D.cpp b/cocos/renderer/CCTexture2D.cpp similarity index 99% rename from cocos/2d/CCTexture2D.cpp rename to cocos/renderer/CCTexture2D.cpp index f6a6df9033..3477268257 100644 --- a/cocos/2d/CCTexture2D.cpp +++ b/cocos/renderer/CCTexture2D.cpp @@ -31,11 +31,12 @@ THE SOFTWARE. * https://devforums.apple.com/message/37855#37855 by a1studmuffin */ +#include "renderer/CCTexture2D.h" + #include "CCGL.h" -#include "2d/CCTexture2D.h" -#include "2d/platform/CCImage.h" -#include "2d/ccUtils.h" -#include "2d/platform/CCDevice.h" +#include "platform/CCImage.h" +#include "base/ccUtils.h" +#include "platform/CCDevice.h" #include "base/ccConfig.h" #include "base/ccMacros.h" #include "base/CCConfiguration.h" @@ -49,7 +50,7 @@ THE SOFTWARE. #if CC_ENABLE_CACHE_TEXTURE_DATA - #include "2d/CCTextureCache.h" + #include "renderer/CCTextureCache.h" #endif NS_CC_BEGIN diff --git a/cocos/2d/CCTexture2D.h b/cocos/renderer/CCTexture2D.h similarity index 100% rename from cocos/2d/CCTexture2D.h rename to cocos/renderer/CCTexture2D.h diff --git a/cocos/2d/CCTextureAtlas.cpp b/cocos/renderer/CCTextureAtlas.cpp similarity index 99% rename from cocos/2d/CCTextureAtlas.cpp rename to cocos/renderer/CCTextureAtlas.cpp index 847149e520..332a0246bb 100644 --- a/cocos/2d/CCTextureAtlas.cpp +++ b/cocos/renderer/CCTextureAtlas.cpp @@ -25,24 +25,25 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -// cocos2d -#include "2d/CCTextureAtlas.h" -#include "2d/CCTextureCache.h" +#include "renderer/CCTextureAtlas.h" + +#include + #include "base/ccMacros.h" -#include "renderer/CCGLProgram.h" -#include "renderer/ccGLStateCache.h" #include "base/CCEventType.h" #include "base/CCDirector.h" -#include "CCGL.h" #include "base/CCConfiguration.h" -#include "renderer/CCRenderer.h" - -// support -#include "2d/CCTexture2D.h" -#include "deprecated/CCString.h" -#include #include "base/CCEventDispatcher.h" #include "base/CCEventListenerCustom.h" +#include "renderer/CCTextureCache.h" +#include "renderer/CCGLProgram.h" +#include "renderer/ccGLStateCache.h" +#include "renderer/CCRenderer.h" +#include "renderer/CCTexture2D.h" +#include "CCGL.h" + + +#include "deprecated/CCString.h" //According to some tests GL_TRIANGLE_STRIP is slower, MUCH slower. Probably I'm doing something very wrong diff --git a/cocos/2d/CCTextureAtlas.h b/cocos/renderer/CCTextureAtlas.h similarity index 99% rename from cocos/2d/CCTextureAtlas.h rename to cocos/renderer/CCTextureAtlas.h index 1916af4e94..5dd431d116 100644 --- a/cocos/2d/CCTextureAtlas.h +++ b/cocos/renderer/CCTextureAtlas.h @@ -28,10 +28,11 @@ THE SOFTWARE. #ifndef __CCTEXTURE_ATLAS_H__ #define __CCTEXTURE_ATLAS_H__ +#include + #include "base/ccTypes.h" #include "base/CCRef.h" #include "base/ccConfig.h" -#include NS_CC_BEGIN diff --git a/cocos/2d/CCTextureCache.cpp b/cocos/renderer/CCTextureCache.cpp similarity index 99% rename from cocos/2d/CCTextureCache.cpp rename to cocos/renderer/CCTextureCache.cpp index 44f52e9f49..87ebe6195d 100644 --- a/cocos/2d/CCTextureCache.cpp +++ b/cocos/renderer/CCTextureCache.cpp @@ -25,24 +25,26 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ +#include "renderer/CCTextureCache.h" + #include #include #include #include -#include "2d/CCTextureCache.h" -#include "2d/CCTexture2D.h" +#include "renderer/CCTexture2D.h" #include "base/ccMacros.h" #include "base/CCDirector.h" -#include "2d/platform/CCFileUtils.h" -#include "2d/ccUtils.h" #include "base/CCScheduler.h" +#include "platform/CCFileUtils.h" +#include "base/ccUtils.h" + #include "deprecated/CCString.h" #ifdef EMSCRIPTEN #include -#include "2d/platform/emscripten/CCTextureCacheEmscripten.h" +#include "platform/emscripten/CCTextureCacheEmscripten.h" #endif // EMSCRIPTEN using namespace std; diff --git a/cocos/2d/CCTextureCache.h b/cocos/renderer/CCTextureCache.h similarity index 98% rename from cocos/2d/CCTextureCache.h rename to cocos/renderer/CCTextureCache.h index e3e3437a19..993ceb6b0b 100644 --- a/cocos/2d/CCTextureCache.h +++ b/cocos/renderer/CCTextureCache.h @@ -38,11 +38,11 @@ THE SOFTWARE. #include #include "base/CCRef.h" -#include "2d/CCTexture2D.h" -#include "2d/platform/CCImage.h" +#include "renderer/CCTexture2D.h" +#include "platform/CCImage.h" #if CC_ENABLE_CACHE_TEXTURE_DATA - #include "2d/platform/CCImage.h" + #include "platform/CCImage.h" #include #endif diff --git a/cocos/renderer/CMakeLists.txt b/cocos/renderer/CMakeLists.txt index 35cc09b4d8..42a78f3c23 100644 --- a/cocos/renderer/CMakeLists.txt +++ b/cocos/renderer/CMakeLists.txt @@ -1,15 +1,18 @@ set(COCOS_RENDERER_SRC - renderer/CCBatchCommand.cpp - renderer/CCCustomCommand.cpp - renderer/CCGLProgram.cpp - renderer/CCGLProgramState.cpp - renderer/CCGLProgramStateCache.cpp - renderer/CCGroupCommand.cpp - renderer/CCQuadCommand.cpp - renderer/CCRenderCommand.cpp - renderer/CCRenderer.cpp - renderer/CCGLProgramCache.cpp - renderer/ccGLStateCache.cpp - renderer/ccShaders.cpp + renderer/CCBatchCommand.cpp + renderer/CCCustomCommand.cpp + renderer/CCGLProgramCache.cpp + renderer/CCGLProgram.cpp + renderer/CCGLProgramStateCache.cpp + renderer/CCGLProgramState.cpp + renderer/ccGLStateCache.cpp + renderer/CCGroupCommand.cpp + renderer/CCQuadCommand.cpp + renderer/CCRenderCommand.cpp + renderer/CCRenderer.cpp + renderer/ccShaders.cpp + renderer/CCTexture2D.cpp + renderer/CCTextureAtlas.cpp + renderer/CCTextureCache.cpp ) diff --git a/cocos/renderer/ccGLStateCache.cpp b/cocos/renderer/ccGLStateCache.cpp index 7f4db72592..33b85c9b7a 100644 --- a/cocos/renderer/ccGLStateCache.cpp +++ b/cocos/renderer/ccGLStateCache.cpp @@ -26,6 +26,7 @@ THE SOFTWARE. ****************************************************************************/ #include "renderer/ccGLStateCache.h" + #include "renderer/CCGLProgram.h" #include "base/CCDirector.h" #include "base/ccConfig.h" diff --git a/cocos/scripting/lua-bindings/manual/CCLuaEngine.h b/cocos/scripting/lua-bindings/manual/CCLuaEngine.h index d57da90df3..1b43120fd2 100644 --- a/cocos/scripting/lua-bindings/manual/CCLuaEngine.h +++ b/cocos/scripting/lua-bindings/manual/CCLuaEngine.h @@ -31,7 +31,7 @@ extern "C" { } #include "cocos2d.h" -#include "2d/CCScriptSupport.h" +#include "base/CCScriptSupport.h" #include "CCLuaStack.h" #include "CCLuaValue.h" #include "LuaScriptHandlerMgr.h" diff --git a/cocos/scripting/lua-bindings/manual/platform/android/CCLuaJavaBridge.cpp b/cocos/scripting/lua-bindings/manual/platform/android/CCLuaJavaBridge.cpp index 871c9f24b1..14b48ddd17 100644 --- a/cocos/scripting/lua-bindings/manual/platform/android/CCLuaJavaBridge.cpp +++ b/cocos/scripting/lua-bindings/manual/platform/android/CCLuaJavaBridge.cpp @@ -1,6 +1,6 @@ #include "CCLuaJavaBridge.h" -#include "2d/platform/android/jni/JniHelper.h" +#include "platform/android/jni/JniHelper.h" #include #define LOG_TAG "luajc" diff --git a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj index ed02f45ec4..3f682c84da 100644 --- a/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj +++ b/cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj @@ -926,7 +926,7 @@ "OTHER_LDFLAGS[sdk=iphonesimulator7.1]" = "-llua"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../2d/platform/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/ios"; }; name = Debug; }; @@ -950,7 +950,7 @@ "OTHER_LDFLAGS[sdk=iphonesimulator7.1]" = "-llua"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../2d/platform/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/ios"; }; name = Release; }; @@ -970,7 +970,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.0; LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../../../../external/lua/luajit/prebuilt/mac"; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../2d/platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; }; name = Debug; }; @@ -990,7 +990,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.0; LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../../../../external/lua/luajit/prebuilt/mac"; TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../2d/platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../../../platform/mac $(SRCROOT)/../../../../external/glfw3/include/mac"; }; name = Release; }; diff --git a/extensions/GUI/CCEditBox/CCEditBox.h b/extensions/GUI/CCEditBox/CCEditBox.h index d666528d18..5b627ef498 100644 --- a/extensions/GUI/CCEditBox/CCEditBox.h +++ b/extensions/GUI/CCEditBox/CCEditBox.h @@ -26,7 +26,7 @@ #ifndef __CCEDITTEXT_H__ #define __CCEDITTEXT_H__ -#include "2d/CCIMEDelegate.h" +#include "base/CCIMEDelegate.h" #include "extensions/ExtensionMacros.h" #include "../CCControlExtension/CCControlExtensions.h" diff --git a/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp b/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp index e43d85d746..5cef5fd0b8 100644 --- a/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp +++ b/extensions/GUI/CCEditBox/CCEditBoxImplWp8.cpp @@ -25,8 +25,8 @@ THE SOFTWARE. #include "CCEditBoxImplWp8.h" #include "CCEditBox.h" #include "CCGLView.h" -#include "CCScriptSupport.h" -#include "ccUTF8.h" +#include "base/CCScriptSupport.h" +#include "base/ccUTF8.h" NS_CC_EXT_BEGIN diff --git a/extensions/GUI/CCScrollView/CCScrollView.cpp b/extensions/GUI/CCScrollView/CCScrollView.cpp index 020b775a92..f025eea458 100644 --- a/extensions/GUI/CCScrollView/CCScrollView.cpp +++ b/extensions/GUI/CCScrollView/CCScrollView.cpp @@ -25,7 +25,7 @@ #include "CCScrollView.h" #include "CCGLView.h" -#include "2d/platform/CCDevice.h" +#include "platform/CCDevice.h" #include "2d/CCActionInstant.h" #include "2d/CCActionInterval.h" #include "2d/CCActionTween.h" diff --git a/extensions/GUI/CCScrollView/CCTableViewCell.cpp b/extensions/GUI/CCScrollView/CCTableViewCell.cpp index 8965bb036b..3222775cbb 100644 --- a/extensions/GUI/CCScrollView/CCTableViewCell.cpp +++ b/extensions/GUI/CCScrollView/CCTableViewCell.cpp @@ -24,7 +24,7 @@ ****************************************************************************/ #include "CCTableViewCell.h" -#include "2d/ccCArray.h" +#include "base/ccCArray.h" NS_CC_EXT_BEGIN diff --git a/templates/cpp-template-default/proj.android/jni/hellocpp/main.cpp b/templates/cpp-template-default/proj.android/jni/hellocpp/main.cpp index 26fe88c3a5..5199d12ab4 100644 --- a/templates/cpp-template-default/proj.android/jni/hellocpp/main.cpp +++ b/templates/cpp-template-default/proj.android/jni/hellocpp/main.cpp @@ -1,6 +1,6 @@ #include "AppDelegate.h" #include "cocos2d.h" -#include "2d/platform/android/jni/JniHelper.h" +#include "platform/android/jni/JniHelper.h" #include #include diff --git a/templates/cpp-template-default/proj.android/project.properties b/templates/cpp-template-default/proj.android/project.properties index 870a4a196d..dc57659a70 100644 --- a/templates/cpp-template-default/proj.android/project.properties +++ b/templates/cpp-template-default/proj.android/project.properties @@ -10,4 +10,4 @@ # Project target. target=android-10 -android.library.reference.1=../cocos2d/cocos/2d/platform/android/java +android.library.reference.1=../cocos2d/cocos/platform/android/java diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/hellolua/main.cpp b/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/hellolua/main.cpp index 26fe88c3a5..5199d12ab4 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/hellolua/main.cpp +++ b/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/hellolua/main.cpp @@ -1,6 +1,6 @@ #include "AppDelegate.h" #include "cocos2d.h" -#include "2d/platform/android/jni/JniHelper.h" +#include "platform/android/jni/JniHelper.h" #include #include diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/project.properties b/templates/lua-template-default/frameworks/runtime-src/proj.android/project.properties index 44eace38a5..8e5895514b 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.android/project.properties +++ b/templates/lua-template-default/frameworks/runtime-src/proj.android/project.properties @@ -10,4 +10,4 @@ # Project target. target=android-10 -android.library.reference.1=../../cocos2d-x/cocos/2d/platform/android/java +android.library.reference.1=../../cocos2d-x/cocos/platform/android/java diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/lua/main.cpp b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/lua/main.cpp index 8b71bdfb13..3aae632663 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/lua/main.cpp +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/lua/main.cpp @@ -1,6 +1,6 @@ #include "AppDelegate.h" #include "cocos2d.h" -#include "2d/platform/android/jni/JniHelper.h" +#include "platform/android/jni/JniHelper.h" #include #include #include "ConfigParser.h" diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/project.properties b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/project.properties index 44eace38a5..8e5895514b 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/project.properties +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/project.properties @@ -10,4 +10,4 @@ # Project target. target=android-10 -android.library.reference.1=../../cocos2d-x/cocos/2d/platform/android/java +android.library.reference.1=../../cocos2d-x/cocos/platform/android/java diff --git a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/cpp-empty-test.csproj b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/cpp-empty-test.csproj index 4301dbdbb6..386162ebb1 100644 --- a/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/cpp-empty-test.csproj +++ b/tests/cpp-empty-test/proj-wp8-xaml/cpp-empty-test/cpp-empty-test.csproj @@ -90,16 +90,10 @@ 4 - - App.xaml.cs - - - EditBox.xaml.cs - - - MainPage.xaml.cs - + + + True @@ -141,23 +135,6 @@ AppResources.Designer.cs - - - App.xaml - MSBuild:Compile - Designer - - - EditBox.xaml - MSBuild:Compile - Designer - - - MainPage.xaml - MSBuild:Compile - Designer - - {F5D665F8-AE19-4F3F-99A7-230A1E8305D2} @@ -170,6 +147,20 @@ PreserveNewest + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + +