diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e8bed42 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +build +out +super_secret_folder_with_galaxium +.vscode diff --git a/Build.bat b/Build.bat deleted file mode 100644 index a35a137..0000000 --- a/Build.bat +++ /dev/null @@ -1,23 +0,0 @@ -@echo off -cls -title ParturIH314 -setlocal EnableDelayedExpansion -for /F %%a in ('echo prompt $E ^| cmd') do ( - set "ESC=%%a" -) -for /f %%a in (params.txt) do set checkContent=%%a -if not !checkContent! gtr 0 ( -set /p "np=Set your ndk path: " -set /p "pp=Set your project path: " -) else ( -for /f "delims=" %%x in (params.txt) do set pp=%%x -set /p np= Cool img + +## Setup +1. Clone this repo +2. Install CMake +2. Download [Android NDK](https://developer.android.com/ndk/downloads) +4. `export NDK="/path/to/ndk"` ## Compiling ```sh -./build.bat -``` +# Linux +./build.sh -## Loading the libandroidml.so -1. Open GeometryDash/smali/com/robtopx/geometryjump/geometryjump.smali -2. Add this to the first static constructor method -``` - .line 70 - const-string v0, "androidml" - invoke-static {v0}, Ljava/lang/System;->loadLibrary(Ljava/lang/String;)V +# Windows +mkdir build +cd build +cmake .. +cmake --build . ``` --- ## Special thanks -- [Pie](https://github.com/poweredbypie) for headers -- [HJfod](https://github.com/HJfod) for headers -- [Adaf](https://github.com/adafcaefc) for headers, haxormode and beeing Adaf -- [FlairyDash](https://github.com/FlairyDash) for development help +- [Pie](https://github.com/poweredbypie) - headers +- [HJfod](https://github.com/HJfod) - headers +- [Adaf](https://github.com/adafcaefc) - headers, haxormode --- ### Join [Galaxium](https://discord.gg/ZV2zDu6JUX) diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..4a1f2ee --- /dev/null +++ b/build.sh @@ -0,0 +1,4 @@ +mkdir build +cd build +cmake .. -DCMAKE_ANDROID_NDK=$NDK +cmake --build . diff --git a/x32/jni/libs/cocos2dx/CCCamera.h b/include/cocos2dx/CCCamera.h similarity index 100% rename from x32/jni/libs/cocos2dx/CCCamera.h rename to include/cocos2dx/CCCamera.h diff --git a/x32/jni/libs/cocos2dx/CCConfiguration.h b/include/cocos2dx/CCConfiguration.h similarity index 100% rename from x32/jni/libs/cocos2dx/CCConfiguration.h rename to include/cocos2dx/CCConfiguration.h diff --git a/x32/jni/libs/cocos2dx/CCDirector.h b/include/cocos2dx/CCDirector.h similarity index 100% rename from x32/jni/libs/cocos2dx/CCDirector.h rename to include/cocos2dx/CCDirector.h diff --git a/x32/jni/libs/cocos2dx/CCScheduler.h b/include/cocos2dx/CCScheduler.h similarity index 100% rename from x32/jni/libs/cocos2dx/CCScheduler.h rename to include/cocos2dx/CCScheduler.h diff --git a/x32/jni/libs/cocos2dx/actions/CCAction.h b/include/cocos2dx/actions/CCAction.h similarity index 100% rename from x32/jni/libs/cocos2dx/actions/CCAction.h rename to include/cocos2dx/actions/CCAction.h diff --git a/x32/jni/libs/cocos2dx/actions/CCActionCamera.h b/include/cocos2dx/actions/CCActionCamera.h similarity index 100% rename from x32/jni/libs/cocos2dx/actions/CCActionCamera.h rename to include/cocos2dx/actions/CCActionCamera.h diff --git a/x32/jni/libs/cocos2dx/actions/CCActionCatmullRom.h b/include/cocos2dx/actions/CCActionCatmullRom.h similarity index 100% rename from x32/jni/libs/cocos2dx/actions/CCActionCatmullRom.h rename to include/cocos2dx/actions/CCActionCatmullRom.h diff --git a/x32/jni/libs/cocos2dx/actions/CCActionEase.h b/include/cocos2dx/actions/CCActionEase.h similarity index 100% rename from x32/jni/libs/cocos2dx/actions/CCActionEase.h rename to include/cocos2dx/actions/CCActionEase.h diff --git a/x32/jni/libs/cocos2dx/actions/CCActionGrid.h b/include/cocos2dx/actions/CCActionGrid.h similarity index 100% rename from x32/jni/libs/cocos2dx/actions/CCActionGrid.h rename to include/cocos2dx/actions/CCActionGrid.h diff --git a/x32/jni/libs/cocos2dx/actions/CCActionGrid3D.h b/include/cocos2dx/actions/CCActionGrid3D.h similarity index 100% rename from x32/jni/libs/cocos2dx/actions/CCActionGrid3D.h rename to include/cocos2dx/actions/CCActionGrid3D.h diff --git a/x32/jni/libs/cocos2dx/actions/CCActionInstant.h b/include/cocos2dx/actions/CCActionInstant.h similarity index 100% rename from x32/jni/libs/cocos2dx/actions/CCActionInstant.h rename to include/cocos2dx/actions/CCActionInstant.h diff --git a/x32/jni/libs/cocos2dx/actions/CCActionInterval.h b/include/cocos2dx/actions/CCActionInterval.h similarity index 100% rename from x32/jni/libs/cocos2dx/actions/CCActionInterval.h rename to include/cocos2dx/actions/CCActionInterval.h diff --git a/x32/jni/libs/cocos2dx/actions/CCActionManager.h b/include/cocos2dx/actions/CCActionManager.h similarity index 100% rename from x32/jni/libs/cocos2dx/actions/CCActionManager.h rename to include/cocos2dx/actions/CCActionManager.h diff --git a/x32/jni/libs/cocos2dx/actions/CCActionPageTurn3D.h b/include/cocos2dx/actions/CCActionPageTurn3D.h similarity index 100% rename from x32/jni/libs/cocos2dx/actions/CCActionPageTurn3D.h rename to include/cocos2dx/actions/CCActionPageTurn3D.h diff --git a/x32/jni/libs/cocos2dx/actions/CCActionProgressTimer.h b/include/cocos2dx/actions/CCActionProgressTimer.h similarity index 100% rename from x32/jni/libs/cocos2dx/actions/CCActionProgressTimer.h rename to include/cocos2dx/actions/CCActionProgressTimer.h diff --git a/x32/jni/libs/cocos2dx/actions/CCActionTiledGrid.h b/include/cocos2dx/actions/CCActionTiledGrid.h similarity index 100% rename from x32/jni/libs/cocos2dx/actions/CCActionTiledGrid.h rename to include/cocos2dx/actions/CCActionTiledGrid.h diff --git a/x32/jni/libs/cocos2dx/actions/CCActionTween.h b/include/cocos2dx/actions/CCActionTween.h similarity index 100% rename from x32/jni/libs/cocos2dx/actions/CCActionTween.h rename to include/cocos2dx/actions/CCActionTween.h diff --git a/x32/jni/libs/cocos2dx/base_nodes/CCAtlasNode.h b/include/cocos2dx/base_nodes/CCAtlasNode.h similarity index 100% rename from x32/jni/libs/cocos2dx/base_nodes/CCAtlasNode.h rename to include/cocos2dx/base_nodes/CCAtlasNode.h diff --git a/x32/jni/libs/cocos2dx/base_nodes/CCGLBufferedNode.h b/include/cocos2dx/base_nodes/CCGLBufferedNode.h similarity index 100% rename from x32/jni/libs/cocos2dx/base_nodes/CCGLBufferedNode.h rename to include/cocos2dx/base_nodes/CCGLBufferedNode.h diff --git a/x32/jni/libs/cocos2dx/base_nodes/CCNode.h b/include/cocos2dx/base_nodes/CCNode.h similarity index 100% rename from x32/jni/libs/cocos2dx/base_nodes/CCNode.h rename to include/cocos2dx/base_nodes/CCNode.h diff --git a/x32/jni/libs/cocos2dx/ccFPSImages.h b/include/cocos2dx/ccFPSImages.h similarity index 100% rename from x32/jni/libs/cocos2dx/ccFPSImages.h rename to include/cocos2dx/ccFPSImages.h diff --git a/x32/jni/libs/cocos2dx/cocoa/CCAffineTransform.h b/include/cocos2dx/cocoa/CCAffineTransform.h similarity index 100% rename from x32/jni/libs/cocos2dx/cocoa/CCAffineTransform.h rename to include/cocos2dx/cocoa/CCAffineTransform.h diff --git a/x32/jni/libs/cocos2dx/cocoa/CCArray.h b/include/cocos2dx/cocoa/CCArray.h similarity index 100% rename from x32/jni/libs/cocos2dx/cocoa/CCArray.h rename to include/cocos2dx/cocoa/CCArray.h diff --git a/x32/jni/libs/cocos2dx/cocoa/CCAutoreleasePool.h b/include/cocos2dx/cocoa/CCAutoreleasePool.h similarity index 100% rename from x32/jni/libs/cocos2dx/cocoa/CCAutoreleasePool.h rename to include/cocos2dx/cocoa/CCAutoreleasePool.h diff --git a/x32/jni/libs/cocos2dx/cocoa/CCBool.h b/include/cocos2dx/cocoa/CCBool.h similarity index 100% rename from x32/jni/libs/cocos2dx/cocoa/CCBool.h rename to include/cocos2dx/cocoa/CCBool.h diff --git a/x32/jni/libs/cocos2dx/cocoa/CCDataVisitor.h b/include/cocos2dx/cocoa/CCDataVisitor.h similarity index 100% rename from x32/jni/libs/cocos2dx/cocoa/CCDataVisitor.h rename to include/cocos2dx/cocoa/CCDataVisitor.h diff --git a/x32/jni/libs/cocos2dx/cocoa/CCDictionary.h b/include/cocos2dx/cocoa/CCDictionary.h similarity index 100% rename from x32/jni/libs/cocos2dx/cocoa/CCDictionary.h rename to include/cocos2dx/cocoa/CCDictionary.h diff --git a/x32/jni/libs/cocos2dx/cocoa/CCDouble.h b/include/cocos2dx/cocoa/CCDouble.h similarity index 100% rename from x32/jni/libs/cocos2dx/cocoa/CCDouble.h rename to include/cocos2dx/cocoa/CCDouble.h diff --git a/x32/jni/libs/cocos2dx/cocoa/CCFloat.h b/include/cocos2dx/cocoa/CCFloat.h similarity index 100% rename from x32/jni/libs/cocos2dx/cocoa/CCFloat.h rename to include/cocos2dx/cocoa/CCFloat.h diff --git a/x32/jni/libs/cocos2dx/cocoa/CCGeometry.h b/include/cocos2dx/cocoa/CCGeometry.h similarity index 100% rename from x32/jni/libs/cocos2dx/cocoa/CCGeometry.h rename to include/cocos2dx/cocoa/CCGeometry.h diff --git a/x32/jni/libs/cocos2dx/cocoa/CCInteger.h b/include/cocos2dx/cocoa/CCInteger.h similarity index 100% rename from x32/jni/libs/cocos2dx/cocoa/CCInteger.h rename to include/cocos2dx/cocoa/CCInteger.h diff --git a/x32/jni/libs/cocos2dx/cocoa/CCNS.h b/include/cocos2dx/cocoa/CCNS.h similarity index 100% rename from x32/jni/libs/cocos2dx/cocoa/CCNS.h rename to include/cocos2dx/cocoa/CCNS.h diff --git a/x32/jni/libs/cocos2dx/cocoa/CCObject.h b/include/cocos2dx/cocoa/CCObject.h similarity index 100% rename from x32/jni/libs/cocos2dx/cocoa/CCObject.h rename to include/cocos2dx/cocoa/CCObject.h diff --git a/x32/jni/libs/cocos2dx/cocoa/CCSet.h b/include/cocos2dx/cocoa/CCSet.h similarity index 100% rename from x32/jni/libs/cocos2dx/cocoa/CCSet.h rename to include/cocos2dx/cocoa/CCSet.h diff --git a/x32/jni/libs/cocos2dx/cocoa/CCString.h b/include/cocos2dx/cocoa/CCString.h similarity index 100% rename from x32/jni/libs/cocos2dx/cocoa/CCString.h rename to include/cocos2dx/cocoa/CCString.h diff --git a/x32/jni/libs/cocos2dx/cocoa/CCZone.h b/include/cocos2dx/cocoa/CCZone.h similarity index 100% rename from x32/jni/libs/cocos2dx/cocoa/CCZone.h rename to include/cocos2dx/cocoa/CCZone.h diff --git a/x32/jni/libs/cocos2dx/draw_nodes/CCDrawNode.h b/include/cocos2dx/draw_nodes/CCDrawNode.h similarity index 100% rename from x32/jni/libs/cocos2dx/draw_nodes/CCDrawNode.h rename to include/cocos2dx/draw_nodes/CCDrawNode.h diff --git a/x32/jni/libs/cocos2dx/draw_nodes/CCDrawingPrimitives.h b/include/cocos2dx/draw_nodes/CCDrawingPrimitives.h similarity index 100% rename from x32/jni/libs/cocos2dx/draw_nodes/CCDrawingPrimitives.h rename to include/cocos2dx/draw_nodes/CCDrawingPrimitives.h diff --git a/x32/jni/libs/cocos2dx/effects/CCGrabber.h b/include/cocos2dx/effects/CCGrabber.h similarity index 100% rename from x32/jni/libs/cocos2dx/effects/CCGrabber.h rename to include/cocos2dx/effects/CCGrabber.h diff --git a/x32/jni/libs/cocos2dx/effects/CCGrid.h b/include/cocos2dx/effects/CCGrid.h similarity index 100% rename from x32/jni/libs/cocos2dx/effects/CCGrid.h rename to include/cocos2dx/effects/CCGrid.h diff --git a/x32/jni/libs/cocos2dx/include/CCEventType.h b/include/cocos2dx/include/CCEventType.h similarity index 100% rename from x32/jni/libs/cocos2dx/include/CCEventType.h rename to include/cocos2dx/include/CCEventType.h diff --git a/x32/jni/libs/cocos2dx/include/CCProtocols.h b/include/cocos2dx/include/CCProtocols.h similarity index 100% rename from x32/jni/libs/cocos2dx/include/CCProtocols.h rename to include/cocos2dx/include/CCProtocols.h diff --git a/x32/jni/libs/cocos2dx/include/ccConfig.h b/include/cocos2dx/include/ccConfig.h similarity index 100% rename from x32/jni/libs/cocos2dx/include/ccConfig.h rename to include/cocos2dx/include/ccConfig.h diff --git a/x32/jni/libs/cocos2dx/include/ccMacros.h b/include/cocos2dx/include/ccMacros.h similarity index 100% rename from x32/jni/libs/cocos2dx/include/ccMacros.h rename to include/cocos2dx/include/ccMacros.h diff --git a/x32/jni/libs/cocos2dx/include/ccTypeInfo.h b/include/cocos2dx/include/ccTypeInfo.h similarity index 100% rename from x32/jni/libs/cocos2dx/include/ccTypeInfo.h rename to include/cocos2dx/include/ccTypeInfo.h diff --git a/x32/jni/libs/cocos2dx/include/ccTypes.h b/include/cocos2dx/include/ccTypes.h similarity index 100% rename from x32/jni/libs/cocos2dx/include/ccTypes.h rename to include/cocos2dx/include/ccTypes.h diff --git a/x32/jni/libs/cocos2dx/include/cocos2d.h b/include/cocos2dx/include/cocos2d.h similarity index 100% rename from x32/jni/libs/cocos2dx/include/cocos2d.h rename to include/cocos2dx/include/cocos2d.h diff --git a/x32/jni/libs/cocos2dx/kazmath/include/kazmath/GL/mat4stack.h b/include/cocos2dx/kazmath/include/kazmath/GL/mat4stack.h similarity index 100% rename from x32/jni/libs/cocos2dx/kazmath/include/kazmath/GL/mat4stack.h rename to include/cocos2dx/kazmath/include/kazmath/GL/mat4stack.h diff --git a/x32/jni/libs/cocos2dx/kazmath/include/kazmath/GL/matrix.h b/include/cocos2dx/kazmath/include/kazmath/GL/matrix.h similarity index 100% rename from x32/jni/libs/cocos2dx/kazmath/include/kazmath/GL/matrix.h rename to include/cocos2dx/kazmath/include/kazmath/GL/matrix.h diff --git a/x32/jni/libs/cocos2dx/kazmath/include/kazmath/aabb.h b/include/cocos2dx/kazmath/include/kazmath/aabb.h similarity index 100% rename from x32/jni/libs/cocos2dx/kazmath/include/kazmath/aabb.h rename to include/cocos2dx/kazmath/include/kazmath/aabb.h diff --git a/x32/jni/libs/cocos2dx/kazmath/include/kazmath/kazmath.h b/include/cocos2dx/kazmath/include/kazmath/kazmath.h similarity index 100% rename from x32/jni/libs/cocos2dx/kazmath/include/kazmath/kazmath.h rename to include/cocos2dx/kazmath/include/kazmath/kazmath.h diff --git a/x32/jni/libs/cocos2dx/kazmath/include/kazmath/mat3.h b/include/cocos2dx/kazmath/include/kazmath/mat3.h similarity index 100% rename from x32/jni/libs/cocos2dx/kazmath/include/kazmath/mat3.h rename to include/cocos2dx/kazmath/include/kazmath/mat3.h diff --git a/x32/jni/libs/cocos2dx/kazmath/include/kazmath/mat4.h b/include/cocos2dx/kazmath/include/kazmath/mat4.h similarity index 100% rename from x32/jni/libs/cocos2dx/kazmath/include/kazmath/mat4.h rename to include/cocos2dx/kazmath/include/kazmath/mat4.h diff --git a/x32/jni/libs/cocos2dx/kazmath/include/kazmath/neon_matrix_impl.h b/include/cocos2dx/kazmath/include/kazmath/neon_matrix_impl.h similarity index 100% rename from x32/jni/libs/cocos2dx/kazmath/include/kazmath/neon_matrix_impl.h rename to include/cocos2dx/kazmath/include/kazmath/neon_matrix_impl.h diff --git a/x32/jni/libs/cocos2dx/kazmath/include/kazmath/plane.h b/include/cocos2dx/kazmath/include/kazmath/plane.h similarity index 100% rename from x32/jni/libs/cocos2dx/kazmath/include/kazmath/plane.h rename to include/cocos2dx/kazmath/include/kazmath/plane.h diff --git a/x32/jni/libs/cocos2dx/kazmath/include/kazmath/quaternion.h b/include/cocos2dx/kazmath/include/kazmath/quaternion.h similarity index 100% rename from x32/jni/libs/cocos2dx/kazmath/include/kazmath/quaternion.h rename to include/cocos2dx/kazmath/include/kazmath/quaternion.h diff --git a/x32/jni/libs/cocos2dx/kazmath/include/kazmath/ray2.h b/include/cocos2dx/kazmath/include/kazmath/ray2.h similarity index 100% rename from x32/jni/libs/cocos2dx/kazmath/include/kazmath/ray2.h rename to include/cocos2dx/kazmath/include/kazmath/ray2.h diff --git a/x32/jni/libs/cocos2dx/kazmath/include/kazmath/utility.h b/include/cocos2dx/kazmath/include/kazmath/utility.h similarity index 100% rename from x32/jni/libs/cocos2dx/kazmath/include/kazmath/utility.h rename to include/cocos2dx/kazmath/include/kazmath/utility.h diff --git a/x32/jni/libs/cocos2dx/kazmath/include/kazmath/vec2.h b/include/cocos2dx/kazmath/include/kazmath/vec2.h similarity index 100% rename from x32/jni/libs/cocos2dx/kazmath/include/kazmath/vec2.h rename to include/cocos2dx/kazmath/include/kazmath/vec2.h diff --git a/x32/jni/libs/cocos2dx/kazmath/include/kazmath/vec3.h b/include/cocos2dx/kazmath/include/kazmath/vec3.h similarity index 100% rename from x32/jni/libs/cocos2dx/kazmath/include/kazmath/vec3.h rename to include/cocos2dx/kazmath/include/kazmath/vec3.h diff --git a/x32/jni/libs/cocos2dx/kazmath/include/kazmath/vec4.h b/include/cocos2dx/kazmath/include/kazmath/vec4.h similarity index 100% rename from x32/jni/libs/cocos2dx/kazmath/include/kazmath/vec4.h rename to include/cocos2dx/kazmath/include/kazmath/vec4.h diff --git a/x32/jni/libs/cocos2dx/keypad_dispatcher/CCKeypadDelegate.h b/include/cocos2dx/keypad_dispatcher/CCKeypadDelegate.h similarity index 100% rename from x32/jni/libs/cocos2dx/keypad_dispatcher/CCKeypadDelegate.h rename to include/cocos2dx/keypad_dispatcher/CCKeypadDelegate.h diff --git a/x32/jni/libs/cocos2dx/keypad_dispatcher/CCKeypadDispatcher.h b/include/cocos2dx/keypad_dispatcher/CCKeypadDispatcher.h similarity index 100% rename from x32/jni/libs/cocos2dx/keypad_dispatcher/CCKeypadDispatcher.h rename to include/cocos2dx/keypad_dispatcher/CCKeypadDispatcher.h diff --git a/x32/jni/libs/cocos2dx/label_nodes/CCLabelAtlas.h b/include/cocos2dx/label_nodes/CCLabelAtlas.h similarity index 100% rename from x32/jni/libs/cocos2dx/label_nodes/CCLabelAtlas.h rename to include/cocos2dx/label_nodes/CCLabelAtlas.h diff --git a/x32/jni/libs/cocos2dx/label_nodes/CCLabelBMFont.h b/include/cocos2dx/label_nodes/CCLabelBMFont.h similarity index 100% rename from x32/jni/libs/cocos2dx/label_nodes/CCLabelBMFont.h rename to include/cocos2dx/label_nodes/CCLabelBMFont.h diff --git a/x32/jni/libs/cocos2dx/label_nodes/CCLabelTTF.h b/include/cocos2dx/label_nodes/CCLabelTTF.h similarity index 100% rename from x32/jni/libs/cocos2dx/label_nodes/CCLabelTTF.h rename to include/cocos2dx/label_nodes/CCLabelTTF.h diff --git a/x32/jni/libs/cocos2dx/layers_scenes_transitions_nodes/CCLayer.h b/include/cocos2dx/layers_scenes_transitions_nodes/CCLayer.h similarity index 100% rename from x32/jni/libs/cocos2dx/layers_scenes_transitions_nodes/CCLayer.h rename to include/cocos2dx/layers_scenes_transitions_nodes/CCLayer.h diff --git a/x32/jni/libs/cocos2dx/layers_scenes_transitions_nodes/CCScene.h b/include/cocos2dx/layers_scenes_transitions_nodes/CCScene.h similarity index 100% rename from x32/jni/libs/cocos2dx/layers_scenes_transitions_nodes/CCScene.h rename to include/cocos2dx/layers_scenes_transitions_nodes/CCScene.h diff --git a/x32/jni/libs/cocos2dx/layers_scenes_transitions_nodes/CCTransition.h b/include/cocos2dx/layers_scenes_transitions_nodes/CCTransition.h similarity index 100% rename from x32/jni/libs/cocos2dx/layers_scenes_transitions_nodes/CCTransition.h rename to include/cocos2dx/layers_scenes_transitions_nodes/CCTransition.h diff --git a/x32/jni/libs/cocos2dx/layers_scenes_transitions_nodes/CCTransitionPageTurn.h b/include/cocos2dx/layers_scenes_transitions_nodes/CCTransitionPageTurn.h similarity index 100% rename from x32/jni/libs/cocos2dx/layers_scenes_transitions_nodes/CCTransitionPageTurn.h rename to include/cocos2dx/layers_scenes_transitions_nodes/CCTransitionPageTurn.h diff --git a/x32/jni/libs/cocos2dx/layers_scenes_transitions_nodes/CCTransitionProgress.h b/include/cocos2dx/layers_scenes_transitions_nodes/CCTransitionProgress.h similarity index 100% rename from x32/jni/libs/cocos2dx/layers_scenes_transitions_nodes/CCTransitionProgress.h rename to include/cocos2dx/layers_scenes_transitions_nodes/CCTransitionProgress.h diff --git a/x32/jni/libs/cocos2dx/menu_nodes/CCMenu.h b/include/cocos2dx/menu_nodes/CCMenu.h similarity index 100% rename from x32/jni/libs/cocos2dx/menu_nodes/CCMenu.h rename to include/cocos2dx/menu_nodes/CCMenu.h diff --git a/x32/jni/libs/cocos2dx/menu_nodes/CCMenuItem.h b/include/cocos2dx/menu_nodes/CCMenuItem.h similarity index 100% rename from x32/jni/libs/cocos2dx/menu_nodes/CCMenuItem.h rename to include/cocos2dx/menu_nodes/CCMenuItem.h diff --git a/x32/jni/libs/cocos2dx/menu_nodes/CCMenuItemSpriteExtra.h b/include/cocos2dx/menu_nodes/CCMenuItemSpriteExtra.h similarity index 100% rename from x32/jni/libs/cocos2dx/menu_nodes/CCMenuItemSpriteExtra.h rename to include/cocos2dx/menu_nodes/CCMenuItemSpriteExtra.h diff --git a/x32/jni/libs/cocos2dx/misc_nodes/CCClippingNode.h b/include/cocos2dx/misc_nodes/CCClippingNode.h similarity index 100% rename from x32/jni/libs/cocos2dx/misc_nodes/CCClippingNode.h rename to include/cocos2dx/misc_nodes/CCClippingNode.h diff --git a/x32/jni/libs/cocos2dx/misc_nodes/CCMotionStreak.h b/include/cocos2dx/misc_nodes/CCMotionStreak.h similarity index 100% rename from x32/jni/libs/cocos2dx/misc_nodes/CCMotionStreak.h rename to include/cocos2dx/misc_nodes/CCMotionStreak.h diff --git a/x32/jni/libs/cocos2dx/misc_nodes/CCProgressTimer.h b/include/cocos2dx/misc_nodes/CCProgressTimer.h similarity index 100% rename from x32/jni/libs/cocos2dx/misc_nodes/CCProgressTimer.h rename to include/cocos2dx/misc_nodes/CCProgressTimer.h diff --git a/x32/jni/libs/cocos2dx/misc_nodes/CCRenderTexture.h b/include/cocos2dx/misc_nodes/CCRenderTexture.h similarity index 100% rename from x32/jni/libs/cocos2dx/misc_nodes/CCRenderTexture.h rename to include/cocos2dx/misc_nodes/CCRenderTexture.h diff --git a/x32/jni/libs/cocos2dx/particle_nodes/CCParticleBatchNode.h b/include/cocos2dx/particle_nodes/CCParticleBatchNode.h similarity index 100% rename from x32/jni/libs/cocos2dx/particle_nodes/CCParticleBatchNode.h rename to include/cocos2dx/particle_nodes/CCParticleBatchNode.h diff --git a/x32/jni/libs/cocos2dx/particle_nodes/CCParticleExamples.h b/include/cocos2dx/particle_nodes/CCParticleExamples.h similarity index 100% rename from x32/jni/libs/cocos2dx/particle_nodes/CCParticleExamples.h rename to include/cocos2dx/particle_nodes/CCParticleExamples.h diff --git a/x32/jni/libs/cocos2dx/particle_nodes/CCParticleSystem.h b/include/cocos2dx/particle_nodes/CCParticleSystem.h similarity index 100% rename from x32/jni/libs/cocos2dx/particle_nodes/CCParticleSystem.h rename to include/cocos2dx/particle_nodes/CCParticleSystem.h diff --git a/x32/jni/libs/cocos2dx/particle_nodes/CCParticleSystemQuad.h b/include/cocos2dx/particle_nodes/CCParticleSystemQuad.h similarity index 100% rename from x32/jni/libs/cocos2dx/particle_nodes/CCParticleSystemQuad.h rename to include/cocos2dx/particle_nodes/CCParticleSystemQuad.h diff --git a/x32/jni/libs/cocos2dx/particle_nodes/firePngData.h b/include/cocos2dx/particle_nodes/firePngData.h similarity index 100% rename from x32/jni/libs/cocos2dx/particle_nodes/firePngData.h rename to include/cocos2dx/particle_nodes/firePngData.h diff --git a/x32/jni/libs/cocos2dx/platform/CCAccelerometerDelegate.h b/include/cocos2dx/platform/CCAccelerometerDelegate.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/CCAccelerometerDelegate.h rename to include/cocos2dx/platform/CCAccelerometerDelegate.h diff --git a/x32/jni/libs/cocos2dx/platform/CCApplicationProtocol.h b/include/cocos2dx/platform/CCApplicationProtocol.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/CCApplicationProtocol.h rename to include/cocos2dx/platform/CCApplicationProtocol.h diff --git a/x32/jni/libs/cocos2dx/platform/CCCommon.h b/include/cocos2dx/platform/CCCommon.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/CCCommon.h rename to include/cocos2dx/platform/CCCommon.h diff --git a/x32/jni/libs/cocos2dx/platform/CCDevice.h b/include/cocos2dx/platform/CCDevice.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/CCDevice.h rename to include/cocos2dx/platform/CCDevice.h diff --git a/x32/jni/libs/cocos2dx/platform/CCEGLViewProtocol.h b/include/cocos2dx/platform/CCEGLViewProtocol.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/CCEGLViewProtocol.h rename to include/cocos2dx/platform/CCEGLViewProtocol.h diff --git a/x32/jni/libs/cocos2dx/platform/CCFileUtils.h b/include/cocos2dx/platform/CCFileUtils.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/CCFileUtils.h rename to include/cocos2dx/platform/CCFileUtils.h diff --git a/x32/jni/libs/cocos2dx/platform/CCImage.h b/include/cocos2dx/platform/CCImage.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/CCImage.h rename to include/cocos2dx/platform/CCImage.h diff --git a/x32/jni/libs/cocos2dx/platform/CCImageCommon_cpp.h b/include/cocos2dx/platform/CCImageCommon_cpp.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/CCImageCommon_cpp.h rename to include/cocos2dx/platform/CCImageCommon_cpp.h diff --git a/x32/jni/libs/cocos2dx/platform/CCPlatformConfig.h b/include/cocos2dx/platform/CCPlatformConfig.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/CCPlatformConfig.h rename to include/cocos2dx/platform/CCPlatformConfig.h diff --git a/x32/jni/libs/cocos2dx/platform/CCPlatformMacros.h b/include/cocos2dx/platform/CCPlatformMacros.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/CCPlatformMacros.h rename to include/cocos2dx/platform/CCPlatformMacros.h diff --git a/x32/jni/libs/cocos2dx/platform/CCSAXParser.h b/include/cocos2dx/platform/CCSAXParser.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/CCSAXParser.h rename to include/cocos2dx/platform/CCSAXParser.h diff --git a/x32/jni/libs/cocos2dx/platform/CCThread.h b/include/cocos2dx/platform/CCThread.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/CCThread.h rename to include/cocos2dx/platform/CCThread.h diff --git a/x32/jni/libs/cocos2dx/platform/android/CCAccelerometer.h b/include/cocos2dx/platform/android/CCAccelerometer.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/CCAccelerometer.h rename to include/cocos2dx/platform/android/CCAccelerometer.h diff --git a/x32/jni/libs/cocos2dx/platform/android/CCApplication.h b/include/cocos2dx/platform/android/CCApplication.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/CCApplication.h rename to include/cocos2dx/platform/android/CCApplication.h diff --git a/x32/jni/libs/cocos2dx/platform/android/CCEGLView.h b/include/cocos2dx/platform/android/CCEGLView.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/CCEGLView.h rename to include/cocos2dx/platform/android/CCEGLView.h diff --git a/x32/jni/libs/cocos2dx/platform/android/CCFileUtilsAndroid.h b/include/cocos2dx/platform/android/CCFileUtilsAndroid.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/CCFileUtilsAndroid.h rename to include/cocos2dx/platform/android/CCFileUtilsAndroid.h diff --git a/x32/jni/libs/cocos2dx/platform/android/CCGL.h b/include/cocos2dx/platform/android/CCGL.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/CCGL.h rename to include/cocos2dx/platform/android/CCGL.h diff --git a/x32/jni/libs/cocos2dx/platform/android/CCPlatformDefine.h b/include/cocos2dx/platform/android/CCPlatformDefine.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/CCPlatformDefine.h rename to include/cocos2dx/platform/android/CCPlatformDefine.h diff --git a/x32/jni/libs/cocos2dx/platform/android/CCStdC.h b/include/cocos2dx/platform/android/CCStdC.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/CCStdC.h rename to include/cocos2dx/platform/android/CCStdC.h diff --git a/x32/jni/libs/cocos2dx/platform/android/java/.classpath b/include/cocos2dx/platform/android/java/.classpath similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/java/.classpath rename to include/cocos2dx/platform/android/java/.classpath diff --git a/x32/jni/libs/cocos2dx/platform/android/java/.project b/include/cocos2dx/platform/android/java/.project similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/java/.project rename to include/cocos2dx/platform/android/java/.project diff --git a/x32/jni/libs/cocos2dx/platform/android/java/AndroidManifest.xml b/include/cocos2dx/platform/android/java/AndroidManifest.xml similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/java/AndroidManifest.xml rename to include/cocos2dx/platform/android/java/AndroidManifest.xml diff --git a/x32/jni/libs/cocos2dx/platform/android/java/ant.properties b/include/cocos2dx/platform/android/java/ant.properties similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/java/ant.properties rename to include/cocos2dx/platform/android/java/ant.properties diff --git a/x32/jni/libs/cocos2dx/platform/android/java/build.xml b/include/cocos2dx/platform/android/java/build.xml similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/java/build.xml rename to include/cocos2dx/platform/android/java/build.xml diff --git a/x32/jni/libs/cocos2dx/platform/android/java/proguard-project.txt b/include/cocos2dx/platform/android/java/proguard-project.txt similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/java/proguard-project.txt rename to include/cocos2dx/platform/android/java/proguard-project.txt diff --git a/x32/jni/libs/cocos2dx/platform/android/java/project.properties b/include/cocos2dx/platform/android/java/project.properties similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/java/project.properties rename to include/cocos2dx/platform/android/java/project.properties diff --git a/x32/jni/libs/cocos2dx/platform/android/java/res/.gitignore b/include/cocos2dx/platform/android/java/res/.gitignore similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/java/res/.gitignore rename to include/cocos2dx/platform/android/java/res/.gitignore diff --git a/x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java b/include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java rename to include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java diff --git a/x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java b/include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java rename to include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java diff --git a/x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxBitmap.java b/include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxBitmap.java similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxBitmap.java rename to include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxBitmap.java diff --git a/x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxETCLoader.java b/include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxETCLoader.java similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxETCLoader.java rename to include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxETCLoader.java diff --git a/x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditBoxDialog.java b/include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditBoxDialog.java similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditBoxDialog.java rename to include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditBoxDialog.java diff --git a/x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditText.java b/include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditText.java similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditText.java rename to include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditText.java diff --git a/x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java b/include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java rename to include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java diff --git a/x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHandler.java b/include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHandler.java similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHandler.java rename to include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHandler.java diff --git a/x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java b/include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java rename to include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java diff --git a/x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLocalStorage.java b/include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLocalStorage.java similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLocalStorage.java rename to include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxLocalStorage.java diff --git a/x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxMusic.java b/include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxMusic.java similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxMusic.java rename to include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxMusic.java diff --git a/x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java b/include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java rename to include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java diff --git a/x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxSound.java b/include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxSound.java similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxSound.java rename to include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxSound.java diff --git a/x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTextInputWraper.java b/include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTextInputWraper.java similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTextInputWraper.java rename to include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTextInputWraper.java diff --git a/x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTypefaces.java b/include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTypefaces.java similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTypefaces.java rename to include/cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxTypefaces.java diff --git a/x32/jni/libs/cocos2dx/platform/android/jni/DPIJni.h b/include/cocos2dx/platform/android/jni/DPIJni.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/jni/DPIJni.h rename to include/cocos2dx/platform/android/jni/DPIJni.h diff --git a/x32/jni/libs/cocos2dx/platform/android/jni/IMEJni.h b/include/cocos2dx/platform/android/jni/IMEJni.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/jni/IMEJni.h rename to include/cocos2dx/platform/android/jni/IMEJni.h diff --git a/x32/jni/libs/cocos2dx/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.h b/include/cocos2dx/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.h rename to include/cocos2dx/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxBitmap.h diff --git a/x32/jni/libs/cocos2dx/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h b/include/cocos2dx/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h rename to include/cocos2dx/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h diff --git a/x32/jni/libs/cocos2dx/platform/android/jni/JniHelper.h b/include/cocos2dx/platform/android/jni/JniHelper.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/android/jni/JniHelper.h rename to include/cocos2dx/platform/android/jni/JniHelper.h diff --git a/x32/jni/libs/cocos2dx/platform/platform.h b/include/cocos2dx/platform/platform.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/platform.h rename to include/cocos2dx/platform/platform.h diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/curl.h b/include/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/curl.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/curl.h rename to include/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/curl.h diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/curlbuild.h b/include/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/curlbuild.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/curlbuild.h rename to include/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/curlbuild.h diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/curlrules.h b/include/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/curlrules.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/curlrules.h rename to include/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/curlrules.h diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/curlver.h b/include/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/curlver.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/curlver.h rename to include/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/curlver.h diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/easy.h b/include/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/easy.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/easy.h rename to include/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/easy.h diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/mprintf.h b/include/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/mprintf.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/mprintf.h rename to include/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/mprintf.h diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/multi.h b/include/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/multi.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/multi.h rename to include/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/multi.h diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/stdcheaders.h b/include/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/stdcheaders.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/stdcheaders.h rename to include/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/stdcheaders.h diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/typecheck-gcc.h b/include/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/typecheck-gcc.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/typecheck-gcc.h rename to include/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/typecheck-gcc.h diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/types.h b/include/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/types.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/types.h rename to include/cocos2dx/platform/third_party/android/prebuilt/libcurl/include/curl/types.h diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/libs/armeabi-v7a/libcurl.a.REMOVED.git-id b/include/cocos2dx/platform/third_party/android/prebuilt/libcurl/libs/armeabi-v7a/libcurl.a.REMOVED.git-id similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/libs/armeabi-v7a/libcurl.a.REMOVED.git-id rename to include/cocos2dx/platform/third_party/android/prebuilt/libcurl/libs/armeabi-v7a/libcurl.a.REMOVED.git-id diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/libs/armeabi/libcurl.a.REMOVED.git-id b/include/cocos2dx/platform/third_party/android/prebuilt/libcurl/libs/armeabi/libcurl.a.REMOVED.git-id similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/libs/armeabi/libcurl.a.REMOVED.git-id rename to include/cocos2dx/platform/third_party/android/prebuilt/libcurl/libs/armeabi/libcurl.a.REMOVED.git-id diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/libs/x86/libcurl.a.REMOVED.git-id b/include/cocos2dx/platform/third_party/android/prebuilt/libcurl/libs/x86/libcurl.a.REMOVED.git-id similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libcurl/libs/x86/libcurl.a.REMOVED.git-id rename to include/cocos2dx/platform/third_party/android/prebuilt/libcurl/libs/x86/libcurl.a.REMOVED.git-id diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libjpeg/include/jconfig.h b/include/cocos2dx/platform/third_party/android/prebuilt/libjpeg/include/jconfig.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libjpeg/include/jconfig.h rename to include/cocos2dx/platform/third_party/android/prebuilt/libjpeg/include/jconfig.h diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libjpeg/include/jerror.h b/include/cocos2dx/platform/third_party/android/prebuilt/libjpeg/include/jerror.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libjpeg/include/jerror.h rename to include/cocos2dx/platform/third_party/android/prebuilt/libjpeg/include/jerror.h diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libjpeg/include/jmorecfg.h b/include/cocos2dx/platform/third_party/android/prebuilt/libjpeg/include/jmorecfg.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libjpeg/include/jmorecfg.h rename to include/cocos2dx/platform/third_party/android/prebuilt/libjpeg/include/jmorecfg.h diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libjpeg/include/jpeglib.h b/include/cocos2dx/platform/third_party/android/prebuilt/libjpeg/include/jpeglib.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libjpeg/include/jpeglib.h rename to include/cocos2dx/platform/third_party/android/prebuilt/libjpeg/include/jpeglib.h diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libjpeg/libs/armeabi-v7a/libjpeg.a.REMOVED.git-id b/include/cocos2dx/platform/third_party/android/prebuilt/libjpeg/libs/armeabi-v7a/libjpeg.a.REMOVED.git-id similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libjpeg/libs/armeabi-v7a/libjpeg.a.REMOVED.git-id rename to include/cocos2dx/platform/third_party/android/prebuilt/libjpeg/libs/armeabi-v7a/libjpeg.a.REMOVED.git-id diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libjpeg/libs/armeabi/libjpeg.a.REMOVED.git-id b/include/cocos2dx/platform/third_party/android/prebuilt/libjpeg/libs/armeabi/libjpeg.a.REMOVED.git-id similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libjpeg/libs/armeabi/libjpeg.a.REMOVED.git-id rename to include/cocos2dx/platform/third_party/android/prebuilt/libjpeg/libs/armeabi/libjpeg.a.REMOVED.git-id diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libjpeg/libs/x86/libjpeg.a.REMOVED.git-id b/include/cocos2dx/platform/third_party/android/prebuilt/libjpeg/libs/x86/libjpeg.a.REMOVED.git-id similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libjpeg/libs/x86/libjpeg.a.REMOVED.git-id rename to include/cocos2dx/platform/third_party/android/prebuilt/libjpeg/libs/x86/libjpeg.a.REMOVED.git-id diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libpng/include/png.h.REMOVED.git-id b/include/cocos2dx/platform/third_party/android/prebuilt/libpng/include/png.h.REMOVED.git-id similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libpng/include/png.h.REMOVED.git-id rename to include/cocos2dx/platform/third_party/android/prebuilt/libpng/include/png.h.REMOVED.git-id diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libpng/include/pngconf.h b/include/cocos2dx/platform/third_party/android/prebuilt/libpng/include/pngconf.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libpng/include/pngconf.h rename to include/cocos2dx/platform/third_party/android/prebuilt/libpng/include/pngconf.h diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libpng/include/pngusr.h b/include/cocos2dx/platform/third_party/android/prebuilt/libpng/include/pngusr.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libpng/include/pngusr.h rename to include/cocos2dx/platform/third_party/android/prebuilt/libpng/include/pngusr.h diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libpng/libs/armeabi-v7a/libpng.a.REMOVED.git-id b/include/cocos2dx/platform/third_party/android/prebuilt/libpng/libs/armeabi-v7a/libpng.a.REMOVED.git-id similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libpng/libs/armeabi-v7a/libpng.a.REMOVED.git-id rename to include/cocos2dx/platform/third_party/android/prebuilt/libpng/libs/armeabi-v7a/libpng.a.REMOVED.git-id diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libpng/libs/armeabi/libpng.a.REMOVED.git-id b/include/cocos2dx/platform/third_party/android/prebuilt/libpng/libs/armeabi/libpng.a.REMOVED.git-id similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libpng/libs/armeabi/libpng.a.REMOVED.git-id rename to include/cocos2dx/platform/third_party/android/prebuilt/libpng/libs/armeabi/libpng.a.REMOVED.git-id diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libpng/libs/x86/libpng.a.REMOVED.git-id b/include/cocos2dx/platform/third_party/android/prebuilt/libpng/libs/x86/libpng.a.REMOVED.git-id similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libpng/libs/x86/libpng.a.REMOVED.git-id rename to include/cocos2dx/platform/third_party/android/prebuilt/libpng/libs/x86/libpng.a.REMOVED.git-id diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libtiff/include/tiff.h b/include/cocos2dx/platform/third_party/android/prebuilt/libtiff/include/tiff.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libtiff/include/tiff.h rename to include/cocos2dx/platform/third_party/android/prebuilt/libtiff/include/tiff.h diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libtiff/include/tiffconf.h b/include/cocos2dx/platform/third_party/android/prebuilt/libtiff/include/tiffconf.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libtiff/include/tiffconf.h rename to include/cocos2dx/platform/third_party/android/prebuilt/libtiff/include/tiffconf.h diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libtiff/include/tiffio.h b/include/cocos2dx/platform/third_party/android/prebuilt/libtiff/include/tiffio.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libtiff/include/tiffio.h rename to include/cocos2dx/platform/third_party/android/prebuilt/libtiff/include/tiffio.h diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libtiff/include/tiffvers.h b/include/cocos2dx/platform/third_party/android/prebuilt/libtiff/include/tiffvers.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libtiff/include/tiffvers.h rename to include/cocos2dx/platform/third_party/android/prebuilt/libtiff/include/tiffvers.h diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libtiff/libs/armeabi-v7a/libtiff.a.REMOVED.git-id b/include/cocos2dx/platform/third_party/android/prebuilt/libtiff/libs/armeabi-v7a/libtiff.a.REMOVED.git-id similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libtiff/libs/armeabi-v7a/libtiff.a.REMOVED.git-id rename to include/cocos2dx/platform/third_party/android/prebuilt/libtiff/libs/armeabi-v7a/libtiff.a.REMOVED.git-id diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libtiff/libs/armeabi/libtiff.a.REMOVED.git-id b/include/cocos2dx/platform/third_party/android/prebuilt/libtiff/libs/armeabi/libtiff.a.REMOVED.git-id similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libtiff/libs/armeabi/libtiff.a.REMOVED.git-id rename to include/cocos2dx/platform/third_party/android/prebuilt/libtiff/libs/armeabi/libtiff.a.REMOVED.git-id diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libtiff/libs/x86/libtiff.a.REMOVED.git-id b/include/cocos2dx/platform/third_party/android/prebuilt/libtiff/libs/x86/libtiff.a.REMOVED.git-id similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libtiff/libs/x86/libtiff.a.REMOVED.git-id rename to include/cocos2dx/platform/third_party/android/prebuilt/libtiff/libs/x86/libtiff.a.REMOVED.git-id diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libwebp/include/decode.h b/include/cocos2dx/platform/third_party/android/prebuilt/libwebp/include/decode.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libwebp/include/decode.h rename to include/cocos2dx/platform/third_party/android/prebuilt/libwebp/include/decode.h diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libwebp/include/encode.h b/include/cocos2dx/platform/third_party/android/prebuilt/libwebp/include/encode.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libwebp/include/encode.h rename to include/cocos2dx/platform/third_party/android/prebuilt/libwebp/include/encode.h diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libwebp/include/types.h b/include/cocos2dx/platform/third_party/android/prebuilt/libwebp/include/types.h similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libwebp/include/types.h rename to include/cocos2dx/platform/third_party/android/prebuilt/libwebp/include/types.h diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libwebp/libs/armeabi-v7a/libwebp.a.REMOVED.git-id b/include/cocos2dx/platform/third_party/android/prebuilt/libwebp/libs/armeabi-v7a/libwebp.a.REMOVED.git-id similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libwebp/libs/armeabi-v7a/libwebp.a.REMOVED.git-id rename to include/cocos2dx/platform/third_party/android/prebuilt/libwebp/libs/armeabi-v7a/libwebp.a.REMOVED.git-id diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libwebp/libs/armeabi/libwebp.a.REMOVED.git-id b/include/cocos2dx/platform/third_party/android/prebuilt/libwebp/libs/armeabi/libwebp.a.REMOVED.git-id similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libwebp/libs/armeabi/libwebp.a.REMOVED.git-id rename to include/cocos2dx/platform/third_party/android/prebuilt/libwebp/libs/armeabi/libwebp.a.REMOVED.git-id diff --git a/x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libwebp/libs/x86/libwebp.a.REMOVED.git-id b/include/cocos2dx/platform/third_party/android/prebuilt/libwebp/libs/x86/libwebp.a.REMOVED.git-id similarity index 100% rename from x32/jni/libs/cocos2dx/platform/third_party/android/prebuilt/libwebp/libs/x86/libwebp.a.REMOVED.git-id rename to include/cocos2dx/platform/third_party/android/prebuilt/libwebp/libs/x86/libwebp.a.REMOVED.git-id diff --git a/x32/jni/libs/cocos2dx/robtop/scene_nodes/CCSceneTransitionDelegate.h b/include/cocos2dx/robtop/scene_nodes/CCSceneTransitionDelegate.h similarity index 100% rename from x32/jni/libs/cocos2dx/robtop/scene_nodes/CCSceneTransitionDelegate.h rename to include/cocos2dx/robtop/scene_nodes/CCSceneTransitionDelegate.h diff --git a/x32/jni/libs/cocos2dx/robtop/xml/DS_Dictionary.h b/include/cocos2dx/robtop/xml/DS_Dictionary.h similarity index 100% rename from x32/jni/libs/cocos2dx/robtop/xml/DS_Dictionary.h rename to include/cocos2dx/robtop/xml/DS_Dictionary.h diff --git a/x32/jni/libs/cocos2dx/robtop/xml/pugiconfig.hpp b/include/cocos2dx/robtop/xml/pugiconfig.hpp similarity index 100% rename from x32/jni/libs/cocos2dx/robtop/xml/pugiconfig.hpp rename to include/cocos2dx/robtop/xml/pugiconfig.hpp diff --git a/x32/jni/libs/cocos2dx/robtop/xml/pugixml.hpp b/include/cocos2dx/robtop/xml/pugixml.hpp similarity index 100% rename from x32/jni/libs/cocos2dx/robtop/xml/pugixml.hpp rename to include/cocos2dx/robtop/xml/pugixml.hpp diff --git a/x32/jni/libs/cocos2dx/robtop/xml/readme.txt b/include/cocos2dx/robtop/xml/readme.txt similarity index 100% rename from x32/jni/libs/cocos2dx/robtop/xml/readme.txt rename to include/cocos2dx/robtop/xml/readme.txt diff --git a/x32/jni/libs/cocos2dx/script_support/CCScriptSupport.h b/include/cocos2dx/script_support/CCScriptSupport.h similarity index 100% rename from x32/jni/libs/cocos2dx/script_support/CCScriptSupport.h rename to include/cocos2dx/script_support/CCScriptSupport.h diff --git a/x32/jni/libs/cocos2dx/shaders/CCGLProgram.h b/include/cocos2dx/shaders/CCGLProgram.h similarity index 100% rename from x32/jni/libs/cocos2dx/shaders/CCGLProgram.h rename to include/cocos2dx/shaders/CCGLProgram.h diff --git a/x32/jni/libs/cocos2dx/shaders/CCShaderCache.h b/include/cocos2dx/shaders/CCShaderCache.h similarity index 100% rename from x32/jni/libs/cocos2dx/shaders/CCShaderCache.h rename to include/cocos2dx/shaders/CCShaderCache.h diff --git a/x32/jni/libs/cocos2dx/shaders/ccGLStateCache.h b/include/cocos2dx/shaders/ccGLStateCache.h similarity index 100% rename from x32/jni/libs/cocos2dx/shaders/ccGLStateCache.h rename to include/cocos2dx/shaders/ccGLStateCache.h diff --git a/x32/jni/libs/cocos2dx/shaders/ccShaderEx_SwitchMask_frag.h b/include/cocos2dx/shaders/ccShaderEx_SwitchMask_frag.h similarity index 100% rename from x32/jni/libs/cocos2dx/shaders/ccShaderEx_SwitchMask_frag.h rename to include/cocos2dx/shaders/ccShaderEx_SwitchMask_frag.h diff --git a/x32/jni/libs/cocos2dx/shaders/ccShader_PositionColorLengthTexture_frag.h b/include/cocos2dx/shaders/ccShader_PositionColorLengthTexture_frag.h similarity index 100% rename from x32/jni/libs/cocos2dx/shaders/ccShader_PositionColorLengthTexture_frag.h rename to include/cocos2dx/shaders/ccShader_PositionColorLengthTexture_frag.h diff --git a/x32/jni/libs/cocos2dx/shaders/ccShader_PositionColorLengthTexture_vert.h b/include/cocos2dx/shaders/ccShader_PositionColorLengthTexture_vert.h similarity index 100% rename from x32/jni/libs/cocos2dx/shaders/ccShader_PositionColorLengthTexture_vert.h rename to include/cocos2dx/shaders/ccShader_PositionColorLengthTexture_vert.h diff --git a/x32/jni/libs/cocos2dx/shaders/ccShader_PositionColor_frag.h b/include/cocos2dx/shaders/ccShader_PositionColor_frag.h similarity index 100% rename from x32/jni/libs/cocos2dx/shaders/ccShader_PositionColor_frag.h rename to include/cocos2dx/shaders/ccShader_PositionColor_frag.h diff --git a/x32/jni/libs/cocos2dx/shaders/ccShader_PositionColor_vert.h b/include/cocos2dx/shaders/ccShader_PositionColor_vert.h similarity index 100% rename from x32/jni/libs/cocos2dx/shaders/ccShader_PositionColor_vert.h rename to include/cocos2dx/shaders/ccShader_PositionColor_vert.h diff --git a/x32/jni/libs/cocos2dx/shaders/ccShader_PositionTextureA8Color_frag.h b/include/cocos2dx/shaders/ccShader_PositionTextureA8Color_frag.h similarity index 100% rename from x32/jni/libs/cocos2dx/shaders/ccShader_PositionTextureA8Color_frag.h rename to include/cocos2dx/shaders/ccShader_PositionTextureA8Color_frag.h diff --git a/x32/jni/libs/cocos2dx/shaders/ccShader_PositionTextureA8Color_vert.h b/include/cocos2dx/shaders/ccShader_PositionTextureA8Color_vert.h similarity index 100% rename from x32/jni/libs/cocos2dx/shaders/ccShader_PositionTextureA8Color_vert.h rename to include/cocos2dx/shaders/ccShader_PositionTextureA8Color_vert.h diff --git a/x32/jni/libs/cocos2dx/shaders/ccShader_PositionTextureColorAlphaTest_frag.h b/include/cocos2dx/shaders/ccShader_PositionTextureColorAlphaTest_frag.h similarity index 100% rename from x32/jni/libs/cocos2dx/shaders/ccShader_PositionTextureColorAlphaTest_frag.h rename to include/cocos2dx/shaders/ccShader_PositionTextureColorAlphaTest_frag.h diff --git a/x32/jni/libs/cocos2dx/shaders/ccShader_PositionTextureColor_frag.h b/include/cocos2dx/shaders/ccShader_PositionTextureColor_frag.h similarity index 100% rename from x32/jni/libs/cocos2dx/shaders/ccShader_PositionTextureColor_frag.h rename to include/cocos2dx/shaders/ccShader_PositionTextureColor_frag.h diff --git a/x32/jni/libs/cocos2dx/shaders/ccShader_PositionTextureColor_vert.h b/include/cocos2dx/shaders/ccShader_PositionTextureColor_vert.h similarity index 100% rename from x32/jni/libs/cocos2dx/shaders/ccShader_PositionTextureColor_vert.h rename to include/cocos2dx/shaders/ccShader_PositionTextureColor_vert.h diff --git a/x32/jni/libs/cocos2dx/shaders/ccShader_PositionTexture_frag.h b/include/cocos2dx/shaders/ccShader_PositionTexture_frag.h similarity index 100% rename from x32/jni/libs/cocos2dx/shaders/ccShader_PositionTexture_frag.h rename to include/cocos2dx/shaders/ccShader_PositionTexture_frag.h diff --git a/x32/jni/libs/cocos2dx/shaders/ccShader_PositionTexture_uColor_frag.h b/include/cocos2dx/shaders/ccShader_PositionTexture_uColor_frag.h similarity index 100% rename from x32/jni/libs/cocos2dx/shaders/ccShader_PositionTexture_uColor_frag.h rename to include/cocos2dx/shaders/ccShader_PositionTexture_uColor_frag.h diff --git a/x32/jni/libs/cocos2dx/shaders/ccShader_PositionTexture_uColor_vert.h b/include/cocos2dx/shaders/ccShader_PositionTexture_uColor_vert.h similarity index 100% rename from x32/jni/libs/cocos2dx/shaders/ccShader_PositionTexture_uColor_vert.h rename to include/cocos2dx/shaders/ccShader_PositionTexture_uColor_vert.h diff --git a/x32/jni/libs/cocos2dx/shaders/ccShader_PositionTexture_vert.h b/include/cocos2dx/shaders/ccShader_PositionTexture_vert.h similarity index 100% rename from x32/jni/libs/cocos2dx/shaders/ccShader_PositionTexture_vert.h rename to include/cocos2dx/shaders/ccShader_PositionTexture_vert.h diff --git a/x32/jni/libs/cocos2dx/shaders/ccShader_Position_uColor_frag.h b/include/cocos2dx/shaders/ccShader_Position_uColor_frag.h similarity index 100% rename from x32/jni/libs/cocos2dx/shaders/ccShader_Position_uColor_frag.h rename to include/cocos2dx/shaders/ccShader_Position_uColor_frag.h diff --git a/x32/jni/libs/cocos2dx/shaders/ccShader_Position_uColor_vert.h b/include/cocos2dx/shaders/ccShader_Position_uColor_vert.h similarity index 100% rename from x32/jni/libs/cocos2dx/shaders/ccShader_Position_uColor_vert.h rename to include/cocos2dx/shaders/ccShader_Position_uColor_vert.h diff --git a/x32/jni/libs/cocos2dx/shaders/ccShaders.h b/include/cocos2dx/shaders/ccShaders.h similarity index 100% rename from x32/jni/libs/cocos2dx/shaders/ccShaders.h rename to include/cocos2dx/shaders/ccShaders.h diff --git a/x32/jni/libs/cocos2dx/sprite_nodes/CCAnimation.h b/include/cocos2dx/sprite_nodes/CCAnimation.h similarity index 100% rename from x32/jni/libs/cocos2dx/sprite_nodes/CCAnimation.h rename to include/cocos2dx/sprite_nodes/CCAnimation.h diff --git a/x32/jni/libs/cocos2dx/sprite_nodes/CCAnimationCache.h b/include/cocos2dx/sprite_nodes/CCAnimationCache.h similarity index 100% rename from x32/jni/libs/cocos2dx/sprite_nodes/CCAnimationCache.h rename to include/cocos2dx/sprite_nodes/CCAnimationCache.h diff --git a/x32/jni/libs/cocos2dx/sprite_nodes/CCSprite.h b/include/cocos2dx/sprite_nodes/CCSprite.h similarity index 100% rename from x32/jni/libs/cocos2dx/sprite_nodes/CCSprite.h rename to include/cocos2dx/sprite_nodes/CCSprite.h diff --git a/x32/jni/libs/cocos2dx/sprite_nodes/CCSpriteBatchNode.h b/include/cocos2dx/sprite_nodes/CCSpriteBatchNode.h similarity index 100% rename from x32/jni/libs/cocos2dx/sprite_nodes/CCSpriteBatchNode.h rename to include/cocos2dx/sprite_nodes/CCSpriteBatchNode.h diff --git a/x32/jni/libs/cocos2dx/sprite_nodes/CCSpriteFrame.h b/include/cocos2dx/sprite_nodes/CCSpriteFrame.h similarity index 100% rename from x32/jni/libs/cocos2dx/sprite_nodes/CCSpriteFrame.h rename to include/cocos2dx/sprite_nodes/CCSpriteFrame.h diff --git a/x32/jni/libs/cocos2dx/sprite_nodes/CCSpriteFrameCache.h b/include/cocos2dx/sprite_nodes/CCSpriteFrameCache.h similarity index 100% rename from x32/jni/libs/cocos2dx/sprite_nodes/CCSpriteFrameCache.h rename to include/cocos2dx/sprite_nodes/CCSpriteFrameCache.h diff --git a/x32/jni/libs/cocos2dx/support/CCNotificationCenter.h b/include/cocos2dx/support/CCNotificationCenter.h similarity index 100% rename from x32/jni/libs/cocos2dx/support/CCNotificationCenter.h rename to include/cocos2dx/support/CCNotificationCenter.h diff --git a/x32/jni/libs/cocos2dx/support/CCPointExtension.h b/include/cocos2dx/support/CCPointExtension.h similarity index 100% rename from x32/jni/libs/cocos2dx/support/CCPointExtension.h rename to include/cocos2dx/support/CCPointExtension.h diff --git a/x32/jni/libs/cocos2dx/support/CCProfiling.h b/include/cocos2dx/support/CCProfiling.h similarity index 100% rename from x32/jni/libs/cocos2dx/support/CCProfiling.h rename to include/cocos2dx/support/CCProfiling.h diff --git a/x32/jni/libs/cocos2dx/support/CCVertex.h b/include/cocos2dx/support/CCVertex.h similarity index 100% rename from x32/jni/libs/cocos2dx/support/CCVertex.h rename to include/cocos2dx/support/CCVertex.h diff --git a/x32/jni/libs/cocos2dx/support/TransformUtils.h b/include/cocos2dx/support/TransformUtils.h similarity index 100% rename from x32/jni/libs/cocos2dx/support/TransformUtils.h rename to include/cocos2dx/support/TransformUtils.h diff --git a/x32/jni/libs/cocos2dx/support/base64.h b/include/cocos2dx/support/base64.h similarity index 100% rename from x32/jni/libs/cocos2dx/support/base64.h rename to include/cocos2dx/support/base64.h diff --git a/x32/jni/libs/cocos2dx/support/ccUTF8.h b/include/cocos2dx/support/ccUTF8.h similarity index 100% rename from x32/jni/libs/cocos2dx/support/ccUTF8.h rename to include/cocos2dx/support/ccUTF8.h diff --git a/x32/jni/libs/cocos2dx/support/ccUtils.h b/include/cocos2dx/support/ccUtils.h similarity index 100% rename from x32/jni/libs/cocos2dx/support/ccUtils.h rename to include/cocos2dx/support/ccUtils.h diff --git a/x32/jni/libs/cocos2dx/support/component/CCComponent.h b/include/cocos2dx/support/component/CCComponent.h similarity index 100% rename from x32/jni/libs/cocos2dx/support/component/CCComponent.h rename to include/cocos2dx/support/component/CCComponent.h diff --git a/x32/jni/libs/cocos2dx/support/component/CCComponentContainer.h b/include/cocos2dx/support/component/CCComponentContainer.h similarity index 100% rename from x32/jni/libs/cocos2dx/support/component/CCComponentContainer.h rename to include/cocos2dx/support/component/CCComponentContainer.h diff --git a/x32/jni/libs/cocos2dx/support/data_support/ccCArray.h b/include/cocos2dx/support/data_support/ccCArray.h similarity index 100% rename from x32/jni/libs/cocos2dx/support/data_support/ccCArray.h rename to include/cocos2dx/support/data_support/ccCArray.h diff --git a/x32/jni/libs/cocos2dx/support/data_support/uthash.h b/include/cocos2dx/support/data_support/uthash.h similarity index 100% rename from x32/jni/libs/cocos2dx/support/data_support/uthash.h rename to include/cocos2dx/support/data_support/uthash.h diff --git a/x32/jni/libs/cocos2dx/support/data_support/utlist.h b/include/cocos2dx/support/data_support/utlist.h similarity index 100% rename from x32/jni/libs/cocos2dx/support/data_support/utlist.h rename to include/cocos2dx/support/data_support/utlist.h diff --git a/x32/jni/libs/cocos2dx/support/image_support/TGAlib.h b/include/cocos2dx/support/image_support/TGAlib.h similarity index 100% rename from x32/jni/libs/cocos2dx/support/image_support/TGAlib.h rename to include/cocos2dx/support/image_support/TGAlib.h diff --git a/x32/jni/libs/cocos2dx/support/tinyxml2/tinyxml2.h b/include/cocos2dx/support/tinyxml2/tinyxml2.h similarity index 100% rename from x32/jni/libs/cocos2dx/support/tinyxml2/tinyxml2.h rename to include/cocos2dx/support/tinyxml2/tinyxml2.h diff --git a/x32/jni/libs/cocos2dx/support/user_default/CCUserDefault.h b/include/cocos2dx/support/user_default/CCUserDefault.h similarity index 100% rename from x32/jni/libs/cocos2dx/support/user_default/CCUserDefault.h rename to include/cocos2dx/support/user_default/CCUserDefault.h diff --git a/x32/jni/libs/cocos2dx/support/zip_support/ZipUtils.h b/include/cocos2dx/support/zip_support/ZipUtils.h similarity index 100% rename from x32/jni/libs/cocos2dx/support/zip_support/ZipUtils.h rename to include/cocos2dx/support/zip_support/ZipUtils.h diff --git a/x32/jni/libs/cocos2dx/support/zip_support/ioapi.h b/include/cocos2dx/support/zip_support/ioapi.h similarity index 100% rename from x32/jni/libs/cocos2dx/support/zip_support/ioapi.h rename to include/cocos2dx/support/zip_support/ioapi.h diff --git a/x32/jni/libs/cocos2dx/support/zip_support/unzip.h b/include/cocos2dx/support/zip_support/unzip.h similarity index 100% rename from x32/jni/libs/cocos2dx/support/zip_support/unzip.h rename to include/cocos2dx/support/zip_support/unzip.h diff --git a/x32/jni/libs/cocos2dx/text_input_node/CCIMEDelegate.h b/include/cocos2dx/text_input_node/CCIMEDelegate.h similarity index 100% rename from x32/jni/libs/cocos2dx/text_input_node/CCIMEDelegate.h rename to include/cocos2dx/text_input_node/CCIMEDelegate.h diff --git a/x32/jni/libs/cocos2dx/text_input_node/CCIMEDispatcher.h b/include/cocos2dx/text_input_node/CCIMEDispatcher.h similarity index 100% rename from x32/jni/libs/cocos2dx/text_input_node/CCIMEDispatcher.h rename to include/cocos2dx/text_input_node/CCIMEDispatcher.h diff --git a/x32/jni/libs/cocos2dx/text_input_node/CCTextFieldTTF.h b/include/cocos2dx/text_input_node/CCTextFieldTTF.h similarity index 100% rename from x32/jni/libs/cocos2dx/text_input_node/CCTextFieldTTF.h rename to include/cocos2dx/text_input_node/CCTextFieldTTF.h diff --git a/x32/jni/libs/cocos2dx/textures/CCTexture2D.h b/include/cocos2dx/textures/CCTexture2D.h similarity index 100% rename from x32/jni/libs/cocos2dx/textures/CCTexture2D.h rename to include/cocos2dx/textures/CCTexture2D.h diff --git a/x32/jni/libs/cocos2dx/textures/CCTextureAtlas.h b/include/cocos2dx/textures/CCTextureAtlas.h similarity index 100% rename from x32/jni/libs/cocos2dx/textures/CCTextureAtlas.h rename to include/cocos2dx/textures/CCTextureAtlas.h diff --git a/x32/jni/libs/cocos2dx/textures/CCTextureCache.h b/include/cocos2dx/textures/CCTextureCache.h similarity index 100% rename from x32/jni/libs/cocos2dx/textures/CCTextureCache.h rename to include/cocos2dx/textures/CCTextureCache.h diff --git a/x32/jni/libs/cocos2dx/textures/CCTextureETC.h b/include/cocos2dx/textures/CCTextureETC.h similarity index 100% rename from x32/jni/libs/cocos2dx/textures/CCTextureETC.h rename to include/cocos2dx/textures/CCTextureETC.h diff --git a/x32/jni/libs/cocos2dx/textures/CCTexturePVR.h b/include/cocos2dx/textures/CCTexturePVR.h similarity index 100% rename from x32/jni/libs/cocos2dx/textures/CCTexturePVR.h rename to include/cocos2dx/textures/CCTexturePVR.h diff --git a/x32/jni/libs/cocos2dx/tilemap_parallax_nodes/CCParallaxNode.h b/include/cocos2dx/tilemap_parallax_nodes/CCParallaxNode.h similarity index 100% rename from x32/jni/libs/cocos2dx/tilemap_parallax_nodes/CCParallaxNode.h rename to include/cocos2dx/tilemap_parallax_nodes/CCParallaxNode.h diff --git a/x32/jni/libs/cocos2dx/tilemap_parallax_nodes/CCTMXLayer.h b/include/cocos2dx/tilemap_parallax_nodes/CCTMXLayer.h similarity index 100% rename from x32/jni/libs/cocos2dx/tilemap_parallax_nodes/CCTMXLayer.h rename to include/cocos2dx/tilemap_parallax_nodes/CCTMXLayer.h diff --git a/x32/jni/libs/cocos2dx/tilemap_parallax_nodes/CCTMXObjectGroup.h b/include/cocos2dx/tilemap_parallax_nodes/CCTMXObjectGroup.h similarity index 100% rename from x32/jni/libs/cocos2dx/tilemap_parallax_nodes/CCTMXObjectGroup.h rename to include/cocos2dx/tilemap_parallax_nodes/CCTMXObjectGroup.h diff --git a/x32/jni/libs/cocos2dx/tilemap_parallax_nodes/CCTMXTiledMap.h b/include/cocos2dx/tilemap_parallax_nodes/CCTMXTiledMap.h similarity index 100% rename from x32/jni/libs/cocos2dx/tilemap_parallax_nodes/CCTMXTiledMap.h rename to include/cocos2dx/tilemap_parallax_nodes/CCTMXTiledMap.h diff --git a/x32/jni/libs/cocos2dx/tilemap_parallax_nodes/CCTMXXMLParser.h b/include/cocos2dx/tilemap_parallax_nodes/CCTMXXMLParser.h similarity index 100% rename from x32/jni/libs/cocos2dx/tilemap_parallax_nodes/CCTMXXMLParser.h rename to include/cocos2dx/tilemap_parallax_nodes/CCTMXXMLParser.h diff --git a/x32/jni/libs/cocos2dx/tilemap_parallax_nodes/CCTileMapAtlas.h b/include/cocos2dx/tilemap_parallax_nodes/CCTileMapAtlas.h similarity index 100% rename from x32/jni/libs/cocos2dx/tilemap_parallax_nodes/CCTileMapAtlas.h rename to include/cocos2dx/tilemap_parallax_nodes/CCTileMapAtlas.h diff --git a/x32/jni/libs/cocos2dx/touch_dispatcher/CCTouch.h b/include/cocos2dx/touch_dispatcher/CCTouch.h similarity index 100% rename from x32/jni/libs/cocos2dx/touch_dispatcher/CCTouch.h rename to include/cocos2dx/touch_dispatcher/CCTouch.h diff --git a/x32/jni/libs/cocos2dx/touch_dispatcher/CCTouchDelegateProtocol.h b/include/cocos2dx/touch_dispatcher/CCTouchDelegateProtocol.h similarity index 100% rename from x32/jni/libs/cocos2dx/touch_dispatcher/CCTouchDelegateProtocol.h rename to include/cocos2dx/touch_dispatcher/CCTouchDelegateProtocol.h diff --git a/x32/jni/libs/cocos2dx/touch_dispatcher/CCTouchDispatcher.h b/include/cocos2dx/touch_dispatcher/CCTouchDispatcher.h similarity index 100% rename from x32/jni/libs/cocos2dx/touch_dispatcher/CCTouchDispatcher.h rename to include/cocos2dx/touch_dispatcher/CCTouchDispatcher.h diff --git a/x32/jni/libs/cocos2dx/touch_dispatcher/CCTouchHandler.h b/include/cocos2dx/touch_dispatcher/CCTouchHandler.h similarity index 100% rename from x32/jni/libs/cocos2dx/touch_dispatcher/CCTouchHandler.h rename to include/cocos2dx/touch_dispatcher/CCTouchHandler.h diff --git a/include/dobby.h b/include/dobby.h new file mode 100644 index 0000000..bc4c96b --- /dev/null +++ b/include/dobby.h @@ -0,0 +1,190 @@ +#ifndef dobby_h +#define dobby_h + +// obfuscated interface +#if 0 +#define DobbyBuildVersion c343f74888dffad84d9ad08d9c433456 +#define DobbyHook c8dc3ffa44f22dbd10ccae213dd8b1f8 +#define DobbyInstrument b71e27bca2c362de90c1034f19d839f9 +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +void log_set_level(int level); +void log_switch_to_syslog(); +void log_switch_to_file(const char *path); + +typedef enum { + kMemoryOperationSuccess, + kMemoryOperationError, + kNotSupportAllocateExecutableMemory, + kNotEnough, + kNone +} MemoryOperationError; + +#define PLATFORM_INTERFACE_CODE_PATCH_TOOL_H +MemoryOperationError CodePatch(void *address, uint8_t *buffer, uint32_t buffer_size); + +typedef uintptr_t addr_t; +typedef uint32_t addr32_t; +typedef uint64_t addr64_t; + +#if defined(__arm64__) || defined(__aarch64__) + +#define ARM64_TMP_REG_NDX_0 17 + +// float register +typedef union _FPReg { + __int128_t q; + struct { + double d1; + double d2; + } d; + struct { + float f1; + float f2; + float f3; + float f4; + } f; +} FPReg; + +// register context +typedef struct _RegisterContext { + uint64_t dmmpy_0; // dummy placeholder + uint64_t sp; + + uint64_t dmmpy_1; // dummy placeholder + union { + uint64_t x[29]; + struct { + uint64_t x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15, x16, x17, x18, x19, x20, x21, x22, + x23, x24, x25, x26, x27, x28; + } regs; + } general; + + uint64_t fp; + uint64_t lr; + + union { + FPReg q[32]; + struct { + FPReg q0, q1, q2, q3, q4, q5, q6, q7; + // [!!! READ ME !!!] + // for Arm64, can't access q8 - q31, unless you enable full floating-point register pack + FPReg q8, q9, q10, q11, q12, q13, q14, q15, q16, q17, q18, q19, q20, q21, q22, q23, q24, q25, q26, q27, q28, q29, + q30, q31; + } regs; + } floating; +} RegisterContext; +#elif defined(__arm__) +typedef struct _RegisterContext { + uint32_t dummy_0; + uint32_t dummy_1; + + uint32_t dummy_2; + uint32_t sp; + + union { + uint32_t r[13]; + struct { + uint32_t r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12; + } regs; + } general; + + uint32_t lr; +} RegisterContext; +#elif defined(_M_IX86) || defined(__i386__) +typedef struct _RegisterContext { + uint32_t dummy_0; + uint32_t esp; + + uint32_t dummy_1; + uint32_t flags; + + union { + struct { + uint32_t eax, ebx, ecx, edx, ebp, esp, edi, esi; + } regs; + } general; + +} RegisterContext; +#elif defined(_M_X64) || defined(__x86_64__) +typedef struct _RegisterContext { + uint64_t dummy_0; + uint64_t rsp; + + union { + struct { + uint64_t rax, rbx, rcx, rdx, rbp, rsp, rdi, rsi, r8, r9, r10, r11, r12, r13, r14, r15; + } regs; + } general; + + uint64_t dummy_1; + uint64_t flags; +} RegisterContext; +#endif + +#define RT_FAILED -1 +#define RT_SUCCESS 0 +typedef enum _RetStatus { RS_FAILED = -1, RS_SUCCESS = 0 } RetStatus; + +typedef struct _HookEntryInfo { + int hook_id; + union { + void *target_address; + void *function_address; + void *instruction_address; + }; +} HookEntryInfo; + +// DobbyWrap <==> DobbyInstrument, so use DobbyInstrument instead of DobbyWrap +#if 0 +// wrap function with pre_call and post_call +typedef void (*PreCallTy)(RegisterContext *ctx, const HookEntryInfo *info); +typedef void (*PostCallTy)(RegisterContext *ctx, const HookEntryInfo *info); +int DobbyWrap(void *function_address, PreCallTy pre_call, PostCallTy post_call); +#endif + +// return dobby build date +const char *DobbyBuildVersion(); + +// replace function +int DobbyHook(void *address, void *replace_call, void **origin_call); + +// dynamic binary instrument for instruction +// [!!! READ ME !!!] +// for Arm64, can't access q8 - q31, unless you enable full floating-point register pack +typedef void (*DBICallTy)(RegisterContext *ctx, const HookEntryInfo *info); +int DobbyInstrument(void *address, DBICallTy dbi_call); + +// destory and restore hook +int DobbyDestroy(void *address); + +// iterate symbol table and find symbol +void *DobbySymbolResolver(const char *image_name, const char *symbol_name); + +// global offset table +int DobbyGlobalOffsetTableReplace(char *image_name, char *symbol_name, void *fake_func, void **orig_func); + +// [!!! READ ME !!!] +// for arm, Arm64, dobby will use b xxx instead of ldr absolute indirect branch +// for x64, dobby always use absolute indirect jump +#if defined(__arm__) || defined(__arm64__) || defined(__aarch64__) || defined(_M_X64) || defined(__x86_64__) +void dobby_enable_near_branch_trampoline(); +void dobby_disable_near_branch_trampoline(); +#endif + +// register linker load image callback +typedef void (*linker_load_callback_t)(const char *image_name, void *handle); +void dobby_register_image_load_callback(linker_load_callback_t func); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/x32/jni/libs/extensions/AssetsManager/AssetsManager.h b/include/extensions/AssetsManager/AssetsManager.h similarity index 100% rename from x32/jni/libs/extensions/AssetsManager/AssetsManager.h rename to include/extensions/AssetsManager/AssetsManager.h diff --git a/x32/jni/libs/extensions/CCBReader/CCBAnimationManager.h b/include/extensions/CCBReader/CCBAnimationManager.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCBAnimationManager.h rename to include/extensions/CCBReader/CCBAnimationManager.h diff --git a/x32/jni/libs/extensions/CCBReader/CCBFileLoader.h b/include/extensions/CCBReader/CCBFileLoader.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCBFileLoader.h rename to include/extensions/CCBReader/CCBFileLoader.h diff --git a/x32/jni/libs/extensions/CCBReader/CCBKeyframe.h b/include/extensions/CCBReader/CCBKeyframe.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCBKeyframe.h rename to include/extensions/CCBReader/CCBKeyframe.h diff --git a/x32/jni/libs/extensions/CCBReader/CCBMemberVariableAssigner.h b/include/extensions/CCBReader/CCBMemberVariableAssigner.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCBMemberVariableAssigner.h rename to include/extensions/CCBReader/CCBMemberVariableAssigner.h diff --git a/x32/jni/libs/extensions/CCBReader/CCBReader.h b/include/extensions/CCBReader/CCBReader.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCBReader.h rename to include/extensions/CCBReader/CCBReader.h diff --git a/x32/jni/libs/extensions/CCBReader/CCBSelectorResolver.h b/include/extensions/CCBReader/CCBSelectorResolver.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCBSelectorResolver.h rename to include/extensions/CCBReader/CCBSelectorResolver.h diff --git a/x32/jni/libs/extensions/CCBReader/CCBSequence.h b/include/extensions/CCBReader/CCBSequence.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCBSequence.h rename to include/extensions/CCBReader/CCBSequence.h diff --git a/x32/jni/libs/extensions/CCBReader/CCBSequenceProperty.h b/include/extensions/CCBReader/CCBSequenceProperty.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCBSequenceProperty.h rename to include/extensions/CCBReader/CCBSequenceProperty.h diff --git a/x32/jni/libs/extensions/CCBReader/CCBValue.h b/include/extensions/CCBReader/CCBValue.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCBValue.h rename to include/extensions/CCBReader/CCBValue.h diff --git a/x32/jni/libs/extensions/CCBReader/CCControlButtonLoader.h b/include/extensions/CCBReader/CCControlButtonLoader.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCControlButtonLoader.h rename to include/extensions/CCBReader/CCControlButtonLoader.h diff --git a/x32/jni/libs/extensions/CCBReader/CCControlLoader.h b/include/extensions/CCBReader/CCControlLoader.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCControlLoader.h rename to include/extensions/CCBReader/CCControlLoader.h diff --git a/x32/jni/libs/extensions/CCBReader/CCData.h b/include/extensions/CCBReader/CCData.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCData.h rename to include/extensions/CCBReader/CCData.h diff --git a/x32/jni/libs/extensions/CCBReader/CCLabelBMFontLoader.h b/include/extensions/CCBReader/CCLabelBMFontLoader.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCLabelBMFontLoader.h rename to include/extensions/CCBReader/CCLabelBMFontLoader.h diff --git a/x32/jni/libs/extensions/CCBReader/CCLabelTTFLoader.h b/include/extensions/CCBReader/CCLabelTTFLoader.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCLabelTTFLoader.h rename to include/extensions/CCBReader/CCLabelTTFLoader.h diff --git a/x32/jni/libs/extensions/CCBReader/CCLayerColorLoader.h b/include/extensions/CCBReader/CCLayerColorLoader.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCLayerColorLoader.h rename to include/extensions/CCBReader/CCLayerColorLoader.h diff --git a/x32/jni/libs/extensions/CCBReader/CCLayerGradientLoader.h b/include/extensions/CCBReader/CCLayerGradientLoader.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCLayerGradientLoader.h rename to include/extensions/CCBReader/CCLayerGradientLoader.h diff --git a/x32/jni/libs/extensions/CCBReader/CCLayerLoader.h b/include/extensions/CCBReader/CCLayerLoader.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCLayerLoader.h rename to include/extensions/CCBReader/CCLayerLoader.h diff --git a/x32/jni/libs/extensions/CCBReader/CCMenuItemImageLoader.h b/include/extensions/CCBReader/CCMenuItemImageLoader.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCMenuItemImageLoader.h rename to include/extensions/CCBReader/CCMenuItemImageLoader.h diff --git a/x32/jni/libs/extensions/CCBReader/CCMenuItemLoader.h b/include/extensions/CCBReader/CCMenuItemLoader.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCMenuItemLoader.h rename to include/extensions/CCBReader/CCMenuItemLoader.h diff --git a/x32/jni/libs/extensions/CCBReader/CCMenuLoader.h b/include/extensions/CCBReader/CCMenuLoader.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCMenuLoader.h rename to include/extensions/CCBReader/CCMenuLoader.h diff --git a/x32/jni/libs/extensions/CCBReader/CCNode+CCBRelativePositioning.h b/include/extensions/CCBReader/CCNode+CCBRelativePositioning.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCNode+CCBRelativePositioning.h rename to include/extensions/CCBReader/CCNode+CCBRelativePositioning.h diff --git a/x32/jni/libs/extensions/CCBReader/CCNodeLoader.h b/include/extensions/CCBReader/CCNodeLoader.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCNodeLoader.h rename to include/extensions/CCBReader/CCNodeLoader.h diff --git a/x32/jni/libs/extensions/CCBReader/CCNodeLoaderLibrary.h b/include/extensions/CCBReader/CCNodeLoaderLibrary.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCNodeLoaderLibrary.h rename to include/extensions/CCBReader/CCNodeLoaderLibrary.h diff --git a/x32/jni/libs/extensions/CCBReader/CCNodeLoaderListener.h b/include/extensions/CCBReader/CCNodeLoaderListener.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCNodeLoaderListener.h rename to include/extensions/CCBReader/CCNodeLoaderListener.h diff --git a/x32/jni/libs/extensions/CCBReader/CCParticleSystemQuadLoader.h b/include/extensions/CCBReader/CCParticleSystemQuadLoader.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCParticleSystemQuadLoader.h rename to include/extensions/CCBReader/CCParticleSystemQuadLoader.h diff --git a/x32/jni/libs/extensions/CCBReader/CCScale9SpriteLoader.h b/include/extensions/CCBReader/CCScale9SpriteLoader.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCScale9SpriteLoader.h rename to include/extensions/CCBReader/CCScale9SpriteLoader.h diff --git a/x32/jni/libs/extensions/CCBReader/CCScrollViewLoader.h b/include/extensions/CCBReader/CCScrollViewLoader.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCScrollViewLoader.h rename to include/extensions/CCBReader/CCScrollViewLoader.h diff --git a/x32/jni/libs/extensions/CCBReader/CCSpriteLoader.h b/include/extensions/CCBReader/CCSpriteLoader.h similarity index 100% rename from x32/jni/libs/extensions/CCBReader/CCSpriteLoader.h rename to include/extensions/CCBReader/CCSpriteLoader.h diff --git a/x32/jni/libs/extensions/CocoStudio/Action/CCActionEaseEx.h b/include/extensions/CocoStudio/Action/CCActionEaseEx.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Action/CCActionEaseEx.h rename to include/extensions/CocoStudio/Action/CCActionEaseEx.h diff --git a/x32/jni/libs/extensions/CocoStudio/Action/CCActionFrame.h b/include/extensions/CocoStudio/Action/CCActionFrame.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Action/CCActionFrame.h rename to include/extensions/CocoStudio/Action/CCActionFrame.h diff --git a/x32/jni/libs/extensions/CocoStudio/Action/CCActionFrameEasing.h b/include/extensions/CocoStudio/Action/CCActionFrameEasing.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Action/CCActionFrameEasing.h rename to include/extensions/CocoStudio/Action/CCActionFrameEasing.h diff --git a/x32/jni/libs/extensions/CocoStudio/Action/CCActionManager.h b/include/extensions/CocoStudio/Action/CCActionManager.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Action/CCActionManager.h rename to include/extensions/CocoStudio/Action/CCActionManager.h diff --git a/x32/jni/libs/extensions/CocoStudio/Action/CCActionNode.h b/include/extensions/CocoStudio/Action/CCActionNode.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Action/CCActionNode.h rename to include/extensions/CocoStudio/Action/CCActionNode.h diff --git a/x32/jni/libs/extensions/CocoStudio/Action/CCActionObject.h b/include/extensions/CocoStudio/Action/CCActionObject.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Action/CCActionObject.h rename to include/extensions/CocoStudio/Action/CCActionObject.h diff --git a/x32/jni/libs/extensions/CocoStudio/Armature/CCArmature.h b/include/extensions/CocoStudio/Armature/CCArmature.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Armature/CCArmature.h rename to include/extensions/CocoStudio/Armature/CCArmature.h diff --git a/x32/jni/libs/extensions/CocoStudio/Armature/CCBone.h b/include/extensions/CocoStudio/Armature/CCBone.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Armature/CCBone.h rename to include/extensions/CocoStudio/Armature/CCBone.h diff --git a/x32/jni/libs/extensions/CocoStudio/Armature/animation/CCArmatureAnimation.h b/include/extensions/CocoStudio/Armature/animation/CCArmatureAnimation.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Armature/animation/CCArmatureAnimation.h rename to include/extensions/CocoStudio/Armature/animation/CCArmatureAnimation.h diff --git a/x32/jni/libs/extensions/CocoStudio/Armature/animation/CCProcessBase.h b/include/extensions/CocoStudio/Armature/animation/CCProcessBase.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Armature/animation/CCProcessBase.h rename to include/extensions/CocoStudio/Armature/animation/CCProcessBase.h diff --git a/x32/jni/libs/extensions/CocoStudio/Armature/animation/CCTween.h b/include/extensions/CocoStudio/Armature/animation/CCTween.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Armature/animation/CCTween.h rename to include/extensions/CocoStudio/Armature/animation/CCTween.h diff --git a/x32/jni/libs/extensions/CocoStudio/Armature/datas/CCDatas.h b/include/extensions/CocoStudio/Armature/datas/CCDatas.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Armature/datas/CCDatas.h rename to include/extensions/CocoStudio/Armature/datas/CCDatas.h diff --git a/x32/jni/libs/extensions/CocoStudio/Armature/display/CCBatchNode.h b/include/extensions/CocoStudio/Armature/display/CCBatchNode.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Armature/display/CCBatchNode.h rename to include/extensions/CocoStudio/Armature/display/CCBatchNode.h diff --git a/x32/jni/libs/extensions/CocoStudio/Armature/display/CCDecorativeDisplay.h b/include/extensions/CocoStudio/Armature/display/CCDecorativeDisplay.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Armature/display/CCDecorativeDisplay.h rename to include/extensions/CocoStudio/Armature/display/CCDecorativeDisplay.h diff --git a/x32/jni/libs/extensions/CocoStudio/Armature/display/CCDisplayFactory.h b/include/extensions/CocoStudio/Armature/display/CCDisplayFactory.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Armature/display/CCDisplayFactory.h rename to include/extensions/CocoStudio/Armature/display/CCDisplayFactory.h diff --git a/x32/jni/libs/extensions/CocoStudio/Armature/display/CCDisplayManager.h b/include/extensions/CocoStudio/Armature/display/CCDisplayManager.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Armature/display/CCDisplayManager.h rename to include/extensions/CocoStudio/Armature/display/CCDisplayManager.h diff --git a/x32/jni/libs/extensions/CocoStudio/Armature/display/CCSkin.h b/include/extensions/CocoStudio/Armature/display/CCSkin.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Armature/display/CCSkin.h rename to include/extensions/CocoStudio/Armature/display/CCSkin.h diff --git a/x32/jni/libs/extensions/CocoStudio/Armature/external_tool/sigslot.h b/include/extensions/CocoStudio/Armature/external_tool/sigslot.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Armature/external_tool/sigslot.h rename to include/extensions/CocoStudio/Armature/external_tool/sigslot.h diff --git a/x32/jni/libs/extensions/CocoStudio/Armature/physics/CCColliderDetector.h b/include/extensions/CocoStudio/Armature/physics/CCColliderDetector.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Armature/physics/CCColliderDetector.h rename to include/extensions/CocoStudio/Armature/physics/CCColliderDetector.h diff --git a/x32/jni/libs/extensions/CocoStudio/Armature/utils/CCArmatureDataManager.h b/include/extensions/CocoStudio/Armature/utils/CCArmatureDataManager.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Armature/utils/CCArmatureDataManager.h rename to include/extensions/CocoStudio/Armature/utils/CCArmatureDataManager.h diff --git a/x32/jni/libs/extensions/CocoStudio/Armature/utils/CCArmatureDefine.h b/include/extensions/CocoStudio/Armature/utils/CCArmatureDefine.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Armature/utils/CCArmatureDefine.h rename to include/extensions/CocoStudio/Armature/utils/CCArmatureDefine.h diff --git a/x32/jni/libs/extensions/CocoStudio/Armature/utils/CCDataReaderHelper.h b/include/extensions/CocoStudio/Armature/utils/CCDataReaderHelper.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Armature/utils/CCDataReaderHelper.h rename to include/extensions/CocoStudio/Armature/utils/CCDataReaderHelper.h diff --git a/x32/jni/libs/extensions/CocoStudio/Armature/utils/CCSpriteFrameCacheHelper.h b/include/extensions/CocoStudio/Armature/utils/CCSpriteFrameCacheHelper.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Armature/utils/CCSpriteFrameCacheHelper.h rename to include/extensions/CocoStudio/Armature/utils/CCSpriteFrameCacheHelper.h diff --git a/x32/jni/libs/extensions/CocoStudio/Armature/utils/CCTransformHelp.h b/include/extensions/CocoStudio/Armature/utils/CCTransformHelp.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Armature/utils/CCTransformHelp.h rename to include/extensions/CocoStudio/Armature/utils/CCTransformHelp.h diff --git a/x32/jni/libs/extensions/CocoStudio/Armature/utils/CCTweenFunction.h b/include/extensions/CocoStudio/Armature/utils/CCTweenFunction.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Armature/utils/CCTweenFunction.h rename to include/extensions/CocoStudio/Armature/utils/CCTweenFunction.h diff --git a/x32/jni/libs/extensions/CocoStudio/Armature/utils/CCUtilMath.h b/include/extensions/CocoStudio/Armature/utils/CCUtilMath.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Armature/utils/CCUtilMath.h rename to include/extensions/CocoStudio/Armature/utils/CCUtilMath.h diff --git a/x32/jni/libs/extensions/CocoStudio/Components/CCComAttribute.h b/include/extensions/CocoStudio/Components/CCComAttribute.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Components/CCComAttribute.h rename to include/extensions/CocoStudio/Components/CCComAttribute.h diff --git a/x32/jni/libs/extensions/CocoStudio/Components/CCComAudio.h b/include/extensions/CocoStudio/Components/CCComAudio.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Components/CCComAudio.h rename to include/extensions/CocoStudio/Components/CCComAudio.h diff --git a/x32/jni/libs/extensions/CocoStudio/Components/CCComBase.h b/include/extensions/CocoStudio/Components/CCComBase.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Components/CCComBase.h rename to include/extensions/CocoStudio/Components/CCComBase.h diff --git a/x32/jni/libs/extensions/CocoStudio/Components/CCComController.h b/include/extensions/CocoStudio/Components/CCComController.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Components/CCComController.h rename to include/extensions/CocoStudio/Components/CCComController.h diff --git a/x32/jni/libs/extensions/CocoStudio/Components/CCComRender.h b/include/extensions/CocoStudio/Components/CCComRender.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Components/CCComRender.h rename to include/extensions/CocoStudio/Components/CCComRender.h diff --git a/x32/jni/libs/extensions/CocoStudio/Components/CCInputDelegate.h b/include/extensions/CocoStudio/Components/CCInputDelegate.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Components/CCInputDelegate.h rename to include/extensions/CocoStudio/Components/CCInputDelegate.h diff --git a/x32/jni/libs/extensions/CocoStudio/GUI/BaseClasses/UIWidget.h b/include/extensions/CocoStudio/GUI/BaseClasses/UIWidget.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/GUI/BaseClasses/UIWidget.h rename to include/extensions/CocoStudio/GUI/BaseClasses/UIWidget.h diff --git a/x32/jni/libs/extensions/CocoStudio/GUI/Layouts/UILayout.h b/include/extensions/CocoStudio/GUI/Layouts/UILayout.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/GUI/Layouts/UILayout.h rename to include/extensions/CocoStudio/GUI/Layouts/UILayout.h diff --git a/x32/jni/libs/extensions/CocoStudio/GUI/Layouts/UILayoutDefine.h b/include/extensions/CocoStudio/GUI/Layouts/UILayoutDefine.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/GUI/Layouts/UILayoutDefine.h rename to include/extensions/CocoStudio/GUI/Layouts/UILayoutDefine.h diff --git a/x32/jni/libs/extensions/CocoStudio/GUI/Layouts/UILayoutParameter.h b/include/extensions/CocoStudio/GUI/Layouts/UILayoutParameter.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/GUI/Layouts/UILayoutParameter.h rename to include/extensions/CocoStudio/GUI/Layouts/UILayoutParameter.h diff --git a/x32/jni/libs/extensions/CocoStudio/GUI/System/CocosGUI.h b/include/extensions/CocoStudio/GUI/System/CocosGUI.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/GUI/System/CocosGUI.h rename to include/extensions/CocoStudio/GUI/System/CocosGUI.h diff --git a/x32/jni/libs/extensions/CocoStudio/GUI/System/GUIDefine.h b/include/extensions/CocoStudio/GUI/System/GUIDefine.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/GUI/System/GUIDefine.h rename to include/extensions/CocoStudio/GUI/System/GUIDefine.h diff --git a/x32/jni/libs/extensions/CocoStudio/GUI/System/UIHelper.h b/include/extensions/CocoStudio/GUI/System/UIHelper.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/GUI/System/UIHelper.h rename to include/extensions/CocoStudio/GUI/System/UIHelper.h diff --git a/x32/jni/libs/extensions/CocoStudio/GUI/System/UITouchGroup.h b/include/extensions/CocoStudio/GUI/System/UITouchGroup.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/GUI/System/UITouchGroup.h rename to include/extensions/CocoStudio/GUI/System/UITouchGroup.h diff --git a/x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/Compatible/CompatibleClasses.h b/include/extensions/CocoStudio/GUI/UIWidgets/Compatible/CompatibleClasses.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/Compatible/CompatibleClasses.h rename to include/extensions/CocoStudio/GUI/UIWidgets/Compatible/CompatibleClasses.h diff --git a/x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIListView.h b/include/extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIListView.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIListView.h rename to include/extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIListView.h diff --git a/x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIPageView.h b/include/extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIPageView.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIPageView.h rename to include/extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIPageView.h diff --git a/x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIScrollInterface.h b/include/extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIScrollInterface.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIScrollInterface.h rename to include/extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIScrollInterface.h diff --git a/x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIScrollView.h b/include/extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIScrollView.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIScrollView.h rename to include/extensions/CocoStudio/GUI/UIWidgets/ScrollWidget/UIScrollView.h diff --git a/x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/UIButton.h b/include/extensions/CocoStudio/GUI/UIWidgets/UIButton.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/UIButton.h rename to include/extensions/CocoStudio/GUI/UIWidgets/UIButton.h diff --git a/x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/UICheckBox.h b/include/extensions/CocoStudio/GUI/UIWidgets/UICheckBox.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/UICheckBox.h rename to include/extensions/CocoStudio/GUI/UIWidgets/UICheckBox.h diff --git a/x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/UIImageView.h b/include/extensions/CocoStudio/GUI/UIWidgets/UIImageView.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/UIImageView.h rename to include/extensions/CocoStudio/GUI/UIWidgets/UIImageView.h diff --git a/x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/UILabel.h b/include/extensions/CocoStudio/GUI/UIWidgets/UILabel.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/UILabel.h rename to include/extensions/CocoStudio/GUI/UIWidgets/UILabel.h diff --git a/x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/UILabelAtlas.h b/include/extensions/CocoStudio/GUI/UIWidgets/UILabelAtlas.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/UILabelAtlas.h rename to include/extensions/CocoStudio/GUI/UIWidgets/UILabelAtlas.h diff --git a/x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/UILabelBMFont.h b/include/extensions/CocoStudio/GUI/UIWidgets/UILabelBMFont.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/UILabelBMFont.h rename to include/extensions/CocoStudio/GUI/UIWidgets/UILabelBMFont.h diff --git a/x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/UILoadingBar.h b/include/extensions/CocoStudio/GUI/UIWidgets/UILoadingBar.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/UILoadingBar.h rename to include/extensions/CocoStudio/GUI/UIWidgets/UILoadingBar.h diff --git a/x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/UIRichText.h b/include/extensions/CocoStudio/GUI/UIWidgets/UIRichText.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/UIRichText.h rename to include/extensions/CocoStudio/GUI/UIWidgets/UIRichText.h diff --git a/x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/UISlider.h b/include/extensions/CocoStudio/GUI/UIWidgets/UISlider.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/UISlider.h rename to include/extensions/CocoStudio/GUI/UIWidgets/UISlider.h diff --git a/x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/UITextField.h b/include/extensions/CocoStudio/GUI/UIWidgets/UITextField.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/GUI/UIWidgets/UITextField.h rename to include/extensions/CocoStudio/GUI/UIWidgets/UITextField.h diff --git a/x32/jni/libs/extensions/CocoStudio/Json/DictionaryHelper.h b/include/extensions/CocoStudio/Json/DictionaryHelper.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Json/DictionaryHelper.h rename to include/extensions/CocoStudio/Json/DictionaryHelper.h diff --git a/x32/jni/libs/extensions/CocoStudio/Json/rapidjson/document.h b/include/extensions/CocoStudio/Json/rapidjson/document.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Json/rapidjson/document.h rename to include/extensions/CocoStudio/Json/rapidjson/document.h diff --git a/x32/jni/libs/extensions/CocoStudio/Json/rapidjson/filestream.h b/include/extensions/CocoStudio/Json/rapidjson/filestream.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Json/rapidjson/filestream.h rename to include/extensions/CocoStudio/Json/rapidjson/filestream.h diff --git a/x32/jni/libs/extensions/CocoStudio/Json/rapidjson/internal/pow10.h b/include/extensions/CocoStudio/Json/rapidjson/internal/pow10.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Json/rapidjson/internal/pow10.h rename to include/extensions/CocoStudio/Json/rapidjson/internal/pow10.h diff --git a/x32/jni/libs/extensions/CocoStudio/Json/rapidjson/internal/stack.h b/include/extensions/CocoStudio/Json/rapidjson/internal/stack.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Json/rapidjson/internal/stack.h rename to include/extensions/CocoStudio/Json/rapidjson/internal/stack.h diff --git a/x32/jni/libs/extensions/CocoStudio/Json/rapidjson/internal/strfunc.h b/include/extensions/CocoStudio/Json/rapidjson/internal/strfunc.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Json/rapidjson/internal/strfunc.h rename to include/extensions/CocoStudio/Json/rapidjson/internal/strfunc.h diff --git a/x32/jni/libs/extensions/CocoStudio/Json/rapidjson/prettywriter.h b/include/extensions/CocoStudio/Json/rapidjson/prettywriter.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Json/rapidjson/prettywriter.h rename to include/extensions/CocoStudio/Json/rapidjson/prettywriter.h diff --git a/x32/jni/libs/extensions/CocoStudio/Json/rapidjson/rapidjson.h b/include/extensions/CocoStudio/Json/rapidjson/rapidjson.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Json/rapidjson/rapidjson.h rename to include/extensions/CocoStudio/Json/rapidjson/rapidjson.h diff --git a/x32/jni/libs/extensions/CocoStudio/Json/rapidjson/reader.h b/include/extensions/CocoStudio/Json/rapidjson/reader.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Json/rapidjson/reader.h rename to include/extensions/CocoStudio/Json/rapidjson/reader.h diff --git a/x32/jni/libs/extensions/CocoStudio/Json/rapidjson/stringbuffer.h b/include/extensions/CocoStudio/Json/rapidjson/stringbuffer.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Json/rapidjson/stringbuffer.h rename to include/extensions/CocoStudio/Json/rapidjson/stringbuffer.h diff --git a/x32/jni/libs/extensions/CocoStudio/Json/rapidjson/writer.h b/include/extensions/CocoStudio/Json/rapidjson/writer.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Json/rapidjson/writer.h rename to include/extensions/CocoStudio/Json/rapidjson/writer.h diff --git a/x32/jni/libs/extensions/CocoStudio/Reader/GUIReader.h b/include/extensions/CocoStudio/Reader/GUIReader.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Reader/GUIReader.h rename to include/extensions/CocoStudio/Reader/GUIReader.h diff --git a/x32/jni/libs/extensions/CocoStudio/Reader/SceneReader.h b/include/extensions/CocoStudio/Reader/SceneReader.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Reader/SceneReader.h rename to include/extensions/CocoStudio/Reader/SceneReader.h diff --git a/x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/ButtonReader/ButtonReader.h b/include/extensions/CocoStudio/Reader/WidgetReader/ButtonReader/ButtonReader.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/ButtonReader/ButtonReader.h rename to include/extensions/CocoStudio/Reader/WidgetReader/ButtonReader/ButtonReader.h diff --git a/x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/CheckBoxReader/CheckBoxReader.h b/include/extensions/CocoStudio/Reader/WidgetReader/CheckBoxReader/CheckBoxReader.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/CheckBoxReader/CheckBoxReader.h rename to include/extensions/CocoStudio/Reader/WidgetReader/CheckBoxReader/CheckBoxReader.h diff --git a/x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/ImageViewReader/ImageViewReader.h b/include/extensions/CocoStudio/Reader/WidgetReader/ImageViewReader/ImageViewReader.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/ImageViewReader/ImageViewReader.h rename to include/extensions/CocoStudio/Reader/WidgetReader/ImageViewReader/ImageViewReader.h diff --git a/x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/LabelAtlasReader/LabelAtlasReader.h b/include/extensions/CocoStudio/Reader/WidgetReader/LabelAtlasReader/LabelAtlasReader.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/LabelAtlasReader/LabelAtlasReader.h rename to include/extensions/CocoStudio/Reader/WidgetReader/LabelAtlasReader/LabelAtlasReader.h diff --git a/x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/LabelBMFontReader/LabelBMFontReader.h b/include/extensions/CocoStudio/Reader/WidgetReader/LabelBMFontReader/LabelBMFontReader.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/LabelBMFontReader/LabelBMFontReader.h rename to include/extensions/CocoStudio/Reader/WidgetReader/LabelBMFontReader/LabelBMFontReader.h diff --git a/x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/LabelReader/LabelReader.h b/include/extensions/CocoStudio/Reader/WidgetReader/LabelReader/LabelReader.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/LabelReader/LabelReader.h rename to include/extensions/CocoStudio/Reader/WidgetReader/LabelReader/LabelReader.h diff --git a/x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/LayoutReader/LayoutReader.h b/include/extensions/CocoStudio/Reader/WidgetReader/LayoutReader/LayoutReader.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/LayoutReader/LayoutReader.h rename to include/extensions/CocoStudio/Reader/WidgetReader/LayoutReader/LayoutReader.h diff --git a/x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/ListViewReader/ListViewReader.h b/include/extensions/CocoStudio/Reader/WidgetReader/ListViewReader/ListViewReader.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/ListViewReader/ListViewReader.h rename to include/extensions/CocoStudio/Reader/WidgetReader/ListViewReader/ListViewReader.h diff --git a/x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/LoadingBarReader/LoadingBarReader.h b/include/extensions/CocoStudio/Reader/WidgetReader/LoadingBarReader/LoadingBarReader.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/LoadingBarReader/LoadingBarReader.h rename to include/extensions/CocoStudio/Reader/WidgetReader/LoadingBarReader/LoadingBarReader.h diff --git a/x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/PageViewReader/PageViewReader.h b/include/extensions/CocoStudio/Reader/WidgetReader/PageViewReader/PageViewReader.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/PageViewReader/PageViewReader.h rename to include/extensions/CocoStudio/Reader/WidgetReader/PageViewReader/PageViewReader.h diff --git a/x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/ScrollViewReader/ScrollViewReader.h b/include/extensions/CocoStudio/Reader/WidgetReader/ScrollViewReader/ScrollViewReader.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/ScrollViewReader/ScrollViewReader.h rename to include/extensions/CocoStudio/Reader/WidgetReader/ScrollViewReader/ScrollViewReader.h diff --git a/x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/SliderReader/SliderReader.h b/include/extensions/CocoStudio/Reader/WidgetReader/SliderReader/SliderReader.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/SliderReader/SliderReader.h rename to include/extensions/CocoStudio/Reader/WidgetReader/SliderReader/SliderReader.h diff --git a/x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/TextFieldReader/TextFieldReader.h b/include/extensions/CocoStudio/Reader/WidgetReader/TextFieldReader/TextFieldReader.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/TextFieldReader/TextFieldReader.h rename to include/extensions/CocoStudio/Reader/WidgetReader/TextFieldReader/TextFieldReader.h diff --git a/x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/WidgetReader.h b/include/extensions/CocoStudio/Reader/WidgetReader/WidgetReader.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/WidgetReader.h rename to include/extensions/CocoStudio/Reader/WidgetReader/WidgetReader.h diff --git a/x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/WidgetReaderProtocol.h b/include/extensions/CocoStudio/Reader/WidgetReader/WidgetReaderProtocol.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Reader/WidgetReader/WidgetReaderProtocol.h rename to include/extensions/CocoStudio/Reader/WidgetReader/WidgetReaderProtocol.h diff --git a/x32/jni/libs/extensions/CocoStudio/Trigger/ObjectFactory.h b/include/extensions/CocoStudio/Trigger/ObjectFactory.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Trigger/ObjectFactory.h rename to include/extensions/CocoStudio/Trigger/ObjectFactory.h diff --git a/x32/jni/libs/extensions/CocoStudio/Trigger/TriggerBase.h b/include/extensions/CocoStudio/Trigger/TriggerBase.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Trigger/TriggerBase.h rename to include/extensions/CocoStudio/Trigger/TriggerBase.h diff --git a/x32/jni/libs/extensions/CocoStudio/Trigger/TriggerMng.h b/include/extensions/CocoStudio/Trigger/TriggerMng.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Trigger/TriggerMng.h rename to include/extensions/CocoStudio/Trigger/TriggerMng.h diff --git a/x32/jni/libs/extensions/CocoStudio/Trigger/TriggerObj.h b/include/extensions/CocoStudio/Trigger/TriggerObj.h similarity index 100% rename from x32/jni/libs/extensions/CocoStudio/Trigger/TriggerObj.h rename to include/extensions/CocoStudio/Trigger/TriggerObj.h diff --git a/x32/jni/libs/extensions/ExtensionMacros.h b/include/extensions/ExtensionMacros.h similarity index 100% rename from x32/jni/libs/extensions/ExtensionMacros.h rename to include/extensions/ExtensionMacros.h diff --git a/x32/jni/libs/extensions/GUI/CCControlExtension/CCControl.h b/include/extensions/GUI/CCControlExtension/CCControl.h similarity index 100% rename from x32/jni/libs/extensions/GUI/CCControlExtension/CCControl.h rename to include/extensions/GUI/CCControlExtension/CCControl.h diff --git a/x32/jni/libs/extensions/GUI/CCControlExtension/CCControlButton.h b/include/extensions/GUI/CCControlExtension/CCControlButton.h similarity index 100% rename from x32/jni/libs/extensions/GUI/CCControlExtension/CCControlButton.h rename to include/extensions/GUI/CCControlExtension/CCControlButton.h diff --git a/x32/jni/libs/extensions/GUI/CCControlExtension/CCControlColourPicker.h b/include/extensions/GUI/CCControlExtension/CCControlColourPicker.h similarity index 100% rename from x32/jni/libs/extensions/GUI/CCControlExtension/CCControlColourPicker.h rename to include/extensions/GUI/CCControlExtension/CCControlColourPicker.h diff --git a/x32/jni/libs/extensions/GUI/CCControlExtension/CCControlExtensions.h b/include/extensions/GUI/CCControlExtension/CCControlExtensions.h similarity index 100% rename from x32/jni/libs/extensions/GUI/CCControlExtension/CCControlExtensions.h rename to include/extensions/GUI/CCControlExtension/CCControlExtensions.h diff --git a/x32/jni/libs/extensions/GUI/CCControlExtension/CCControlHuePicker.h b/include/extensions/GUI/CCControlExtension/CCControlHuePicker.h similarity index 100% rename from x32/jni/libs/extensions/GUI/CCControlExtension/CCControlHuePicker.h rename to include/extensions/GUI/CCControlExtension/CCControlHuePicker.h diff --git a/x32/jni/libs/extensions/GUI/CCControlExtension/CCControlPotentiometer.h b/include/extensions/GUI/CCControlExtension/CCControlPotentiometer.h similarity index 100% rename from x32/jni/libs/extensions/GUI/CCControlExtension/CCControlPotentiometer.h rename to include/extensions/GUI/CCControlExtension/CCControlPotentiometer.h diff --git a/x32/jni/libs/extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.h b/include/extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.h similarity index 100% rename from x32/jni/libs/extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.h rename to include/extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.h diff --git a/x32/jni/libs/extensions/GUI/CCControlExtension/CCControlSlider.h b/include/extensions/GUI/CCControlExtension/CCControlSlider.h similarity index 100% rename from x32/jni/libs/extensions/GUI/CCControlExtension/CCControlSlider.h rename to include/extensions/GUI/CCControlExtension/CCControlSlider.h diff --git a/x32/jni/libs/extensions/GUI/CCControlExtension/CCControlStepper.h b/include/extensions/GUI/CCControlExtension/CCControlStepper.h similarity index 100% rename from x32/jni/libs/extensions/GUI/CCControlExtension/CCControlStepper.h rename to include/extensions/GUI/CCControlExtension/CCControlStepper.h diff --git a/x32/jni/libs/extensions/GUI/CCControlExtension/CCControlSwitch.h b/include/extensions/GUI/CCControlExtension/CCControlSwitch.h similarity index 100% rename from x32/jni/libs/extensions/GUI/CCControlExtension/CCControlSwitch.h rename to include/extensions/GUI/CCControlExtension/CCControlSwitch.h diff --git a/x32/jni/libs/extensions/GUI/CCControlExtension/CCControlUtils.h b/include/extensions/GUI/CCControlExtension/CCControlUtils.h similarity index 100% rename from x32/jni/libs/extensions/GUI/CCControlExtension/CCControlUtils.h rename to include/extensions/GUI/CCControlExtension/CCControlUtils.h diff --git a/x32/jni/libs/extensions/GUI/CCControlExtension/CCInvocation.h b/include/extensions/GUI/CCControlExtension/CCInvocation.h similarity index 100% rename from x32/jni/libs/extensions/GUI/CCControlExtension/CCInvocation.h rename to include/extensions/GUI/CCControlExtension/CCInvocation.h diff --git a/x32/jni/libs/extensions/GUI/CCControlExtension/CCScale9Sprite.h b/include/extensions/GUI/CCControlExtension/CCScale9Sprite.h similarity index 100% rename from x32/jni/libs/extensions/GUI/CCControlExtension/CCScale9Sprite.h rename to include/extensions/GUI/CCControlExtension/CCScale9Sprite.h diff --git a/x32/jni/libs/extensions/GUI/CCEditBox/CCEditBox.h b/include/extensions/GUI/CCEditBox/CCEditBox.h similarity index 100% rename from x32/jni/libs/extensions/GUI/CCEditBox/CCEditBox.h rename to include/extensions/GUI/CCEditBox/CCEditBox.h diff --git a/x32/jni/libs/extensions/GUI/CCEditBox/CCEditBoxImpl.h b/include/extensions/GUI/CCEditBox/CCEditBoxImpl.h similarity index 100% rename from x32/jni/libs/extensions/GUI/CCEditBox/CCEditBoxImpl.h rename to include/extensions/GUI/CCEditBox/CCEditBoxImpl.h diff --git a/x32/jni/libs/extensions/GUI/CCEditBox/CCEditBoxImplAndroid.h b/include/extensions/GUI/CCEditBox/CCEditBoxImplAndroid.h similarity index 100% rename from x32/jni/libs/extensions/GUI/CCEditBox/CCEditBoxImplAndroid.h rename to include/extensions/GUI/CCEditBox/CCEditBoxImplAndroid.h diff --git a/x32/jni/libs/extensions/GUI/CCEditBox/CCEditBoxImplIOS.h b/include/extensions/GUI/CCEditBox/CCEditBoxImplIOS.h similarity index 100% rename from x32/jni/libs/extensions/GUI/CCEditBox/CCEditBoxImplIOS.h rename to include/extensions/GUI/CCEditBox/CCEditBoxImplIOS.h diff --git a/x32/jni/libs/extensions/GUI/CCEditBox/CCEditBoxImplMac.h b/include/extensions/GUI/CCEditBox/CCEditBoxImplMac.h similarity index 100% rename from x32/jni/libs/extensions/GUI/CCEditBox/CCEditBoxImplMac.h rename to include/extensions/GUI/CCEditBox/CCEditBoxImplMac.h diff --git a/x32/jni/libs/extensions/GUI/CCEditBox/CCEditBoxImplTizen.h b/include/extensions/GUI/CCEditBox/CCEditBoxImplTizen.h similarity index 100% rename from x32/jni/libs/extensions/GUI/CCEditBox/CCEditBoxImplTizen.h rename to include/extensions/GUI/CCEditBox/CCEditBoxImplTizen.h diff --git a/x32/jni/libs/extensions/GUI/CCEditBox/CCEditBoxImplWin.h b/include/extensions/GUI/CCEditBox/CCEditBoxImplWin.h similarity index 100% rename from x32/jni/libs/extensions/GUI/CCEditBox/CCEditBoxImplWin.h rename to include/extensions/GUI/CCEditBox/CCEditBoxImplWin.h diff --git a/x32/jni/libs/extensions/GUI/CCEditBox/CCEditBoxImplWp8.h b/include/extensions/GUI/CCEditBox/CCEditBoxImplWp8.h similarity index 100% rename from x32/jni/libs/extensions/GUI/CCEditBox/CCEditBoxImplWp8.h rename to include/extensions/GUI/CCEditBox/CCEditBoxImplWp8.h diff --git a/x32/jni/libs/extensions/GUI/CCScrollView/CCScrollView.h b/include/extensions/GUI/CCScrollView/CCScrollView.h similarity index 100% rename from x32/jni/libs/extensions/GUI/CCScrollView/CCScrollView.h rename to include/extensions/GUI/CCScrollView/CCScrollView.h diff --git a/x32/jni/libs/extensions/GUI/CCScrollView/CCSorting.h b/include/extensions/GUI/CCScrollView/CCSorting.h similarity index 100% rename from x32/jni/libs/extensions/GUI/CCScrollView/CCSorting.h rename to include/extensions/GUI/CCScrollView/CCSorting.h diff --git a/x32/jni/libs/extensions/GUI/CCScrollView/CCTableView.h b/include/extensions/GUI/CCScrollView/CCTableView.h similarity index 100% rename from x32/jni/libs/extensions/GUI/CCScrollView/CCTableView.h rename to include/extensions/GUI/CCScrollView/CCTableView.h diff --git a/x32/jni/libs/extensions/GUI/CCScrollView/CCTableViewCell.h b/include/extensions/GUI/CCScrollView/CCTableViewCell.h similarity index 100% rename from x32/jni/libs/extensions/GUI/CCScrollView/CCTableViewCell.h rename to include/extensions/GUI/CCScrollView/CCTableViewCell.h diff --git a/x32/jni/libs/extensions/LocalStorage/LocalStorage.h b/include/extensions/LocalStorage/LocalStorage.h similarity index 100% rename from x32/jni/libs/extensions/LocalStorage/LocalStorage.h rename to include/extensions/LocalStorage/LocalStorage.h diff --git a/x32/jni/libs/extensions/cocos-ext.h b/include/extensions/cocos-ext.h similarity index 100% rename from x32/jni/libs/extensions/cocos-ext.h rename to include/extensions/cocos-ext.h diff --git a/x32/jni/libs/extensions/network/HttpClient.h b/include/extensions/network/HttpClient.h similarity index 100% rename from x32/jni/libs/extensions/network/HttpClient.h rename to include/extensions/network/HttpClient.h diff --git a/x32/jni/libs/extensions/network/HttpRequest.h b/include/extensions/network/HttpRequest.h similarity index 100% rename from x32/jni/libs/extensions/network/HttpRequest.h rename to include/extensions/network/HttpRequest.h diff --git a/x32/jni/libs/extensions/network/HttpResponse.h b/include/extensions/network/HttpResponse.h similarity index 100% rename from x32/jni/libs/extensions/network/HttpResponse.h rename to include/extensions/network/HttpResponse.h diff --git a/x32/jni/libs/extensions/network/WebSocket.h b/include/extensions/network/WebSocket.h similarity index 100% rename from x32/jni/libs/extensions/network/WebSocket.h rename to include/extensions/network/WebSocket.h diff --git a/x32/jni/libs/extensions/physics_nodes/CCPhysicsDebugNode.h b/include/extensions/physics_nodes/CCPhysicsDebugNode.h similarity index 100% rename from x32/jni/libs/extensions/physics_nodes/CCPhysicsDebugNode.h rename to include/extensions/physics_nodes/CCPhysicsDebugNode.h diff --git a/x32/jni/libs/extensions/physics_nodes/CCPhysicsSprite.h b/include/extensions/physics_nodes/CCPhysicsSprite.h similarity index 100% rename from x32/jni/libs/extensions/physics_nodes/CCPhysicsSprite.h rename to include/extensions/physics_nodes/CCPhysicsSprite.h diff --git a/x32/jni/libs/extensions/spine/Animation.h b/include/extensions/spine/Animation.h similarity index 100% rename from x32/jni/libs/extensions/spine/Animation.h rename to include/extensions/spine/Animation.h diff --git a/x32/jni/libs/extensions/spine/AnimationState.h b/include/extensions/spine/AnimationState.h similarity index 100% rename from x32/jni/libs/extensions/spine/AnimationState.h rename to include/extensions/spine/AnimationState.h diff --git a/x32/jni/libs/extensions/spine/AnimationStateData.h b/include/extensions/spine/AnimationStateData.h similarity index 100% rename from x32/jni/libs/extensions/spine/AnimationStateData.h rename to include/extensions/spine/AnimationStateData.h diff --git a/x32/jni/libs/extensions/spine/Atlas.h b/include/extensions/spine/Atlas.h similarity index 100% rename from x32/jni/libs/extensions/spine/Atlas.h rename to include/extensions/spine/Atlas.h diff --git a/x32/jni/libs/extensions/spine/AtlasAttachmentLoader.h b/include/extensions/spine/AtlasAttachmentLoader.h similarity index 100% rename from x32/jni/libs/extensions/spine/AtlasAttachmentLoader.h rename to include/extensions/spine/AtlasAttachmentLoader.h diff --git a/x32/jni/libs/extensions/spine/Attachment.h b/include/extensions/spine/Attachment.h similarity index 100% rename from x32/jni/libs/extensions/spine/Attachment.h rename to include/extensions/spine/Attachment.h diff --git a/x32/jni/libs/extensions/spine/AttachmentLoader.h b/include/extensions/spine/AttachmentLoader.h similarity index 100% rename from x32/jni/libs/extensions/spine/AttachmentLoader.h rename to include/extensions/spine/AttachmentLoader.h diff --git a/x32/jni/libs/extensions/spine/Bone.h b/include/extensions/spine/Bone.h similarity index 100% rename from x32/jni/libs/extensions/spine/Bone.h rename to include/extensions/spine/Bone.h diff --git a/x32/jni/libs/extensions/spine/BoneData.h b/include/extensions/spine/BoneData.h similarity index 100% rename from x32/jni/libs/extensions/spine/BoneData.h rename to include/extensions/spine/BoneData.h diff --git a/x32/jni/libs/extensions/spine/CCSkeleton.h b/include/extensions/spine/CCSkeleton.h similarity index 100% rename from x32/jni/libs/extensions/spine/CCSkeleton.h rename to include/extensions/spine/CCSkeleton.h diff --git a/x32/jni/libs/extensions/spine/CCSkeletonAnimation.h b/include/extensions/spine/CCSkeletonAnimation.h similarity index 100% rename from x32/jni/libs/extensions/spine/CCSkeletonAnimation.h rename to include/extensions/spine/CCSkeletonAnimation.h diff --git a/x32/jni/libs/extensions/spine/Json.h b/include/extensions/spine/Json.h similarity index 100% rename from x32/jni/libs/extensions/spine/Json.h rename to include/extensions/spine/Json.h diff --git a/x32/jni/libs/extensions/spine/RegionAttachment.h b/include/extensions/spine/RegionAttachment.h similarity index 100% rename from x32/jni/libs/extensions/spine/RegionAttachment.h rename to include/extensions/spine/RegionAttachment.h diff --git a/x32/jni/libs/extensions/spine/Skeleton.h b/include/extensions/spine/Skeleton.h similarity index 100% rename from x32/jni/libs/extensions/spine/Skeleton.h rename to include/extensions/spine/Skeleton.h diff --git a/x32/jni/libs/extensions/spine/SkeletonData.h b/include/extensions/spine/SkeletonData.h similarity index 100% rename from x32/jni/libs/extensions/spine/SkeletonData.h rename to include/extensions/spine/SkeletonData.h diff --git a/x32/jni/libs/extensions/spine/SkeletonJson.h b/include/extensions/spine/SkeletonJson.h similarity index 100% rename from x32/jni/libs/extensions/spine/SkeletonJson.h rename to include/extensions/spine/SkeletonJson.h diff --git a/x32/jni/libs/extensions/spine/Skin.h b/include/extensions/spine/Skin.h similarity index 100% rename from x32/jni/libs/extensions/spine/Skin.h rename to include/extensions/spine/Skin.h diff --git a/x32/jni/libs/extensions/spine/Slot.h b/include/extensions/spine/Slot.h similarity index 100% rename from x32/jni/libs/extensions/spine/Slot.h rename to include/extensions/spine/Slot.h diff --git a/x32/jni/libs/extensions/spine/SlotData.h b/include/extensions/spine/SlotData.h similarity index 100% rename from x32/jni/libs/extensions/spine/SlotData.h rename to include/extensions/spine/SlotData.h diff --git a/x32/jni/libs/extensions/spine/extension.h b/include/extensions/spine/extension.h similarity index 100% rename from x32/jni/libs/extensions/spine/extension.h rename to include/extensions/spine/extension.h diff --git a/x32/jni/libs/extensions/spine/spine-cocos2dx.h b/include/extensions/spine/spine-cocos2dx.h similarity index 100% rename from x32/jni/libs/extensions/spine/spine-cocos2dx.h rename to include/extensions/spine/spine-cocos2dx.h diff --git a/x32/jni/libs/extensions/spine/spine.h b/include/extensions/spine/spine.h similarity index 100% rename from x32/jni/libs/extensions/spine/spine.h rename to include/extensions/spine/spine.h diff --git a/include/gd/MenuLayer.h b/include/gd/MenuLayer.h new file mode 100644 index 0000000..65c4aa3 --- /dev/null +++ b/include/gd/MenuLayer.h @@ -0,0 +1,13 @@ +#ifndef _MENULAYER_H_ +#define _MENULAYER_H_ + +#include + +using namespace cocos2d; + +class MenuLayer : public CCLayer { +public: + void onDaily(CCObject* pSender); +}; + +#endif diff --git a/include/gd/gd.h b/include/gd/gd.h new file mode 100644 index 0000000..564592e --- /dev/null +++ b/include/gd/gd.h @@ -0,0 +1,6 @@ +#ifndef _GD_H_ +#define _GD_H_ + +#include "MenuLayer.h" + +#endif diff --git a/x32/jni/include/libcocos2dcpp.so b/libs/armeabi-v7a/libcocos2dcpp.so similarity index 100% rename from x32/jni/include/libcocos2dcpp.so rename to libs/armeabi-v7a/libcocos2dcpp.so diff --git a/libs/armeabi-v7a/libdobby.a b/libs/armeabi-v7a/libdobby.a new file mode 100644 index 0000000..3631876 Binary files /dev/null and b/libs/armeabi-v7a/libdobby.a differ diff --git a/libs/armeabi-v7a/libfmod.so b/libs/armeabi-v7a/libfmod.so new file mode 100644 index 0000000..6d67fb9 Binary files /dev/null and b/libs/armeabi-v7a/libfmod.so differ diff --git a/libs/x86/libcocos2dcpp.so b/libs/x86/libcocos2dcpp.so new file mode 100644 index 0000000..a3508af Binary files /dev/null and b/libs/x86/libcocos2dcpp.so differ diff --git a/libs/x86/libdobby.a b/libs/x86/libdobby.a new file mode 100644 index 0000000..cd23129 Binary files /dev/null and b/libs/x86/libdobby.a differ diff --git a/libs/x86/libfmod.so b/libs/x86/libfmod.so new file mode 100644 index 0000000..34b5a0a Binary files /dev/null and b/libs/x86/libfmod.so differ diff --git a/params.txt b/params.txt deleted file mode 100644 index ccf61c0..0000000 --- a/params.txt +++ /dev/null @@ -1,2 +0,0 @@ -android_ndk_path (%NDK_ROOT%) -project_path \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp new file mode 100644 index 0000000..b848ae9 --- /dev/null +++ b/src/main.cpp @@ -0,0 +1,31 @@ +#include +#include +#include +#include + +using namespace cocos2d; + +namespace MenuLayerH { + bool (*init_o)(MenuLayer*); + bool init(MenuLayer* self) { + auto ret = init_o(self); + + auto sprite = CCSprite::createWithSpriteFrameName("GJ_playBtn_001.png"); + auto btn = CCMenuItemSprite::create(sprite, sprite, self, menu_selector(MenuLayer::onDaily)); + btn->setScale(0.5); + auto menu = CCMenu::create(); + menu->addChild(btn, 100); + menu->setPosition({CCDirector::sharedDirector()->getVisibleSize().width / 3, 100}); + self->addChild(menu, 100); + + return ret; + } + + void applyHooks() { + DobbyHook(dlsym(dlopen("libcocos2dcpp.so", RTLD_LAZY), "_ZN9MenuLayer4initEv"), (void*)init, (void**)&init_o); + } +} + +__attribute__((constructor)) void hyperdahs() { + MenuLayerH::applyHooks(); +} diff --git a/x32/jni/Android.mk b/x32/jni/Android.mk deleted file mode 100644 index c515aba..0000000 --- a/x32/jni/Android.mk +++ /dev/null @@ -1,38 +0,0 @@ -include $(CLEAR_VARS) -$(warning "${MAIN_LOCAL_PATH}") - -LOCAL_PATH = . -LOCAL_MODULE := cocos2dcpp -LOCAL_EXPORT_C_INCLUDES := $(MAIN_LOCAL_PATH) \ - $(MAIN_LOCAL_PATH)/libs/cocos2dx \ - $(MAIN_LOCAL_PATH)/libs/cocos2dx/include \ - $(MAIN_LOCAL_PATH)/libs/cocos2dx/platform \ - $(MAIN_LOCAL_PATH)/libs/cocos2dx/platform/android \ - $(MAIN_LOCAL_PATH)/libs/cocos2dx/kazmath/include \ - $(MAIN_LOCAL_PATH)/libs/gd -LOCAL_SRC_FILES := ${MAIN_LOCAL_PATH}/include/libcocos2dcpp.so -include $(PREBUILT_SHARED_LIBRARY) - -LOCAL_PATH := ${MAIN_LOCAL_PATH} -include $(CLEAR_VARS) -LOCAL_MODULE := androidml - -LOCAL_CPPFLAGS := -std=c++14 -LOCAL_CFLAGS := -Wno-error=format-security -fpermissive -Wc++14-extensions -Wno-absolute-value -LOCAL_CFLAGS += -fno-rtti -fno-exceptions - -LOCAL_C_INCLUDES += $(MAIN_LOCAL_PATH) \ - $(MAIN_LOCAL_PATH)/libs/cocos2dx \ - $(MAIN_LOCAL_PATH)/libs/cocos2dx/include \ - $(MAIN_LOCAL_PATH)/libs/cocos2dx/platform \ - $(MAIN_LOCAL_PATH)/libs/cocos2dx/platform/android \ - $(MAIN_LOCAL_PATH)/libs/cocos2dx/kazmath/include \ - $(MAIN_LOCAL_PATH)/libs/gd - -LOCAL_SRC_FILES := src/main.cpp \ - libs/hook/inlineHook.c \ - libs/hook/relocate.c \ - -LOCAL_LDLIBS := -llog -LOCAL_SHARED_LIBRARIES = cocos2dcpp -include $(BUILD_SHARED_LIBRARY) \ No newline at end of file diff --git a/x32/jni/Application.mk b/x32/jni/Application.mk deleted file mode 100644 index c5d2828..0000000 --- a/x32/jni/Application.mk +++ /dev/null @@ -1,15 +0,0 @@ -APP_ABI := armeabi-v7a -APP_OPTIM := release -APP_PLATFORM := android-27 -APP_STL := system -APP_STL := gnustl_static -APP_THIN_ARCHIVE := true -APP_PIE:= true - - -ifneq ($(APP_OPTIM), debug) - $(info APP_OPTIM is $(APP_OPTIM) ...) - APP_LDFLAGS += -Wl,--strip-all - APP_CFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden - APP_CFLAGS += -g0 -O3 -fomit-frame-pointer -ffunction-sections -fdata-sections -endif diff --git a/x32/jni/include/Utils.h b/x32/jni/include/Utils.h deleted file mode 100644 index eb09763..0000000 --- a/x32/jni/include/Utils.h +++ /dev/null @@ -1,48 +0,0 @@ -#ifndef UTILS_H -#define UTILS_H - -#include -#include - - -typedef unsigned long DWORD; - - -DWORD libBase = 0; - -/************************************** - ENTER THE GAME's LIB NAME HERE! -***************************************/ -const char* libName = "libcocos2dcpp.so"; - - -DWORD get_libBase(const char* libName); -DWORD getRealOffset(DWORD address); - -DWORD get_libBase(const char* libName) { - FILE *fp; - DWORD addr = 0; - char filename[32], buffer[1024]; - snprintf(filename, sizeof(filename), "/proc/%d/maps", getpid()); - fp = fopen(filename, "rt"); - if (fp != NULL) { - while (fgets(buffer, sizeof(buffer), fp)) { - if (strstr(buffer, libName)) { - addr = (uintptr_t) strtoul(buffer, NULL, 16); - break; - } - } - fclose(fp); - } - return addr; -} - -DWORD getRealOffset(DWORD address) { - if (libBase == 0) { - libBase = get_libBase(libName); - } - return (libBase + address); -} - - -#endif diff --git a/x32/jni/libs/gd/CreatorLayer.h b/x32/jni/libs/gd/CreatorLayer.h deleted file mode 100644 index 5375dee..0000000 --- a/x32/jni/libs/gd/CreatorLayer.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef CREATORLAYER_H -#define CREATORLAYER_H -#include - -class CreatorLayer : public cocos2d::CCNode { -public: - static cocos2d::CCScene* scene(); - static cocos2d::CCLayer* create(); - void onTreasureRoom(cocos2d::CCObject* pSender); - void onSecretVault(cocos2d::CCObject* pSender); - void onChallenge(cocos2d::CCObject* pSender); - void onWeeklyLevel(cocos2d::CCObject* pSender); - void onGauntlets(cocos2d::CCObject* pSender); - void onMapPacks(cocos2d::CCObject* pSender); - void onFameLevels(cocos2d::CCObject* pSender); - void onOnlineLevels(cocos2d::CCObject* pSender); - void onLeaderboards(cocos2d::CCObject* pSender); - void onSavedLevels(cocos2d::CCObject* pSender); - void onMyLevels(cocos2d::CCObject* pSender); - void onDailyLevel(cocos2d::CCObject* pSender); - void onFeaturedLevels(cocos2d::CCObject* pSender); - bool init(); -}; -#endif \ No newline at end of file diff --git a/x32/jni/libs/gd/MenuLayer.h b/x32/jni/libs/gd/MenuLayer.h deleted file mode 100644 index 6f12f1b..0000000 --- a/x32/jni/libs/gd/MenuLayer.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef MENULAYER_H -#define MENULAYER_H -#include - -class MenuLayer : public cocos2d::CCNode { -public: - void endGame(); - void onYouTube(cocos2d::CCObject*); - void onTwitter(cocos2d::CCObject*); - void onFacebook(cocos2d::CCObject*); - void onRobTop(cocos2d::CCObject*); - void onNewgrounds(cocos2d::CCObject*); - void onStats(cocos2d::CCObject*); - void onEveryplay(cocos2d::CCObject*); - void syncPlatformAchievements(float); - void onAchievements(cocos2d::CCObject*); - void onMoreGames(cocos2d::CCObject*); - void onDaily(cocos2d::CCObject*); - void onMyProfile(cocos2d::CCObject*); - static cocos2d::CCNode* node(void); - static cocos2d::CCScene* scene(bool); - void updateUserProfileButton(void); - bool init(); - void onGameCenter(cocos2d::CCObject*); - void openOptions(bool); - void onOptionsInstant(); - void onOptions(cocos2d::CCObject*); - void onQuit(cocos2d::CCObject*); - void onGarage(cocos2d::CCObject*); - void onCreator(cocos2d::CCObject*); - void onPlay(cocos2d::CCObject*); -}; -#endif \ No newline at end of file diff --git a/x32/jni/libs/gd/gd.h b/x32/jni/libs/gd/gd.h deleted file mode 100644 index 602a8e2..0000000 --- a/x32/jni/libs/gd/gd.h +++ /dev/null @@ -1,2 +0,0 @@ -#include "CreatorLayer.h" -#include "MenuLayer.h" \ No newline at end of file diff --git a/x32/jni/libs/hook/inlineHook.c b/x32/jni/libs/hook/inlineHook.c deleted file mode 100644 index fe682c0..0000000 --- a/x32/jni/libs/hook/inlineHook.c +++ /dev/null @@ -1,415 +0,0 @@ -#include -#include -#include -#include -#include -#include -// #include -#include -#include - -#include "relocate.h" -#include "inlineHook.h" - -#ifndef PAGE_SIZE -#define PAGE_SIZE 4096 -#endif - -#define PAGE_START(addr) (~(PAGE_SIZE - 1) & (addr)) -#define SET_BIT0(addr) (addr | 1) -#define CLEAR_BIT0(addr) (addr & 0xFFFFFFFE) -#define TEST_BIT0(addr) (addr & 1) - -#define ACTION_ENABLE 0 -#define ACTION_DISABLE 1 - -enum hook_status { - REGISTERED, - HOOKED, -}; - -struct inlineHookItem { - uint32_t target_addr; - uint32_t new_addr; - uint32_t **proto_addr; - void *orig_instructions; - int orig_boundaries[4]; - int trampoline_boundaries[20]; - int count; - void *trampoline_instructions; - int length; - int status; - int mode; -}; - -struct inlineHookInfo { - struct inlineHookItem item[1024]; - int size; -}; - -static struct inlineHookInfo info = {0}; - -static int getAllTids(pid_t exclude_tid, pid_t *tids) -{ - char dir_path[32]; - DIR *dir; - int i; - struct dirent *entry; - pid_t tid; - - if (exclude_tid < 0) { - snprintf(dir_path, sizeof(dir_path), "/proc/self/task"); - } - else { - snprintf(dir_path, sizeof(dir_path), "/proc/%d/task", exclude_tid); - } - - dir = opendir(dir_path); - if (dir == NULL) { - return 0; - } - - i = 0; - while((entry = readdir(dir)) != NULL) { - tid = atoi(entry->d_name); - if (tid != 0 && tid != exclude_tid) { - tids[i++] = tid; - } - } - closedir(dir); - return i; -} - -static bool doProcessThreadPC(struct inlineHookItem *item, struct pt_regs *regs, int action) -{ - int offset; - int i; - - switch (action) - { - case ACTION_ENABLE: - offset = regs->ARM_pc - CLEAR_BIT0(item->target_addr); - for (i = 0; i < item->count; ++i) { - if (offset == item->orig_boundaries[i]) { - regs->ARM_pc = (uint32_t) item->trampoline_instructions + item->trampoline_boundaries[i]; - return true; - } - } - break; - case ACTION_DISABLE: - offset = regs->ARM_pc - (int) item->trampoline_instructions; - for (i = 0; i < item->count; ++i) { - if (offset == item->trampoline_boundaries[i]) { - regs->ARM_pc = CLEAR_BIT0(item->target_addr) + item->orig_boundaries[i]; - return true; - } - } - break; - } - - return false; -} - -static void processThreadPC(pid_t tid, struct inlineHookItem *item, int action) -{ - struct pt_regs regs; - - if (ptrace(PTRACE_GETREGS, tid, NULL, ®s) == 0) { - if (item == NULL) { - int pos; - - for (pos = 0; pos < info.size; ++pos) { - if (doProcessThreadPC(&info.item[pos], ®s, action) == true) { - break; - } - } - } - else { - doProcessThreadPC(item, ®s, action); - } - - ptrace(PTRACE_SETREGS, tid, NULL, ®s); - } -} - -static pid_t freeze(struct inlineHookItem *item, int action) -{ - int count; - pid_t tids[1024]; - pid_t pid; - - pid = -1; - count = getAllTids(gettid(), tids); - if (count > 0) { - pid = fork(); - - if (pid == 0) { - int i; - - for (i = 0; i < count; ++i) { - if (ptrace(PTRACE_ATTACH, tids[i], NULL, NULL) == 0) { - waitpid(tids[i], NULL, WUNTRACED); - processThreadPC(tids[i], item, action); - } - } - - raise(SIGSTOP); - - for (i = 0; i < count; ++i) { - ptrace(PTRACE_DETACH, tids[i], NULL, NULL); - } - - raise(SIGKILL); - } - - else if (pid > 0) { - waitpid(pid, NULL, WUNTRACED); - } - } - - return pid; -} - -static void unFreeze(pid_t pid) -{ - if (pid < 0) { - return; - } - - kill(pid, SIGCONT); - wait(NULL); -} - -static bool isExecutableAddr(uint32_t addr) -{ - FILE *fp; - char line[1024]; - uint32_t start; - uint32_t end; - - fp = fopen("/proc/self/maps", "r"); - if (fp == NULL) { - return false; - } - - while (fgets(line, sizeof(line), fp)) { - if (strstr(line, "r-xp") || strstr(line, "rwxp")) { - start = strtoul(strtok(line, "-"), NULL, 16); - end = strtoul(strtok(NULL, " "), NULL, 16); - if (addr >= start && addr <= end) { - fclose(fp); - return true; - } - } - } - - fclose(fp); - - return false; -} - -static struct inlineHookItem *findInlineHookItem(uint32_t target_addr) -{ - int i; - - for (i = 0; i < info.size; ++i) { - if (info.item[i].target_addr == target_addr) { - return &info.item[i]; - } - } - - return NULL; -} - -static struct inlineHookItem *addInlineHookItem() { - struct inlineHookItem *item; - - if (info.size >= 1024) { - return NULL; - } - - item = &info.item[info.size]; - ++info.size; - - return item; -} - -static void deleteInlineHookItem(int pos) -{ - info.item[pos] = info.item[info.size - 1]; - --info.size; -} - -enum ele7en_status registerInlineHook(uint32_t target_addr, uint32_t new_addr, uint32_t **proto_addr) -{ - struct inlineHookItem *item; - - if (!isExecutableAddr(target_addr) || !isExecutableAddr(new_addr)) { - return ELE7EN_ERROR_NOT_EXECUTABLE; - } - - item = findInlineHookItem(target_addr); - if (item != NULL) { - if (item->status == REGISTERED) { - return ELE7EN_ERROR_ALREADY_REGISTERED; - } - else if (item->status == HOOKED) { - return ELE7EN_ERROR_ALREADY_HOOKED; - } - else { - return ELE7EN_ERROR_UNKNOWN; - } - } - - item = addInlineHookItem(); - - item->target_addr = target_addr; - item->new_addr = new_addr; - item->proto_addr = proto_addr; - - item->length = TEST_BIT0(item->target_addr) ? 12 : 8; - item->orig_instructions = malloc(item->length); - memcpy(item->orig_instructions, (void *) CLEAR_BIT0(item->target_addr), item->length); - - item->trampoline_instructions = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0); - relocateInstruction(item->target_addr, item->orig_instructions, item->length, item->trampoline_instructions, item->orig_boundaries, item->trampoline_boundaries, &item->count); - - item->status = REGISTERED; - - return ELE7EN_OK; -} - -static void doInlineUnHook(struct inlineHookItem *item, int pos) -{ - mprotect((void *) PAGE_START(CLEAR_BIT0(item->target_addr)), PAGE_SIZE * 2, PROT_READ | PROT_WRITE | PROT_EXEC); - memcpy((void *) CLEAR_BIT0(item->target_addr), item->orig_instructions, item->length); - mprotect((void *) PAGE_START(CLEAR_BIT0(item->target_addr)), PAGE_SIZE * 2, PROT_READ | PROT_EXEC); - munmap(item->trampoline_instructions, PAGE_SIZE); - free(item->orig_instructions); - - deleteInlineHookItem(pos); - - cacheflush(CLEAR_BIT0(item->target_addr), CLEAR_BIT0(item->target_addr) + item->length, 0); -} - -enum ele7en_status inlineUnHook(uint32_t target_addr) -{ - int i; - - for (i = 0; i < info.size; ++i) { - if (info.item[i].target_addr == target_addr && info.item[i].status == HOOKED) { - pid_t pid; - - pid = freeze(&info.item[i], ACTION_DISABLE); - - doInlineUnHook(&info.item[i], i); - - unFreeze(pid); - - return ELE7EN_OK; - } - } - - return ELE7EN_ERROR_NOT_HOOKED; -} - -void inlineUnHookAll() -{ - pid_t pid; - int i; - - pid = freeze(NULL, ACTION_DISABLE); - - for (i = 0; i < info.size; ++i) { - if (info.item[i].status == HOOKED) { - doInlineUnHook(&info.item[i], i); - --i; - } - } - - unFreeze(pid); -} - -static void doInlineHook(struct inlineHookItem *item) -{ - mprotect((void *) PAGE_START(CLEAR_BIT0(item->target_addr)), PAGE_SIZE * 2, PROT_READ | PROT_WRITE | PROT_EXEC); - - if (item->proto_addr != NULL) { - *(item->proto_addr) = (uint32_t*)(TEST_BIT0(item->target_addr) ? (uint32_t *) SET_BIT0((uint32_t) item->trampoline_instructions) : item->trampoline_instructions); - } - - if (TEST_BIT0(item->target_addr)) { - int i; - - i = 0; - if (CLEAR_BIT0(item->target_addr) % 4 != 0) { - ((uint16_t *) CLEAR_BIT0(item->target_addr))[i++] = 0xBF00; // NOP - } - ((uint16_t *) CLEAR_BIT0(item->target_addr))[i++] = 0xF8DF; - ((uint16_t *) CLEAR_BIT0(item->target_addr))[i++] = 0xF000; // LDR.W PC, [PC] - ((uint16_t *) CLEAR_BIT0(item->target_addr))[i++] = item->new_addr & 0xFFFF; - ((uint16_t *) CLEAR_BIT0(item->target_addr))[i++] = item->new_addr >> 16; - } - else { - ((uint32_t *) (item->target_addr))[0] = 0xe51ff004; // LDR PC, [PC, #-4] - ((uint32_t *) (item->target_addr))[1] = item->new_addr; - } - - mprotect((void *) PAGE_START(CLEAR_BIT0(item->target_addr)), PAGE_SIZE * 2, PROT_READ | PROT_EXEC); - - item->status = HOOKED; - - cacheflush(CLEAR_BIT0(item->target_addr), CLEAR_BIT0(item->target_addr) + item->length, 0); -} - -enum ele7en_status inlineHook(uint32_t target_addr) -{ - int i; - struct inlineHookItem *item; - - item = NULL; - for (i = 0; i < info.size; ++i) { - if (info.item[i].target_addr == target_addr) { - item = &info.item[i]; - break; - } - } - - if (item == NULL) { - return ELE7EN_ERROR_NOT_REGISTERED; - } - - if (item->status == REGISTERED) { - pid_t pid; - - pid = freeze(item, ACTION_ENABLE); - - doInlineHook(item); - - unFreeze(pid); - - return ELE7EN_OK; - } - else if (item->status == HOOKED) { - return ELE7EN_ERROR_ALREADY_HOOKED; - } - else { - return ELE7EN_ERROR_UNKNOWN; - } -} - -void inlineHookAll() -{ - pid_t pid; - int i; - - pid = freeze(NULL, ACTION_ENABLE); - - for (i = 0; i < info.size; ++i) { - if (info.item[i].status == REGISTERED) { - doInlineHook(&info.item[i]); - } - } - - unFreeze(pid); -} diff --git a/x32/jni/libs/hook/inlineHook.h b/x32/jni/libs/hook/inlineHook.h deleted file mode 100644 index 1ba1e58..0000000 --- a/x32/jni/libs/hook/inlineHook.h +++ /dev/null @@ -1,34 +0,0 @@ -#pragma once - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -enum ele7en_status { - ELE7EN_ERROR_UNKNOWN = -1, - ELE7EN_OK = 0, - ELE7EN_ERROR_NOT_INITIALIZED, - ELE7EN_ERROR_NOT_EXECUTABLE, - ELE7EN_ERROR_NOT_REGISTERED, - ELE7EN_ERROR_NOT_HOOKED, - ELE7EN_ERROR_ALREADY_REGISTERED, - ELE7EN_ERROR_ALREADY_HOOKED, - ELE7EN_ERROR_SO_NOT_FOUND, - ELE7EN_ERROR_FUNCTION_NOT_FOUND -}; - -// stolen from nickname's ml -#define hook(z, m, x, y) registerInlineHook((uint32_t)dlsym(dlopen("libcocos2dcpp.so", RTLD_LAZY), z), (uint32_t)m::x, (uint32_t**)&m::y); - -enum ele7en_status registerInlineHook(uint32_t target_addr, uint32_t new_addr, uint32_t **proto_addr); -enum ele7en_status inlineUnHook(uint32_t target_addr); -void inlineUnHookAll(); -enum ele7en_status inlineHook(uint32_t target_addr); -void inlineHookAll(); - -#ifdef __cplusplus -} -#endif - \ No newline at end of file diff --git a/x32/jni/libs/hook/relocate.c b/x32/jni/libs/hook/relocate.c deleted file mode 100644 index fa5d63e..0000000 --- a/x32/jni/libs/hook/relocate.c +++ /dev/null @@ -1,607 +0,0 @@ -#include "relocate.h" -#include - -#define ALIGN_PC(pc) (pc & 0xFFFFFFFC) - -enum INSTRUCTION_TYPE { - // B