Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into luaruntime

This commit is contained in:
chuanweizhang2013 2014-04-09 17:55:58 +08:00
parent e97552c2d3 d34fddb06e
commit b077ed40e8
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Android.mk
View File

@ -6,8 +6,8 @@ LOCAL_MODULE := cocos2dlua_shared
LOCAL_MODULE_FILENAME := libcocos2dlua LOCAL_MODULE_FILENAME := libcocos2dlua
LOCAL_SRC_FILES := hellolua/main.cpp \ LOCAL_SRC_FILES := lua/main.cpp \
hellolua/Runtime_android.cpp \ lua/Runtime_android.cpp \
../../Classes/AppDelegate.cpp \ ../../Classes/AppDelegate.cpp \
../../Classes/Runtime.cpp ../../Classes/Runtime.cpp

0
templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/hellolua/Runtime_android.cpp → templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/lua/Runtime_android.cpp
View File

0
templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/hellolua/main.cpp → templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/lua/main.cpp
View File