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

Merge pull request #4960 from samuele3hu/developNewUI 

Fix:Resolve the android template projects’s errors
This commit is contained in:
James Chen 2014-01-07 00:56:58 -08:00
parent da17c6b05b b19bda1588
commit ed1665801d
7 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@
android:icon="@drawable/icon"> android:icon="@drawable/icon">
<activity android:name=".Cocos2dxActivity" <activity android:name="org.cocos2dx.cpp.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"

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

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

2
template/multi-platform-js/Classes/AppDelegate.cpp
View File

@ -5,7 +5,6 @@
#include "ScriptingCore.h" #include "ScriptingCore.h"
#include "jsb_cocos2dx_auto.hpp" #include "jsb_cocos2dx_auto.hpp"
#include "jsb_cocos2dx_extension_auto.hpp" #include "jsb_cocos2dx_extension_auto.hpp"
#include "jsb_cocos2dx_spine_auto.hpp"
#include "cocos2d_specifics.hpp" #include "cocos2d_specifics.hpp"
#include "extension/jsb_cocos2dx_extension_manual.h" #include "extension/jsb_cocos2dx_extension_manual.h"
#include "chipmunk/js_bindings_chipmunk_registration.h" #include "chipmunk/js_bindings_chipmunk_registration.h"
@ -41,7 +40,6 @@ bool AppDelegate::applicationDidFinishLaunching()
sc->addRegisterCallback(register_all_cocos2dx_extension); sc->addRegisterCallback(register_all_cocos2dx_extension);
sc->addRegisterCallback(register_cocos2dx_js_extensions); sc->addRegisterCallback(register_cocos2dx_js_extensions);
sc->addRegisterCallback(register_all_cocos2dx_extension_manual); sc->addRegisterCallback(register_all_cocos2dx_extension_manual);
sc->addRegisterCallback(register_all_cocos2dx_spine);
sc->addRegisterCallback(jsb_register_chipmunk); sc->addRegisterCallback(jsb_register_chipmunk);
sc->addRegisterCallback(JSB_register_opengl); sc->addRegisterCallback(JSB_register_opengl);
sc->addRegisterCallback(jsb_register_system); sc->addRegisterCallback(jsb_register_system);

2
template/multi-platform-js/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.javascript.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"

2
template/multi-platform-js/proj.android/project.properties
View File

@ -10,4 +10,4 @@
# Project target. # Project target.
target=android-13 target=android-13
android.library.reference.1=../../../cocos/2d/platform/android/java android.library.reference.1=../cocos2d/cocos/2d/platform/android/java

2
template/multi-platform-js/proj.android/src/org/cocos2dx/hellojavascript/Cocos2dxActivity.java → template/multi-platform-js/proj.android/src/org/cocos2dx/javascript/Cocos2dxActivity.java
View File

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

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

@ -1 +1 @@
83d4ef65b31281ef8759505d8f90b3172b99992b 0a2d046187d7848172fadf6ee4a7e80897e6a75c