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

Merge pull request #4929 from samuele3hu/developNewUI 

Fix:Resolve the lua android template errors
This commit is contained in:
minggo 2014-01-06 04:16:31 -08:00
parent 1ad6064c30 2949ab754f
commit 0a7e9a6d10
5 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
template/multi-platform-lua/proj.android/AndroidManifest.xml
View File

@ -10,7 +10,7 @@
<application android:label="@string/app_name" <application android:label="@string/app_name"
android:icon="@drawable/icon"> android:icon="@drawable/icon">
<activity android:name=".Cocos2dxActivity" <activity android:name="org.cocos2dx.lua.Cocos2dxActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:screenOrientation="landscape" android:screenOrientation="landscape"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"

6
template/multi-platform-lua/proj.android/jni/Android.mk
View File

@ -1,4 +1,3 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@ -11,9 +10,8 @@ LOCAL_SRC_FILES := hellolua/main.cpp \
../../Classes/AppDelegate.cpp ../../Classes/AppDelegate.cpp
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes \
$(LOCAL_PATH)/../../cocos2d/external/lua/tolua
LOCAL_STATIC_LIBRARIES := curl_static_prebuilt
LOCAL_WHOLE_STATIC_LIBRARIES := cocos_lua_static LOCAL_WHOLE_STATIC_LIBRARIES := cocos_lua_static

2
template/multi-platform-lua/proj.android/src/org/cocos2dx/hellolua/Cocos2dxActivity.java → template/multi-platform-lua/proj.android/src/org/cocos2dx/lua/Cocos2dxActivity.java
View File

@ -1,4 +1,4 @@
package org.cocos2dx.hellolua; package org.cocos2dx.lua;
import android.app.NativeActivity; import android.app.NativeActivity;
import android.os.Bundle; import android.os.Bundle;

1
tools/project-creator/config-create/config.gitingore
View File

@ -5,7 +5,6 @@
# Ignore thumbnails created by windows # Ignore thumbnails created by windows
Thumbs.db Thumbs.db
.git .git
.gitignore
# ignore copy files # ignore copy files
/lib /lib

2
tools/project-creator/module/cocos_files.json.REMOVED.git-id
View File

@ -1 +1 @@
96eb4f261ce2c1be3899e53508952d57bbd19d5d 83d4ef65b31281ef8759505d8f90b3172b99992b