zhangbin
|
4caac936ae
|
Set the default APP_ABI with armeabi-v7a for binary template..
|
2017-02-08 14:22:34 +08:00 |
|
yanli.huang
|
9f916841fe
|
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
templates/js-template-binary/frameworks/runtime-src/Classes/AppDelegate.cpp
templates/js-template-binary/frameworks/runtime-src/proj.android/jni/Android.mk
templates/js-template-binary/frameworks/runtime-src/proj.android/jni/hellojavascript/main.cpp
templates/js-template-binary/frameworks/runtime-src/proj.android/src/org/cocos2dx/javascript/AppActivity.java
templates/js-template-binary/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
|
2016-07-21 16:11:50 +08:00 |
|
yanli.huang
|
0aaab3fa5e
|
add anysdk to templates
|
2016-07-13 16:37:07 +08:00 |
|
2youyouo2
|
259fc314a1
|
remove runtime files from binary template
|
2016-07-13 15:11:09 +08:00 |
|
zhangbin
|
a4a2e86973
|
Solve the issue : can't build android portrait project from binary template in Creator.
|
2016-05-23 11:56:32 +08:00 |
|
2youyouo2
|
1cb724543e
|
update android.mk
|
2016-05-18 00:10:07 +08:00 |
|
2youyouo2
|
e64e5e0178
|
add binary template
|
2016-04-13 17:14:11 +08:00 |
|