Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,006 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

98 Commits

Author SHA1 Message Date
minggo a4a53df159 issue #1555:build ok on android 2012-11-16 14:23:14 +08:00
Nicolas Gramlich 4c7705171a Android JAVA refactoring. Android JNI Cleanup. 2012-09-07 17:23:04 -07:00
folecr d4948939b6 Remove spidermonkey bindings from the CocosDenshion and cocos2dx module makefiles 
* ... they should only be included by cocos+JavaScript applications
 2012-08-28 17:43:57 -07:00
folecr 0c9b7718a0 Cocos2D-X depends on spidermonkey scripting core now. 
* Define COCOS2D_JAVASCRIPT
 * Include the scripting core library
 2012-08-27 08:43:38 -07:00
James Chen bcbd161398 issue #1429: First commit CCEditBox for android port. 2012-08-22 09:47:04 +08:00
Walzer 08198c082e issue #1424, http wrapper has been tested on iOS, mac, android port. 2012-08-09 10:45:11 +08:00
Walzer ba224cc283 add CCTouch.cpp into proj.win32, android.mk, xcode4 template. 2012-07-31 23:32:19 +08:00
James Chen 5e5b008742 issue #1399: Built four android projects(HelloCpp, HelloLua, TestJavascript, TestCpp) successfully on Ubuntu System. 2012-07-21 13:49:20 +08:00
James Chen 557f654cf3 Built successfully on android. 2012-07-20 17:06:00 +08:00
James Chen c4056b1bb0 fixed #1269: Updated include search paths for win32 and android. 2012-06-19 17:22:55 +08:00
minggo 90448ec7d0 issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
Nicolas Gramlich 227683bfa4 Cleaned up CCNodeLoaders by using the Marco instead of having a boilerplate createCCNode method in all the cpp files. 2012-06-18 13:33:19 -07:00
minggo 6d0608d0f1 fixed #1333: add CCScrollView for iOS 2012-06-18 19:24:47 +08:00
minggo 221be759c6 issue #1324: merge James Chen's codes 2012-06-14 18:54:05 +08:00
Nicolas Gramlich 0c4a6be8ff Added missiong cpp files in Android.mk. Android build now successful. 2012-06-13 16:05:31 -07:00
Nicolas Gramlich 5550d9f2b0 Merge with gles20. 2012-06-13 15:56:52 -07:00
Nicolas Gramlich 3e61e1f014 Updated Android build files to new CCBReader. Fixed a bunch of compiler errors/warnings when building for Android. 2012-06-13 15:25:59 -07:00
minggo 9321a8d025 fixed #1322: vertical alignment works ok on android 2012-06-13 18:33:44 +08:00
James Chen 19c96632b5 fixed #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces. 2012-05-29 16:21:23 +08:00
James Chen c1cb8b0e24 fixed #1177: Updated Android.mk. 2012-05-29 15:56:08 +08:00
James Chen e5443d22c1 issue #1240: Added libtiff for android. 2012-05-24 12:00:06 +08:00
Walzer a3bd26a52b modify CCBReader.cpp to CCBReader_v2.cpp in cocos2dx/Android.mk 2012-05-11 22:40:31 +08:00
Walzer f10b94fd15 issue #1205, CCBReader works on both iOS & Android now; public APIs of CCBReader are reduced; ccb files in subfolder is supported. 2012-05-07 22:52:58 +08:00
Walzer f70855e959 fixed #1229, reduce the requirement of gles20 branch from NDK android-10 to android-8 level (official android 2.2 image, the lowest version which supports OpenGL ES 2.0), remove EGL dependency. 2012-05-05 10:06:41 +08:00
minggo c048fe77c6 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1201_android_build 2012-05-02 14:41:49 +08:00
James Chen a998062c57 issue #1194: Updated project configuration for android. Null pointer checking in CCNode::removeFromParentAndCleanup. 2012-05-02 12:04:27 +08:00
minggo 741f219f16 issue 1201: remove module to prebuilt 2012-05-02 10:45:21 +08:00
James Chen 0f36a89c7e issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug). 2012-04-25 16:18:04 +08:00
James Chen d1d0fd619a issue #1177: Added CCEGLViewProtocol class as CCEGLView's super class. Updated win32, android project configuration. 2012-04-20 15:23:00 +08:00
James Chen 14c10a470a Updated project configuration for android platform. 2012-04-17 16:41:07 +08:00
James Chen be129913a8 issue #1166: Updated the project configuration for VS2010, android, ios port. 2012-04-16 13:02:44 +08:00
James Chen 3475108953 issue #1056: Updated Android.mk, fixed a bug in CCImage.h. 2012-03-27 13:48:14 +08:00
minggo 382e4e7eb8 issue #1056: modify code according new code after pull 2012-03-20 17:27:06 +08:00
minggo 74aaf4c6ca issue #1056:gles20 runs ok on android 2012-03-20 16:10:12 +08:00
James Chen f8ff388e8d rename Resource(in HelloLua and HelloWorld project) and Res(in tests project) to Resources. 
test ok on win32 and android
 2012-02-14 18:04:56 +08:00
James Chen c3d23a7923 issue #972: Modify project setting for all platforms. Use new icons for ios template. 2012-02-14 15:13:54 +08:00
minggo 153d2b8192 issue #971: build cocos2dx as static lib and remove some unneeded codes 2012-02-09 15:49:14 +08:00
minggo 9249328afb fixed #970: use modules in the Android NDK build 2012-02-07 14:34:30 +08:00
folecr 3eeb0c8687 fix library name - the makefiles expect the full name of the library including the lib prefix 2012-02-02 23:01:50 -08:00
folecr 516c56a793 Add EXPORT_C_INCLUDES and correct the paths to third party modules 2012-02-02 20:04:29 -08:00
folecr b0b5790e06 Simplify inclusion of cocos2d in Android NDK projects: Cocos2DX is the only module that importing projects need to add. Requires Android NDK r7. 
* Uses NDK modules as the basis of the build system for Android NDK
 * Add a cocos2dx module to generate a shared library named cocos2dx_shared. Library name is still libcocos2d.so
 * The dependencies of this module are also Android NDK modules
 * ... which are prebuilt static libraries from the png, jpeg and xml2 modules.
 * Dependency library names set to libjpeg, libpng, etc. even though we are building variants with names like jpeg_shared.
 2012-01-29 09:52:38 -08:00
folecr a9d7500ae7 Fix whitespace line ending in one single line. 2012-01-25 18:14:29 -08:00
minggo 6aedc258b4 fixed #838: tests and HelloLua support x86 2011-11-23 15:51:30 +08:00
minggo 8b20639d75 issue #838: HelloWorld support x86 2011-11-23 11:02:18 +08:00
minggo b105b6005e [android] fixed #623: refactor Cocos2dJni.cpp 2011-07-25 14:12:30 +08:00
minggo 62ea6a2d46 issue #623: create JniHelper and use it somewhere 2011-07-22 18:14:29 +08:00
Walzer bc44855091 issue #536, integrate the CCTexturePVR to project, update from 0.99.5 to 1.0.0, compile successfully on ios & android. Haven't test on other platforms yet. 2011-07-19 15:14:59 +08:00
minggo dd42936bb3 [android] fixed #610: remove the support of ndk-r4 2011-07-14 10:37:40 +08:00
natural-law 7d7f3a9241 fixed #562, Upgrade folder sprite_nodes to rc3. 2011-07-01 16:11:31 +08:00
Walzer 00568c229a [android] back to shared library link 2011-06-25 11:21:16 +08:00