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

33 Commits

Author SHA1 Message Date
pipu 86aee1e548 Modifying cocos2d_lib.xcodeproj, cocos/Android.mk, cocos/editor-support/cocostudio/Android.mk 2014-10-12 15:39:22 +08:00
pipu d699b5809b Modifying libprotocolbuf.a as protocolbuffer.a 2014-10-10 12:52:42 +08:00
pipu 752eb839c7 Add protocolbuf.a 2014-10-09 18:28:09 +08:00
Dhilan007 bef774a14a Adjust android.mk for cocos2d and related module 2014-08-27 22:54:28 +08:00
samuele3hu 3d5f8de346 Adjust android.mk for cocos2d and related module 2014-08-27 20:58:32 +08:00
samuele3hu 3759648d3a Remove the useless aneroid.mk files 2014-08-27 10:21:47 +08:00
pandamicro 34b93a24ff Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR 
Conflicts:
	cocos/platform/desktop/CCGLViewImpl.h
 2014-08-21 16:07:19 +08:00
pandamicro 9544482058 Fix Android.mk s 2014-08-21 15:40:42 +08:00
minggo cdd67be77a use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES 2014-08-19 15:29:40 +08:00
zhangbin 14f3d6f230 Adjust the dependencies of extensions & cocostudio on android. 2014-07-16 13:47:57 +08:00
zhangbin e4319bf534 Adjust the dependencies of cocosbuilder & cocostudio on android. 2014-07-14 09:48:16 +08:00
zhangbin b0c465d96b Adjust the dependencies between modules on android. 2014-07-14 09:48:16 +08:00
minggo 6cc600ccce fix compiling warnings 2014-07-03 11:43:56 +08:00
pandamicro bee41712ad Fix Travis CI compilation issue 2014-06-30 11:58:15 +08:00
andyque 5624da5448 Merge branch 'v3' into cleanupBinaryLoader 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCSGUIReader.h
	cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
 2014-06-23 09:37:39 +08:00
andyque 20b41d2886 fix android compile error 2014-06-18 18:25:31 +08:00
2youyou2 5bce6b87ea change ActionTimeline to cocostudio ActionTimeline folder 2014-06-13 18:51:32 +08:00
2youyou2 2031e0e92d change TimelineAction to ActionTimeline 2014-06-13 16:03:03 +08:00
2youyou2 b181eaf802 modify mk file 2014-06-13 14:43:53 +08:00
2youyou2 b2c5334de1 change NodeCache to NodeReader 2014-06-12 19:24:27 +08:00
2youyou2 db992b6d0f modify cocostudio Android.mk 2014-06-12 16:26:18 +08:00
andyque d089b251db fix other platform compile error 2014-06-04 14:56:34 +08:00
Ricardo Quesada 32f3fedb37 Moves cocos/2d/Android.mk to cocos/Android.mk 
Easier to find Android.mk
 2014-05-01 14:09:26 -07:00
andyque 48772fb952 modify android makefile 2014-03-11 18:48:28 +08:00
CaiWenzhi 4f9dfdbef8 Fixed build error except Windows 2014-03-05 21:18:51 +08:00
andyque 143f5975a6 fix cross-platform comiple error 
details:
remove CCActionEaseEx dependency
fix compile errors on android platform
fix a few inproper decalare
fix linux compile error
fix win32 compile error
 2014-02-18 14:22:15 +08:00
chengstory ab3cf064d1 fixed #4357 failed to build android. 2013-12-26 13:26:23 +08:00
chengstory 8ae7ecff33 Merge branch 'develop' into #3457 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/CCSGUIReader.h
 2013-12-26 12:55:52 +08:00
minggo d07d054a01 issue #2905:ndk-r8e build ok now 2013-10-23 17:44:20 +08:00
minggo 63c13d8eaa issue #2905:simplify Android.mk dependence 2013-10-18 14:18:36 +08:00
minggo e50f9fc43b issue #2905: jsbinding samples and lua binding samples build ok on android 2013-10-17 15:04:30 +08:00
minggo 8f7a489a4d issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
minggo 6fc2be62f5 issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00