mirror of https://github.com/axmolengine/axmol.git
Update TestJavaScript
This commit is contained in:
parent
5531272979
commit
7510a55c6a
|
@ -16,7 +16,12 @@
|
||||||
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"
|
||||||
android:configChanges="orientation">
|
android:configChanges="orientation|screenSize|smallestScreenSize">
|
||||||
|
|
||||||
|
<!-- Tell NativeActivity the name of our .so -->
|
||||||
|
<meta-data android:name="android.app.lib_name"
|
||||||
|
android:value="testjavascript" />
|
||||||
|
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
<category android:name="android.intent.category.LAUNCHER" />
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
|
|
|
@ -17,6 +17,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static
|
||||||
LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
|
LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
|
||||||
LOCAL_WHOLE_STATIC_LIBRARIES += spidermonkey_static
|
LOCAL_WHOLE_STATIC_LIBRARIES += spidermonkey_static
|
||||||
LOCAL_WHOLE_STATIC_LIBRARIES += scriptingcore-spidermonkey
|
LOCAL_WHOLE_STATIC_LIBRARIES += scriptingcore-spidermonkey
|
||||||
|
LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
|
||||||
|
|
||||||
LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT
|
LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT
|
||||||
|
|
||||||
|
@ -28,3 +29,4 @@ $(call import-module,external/chipmunk)
|
||||||
$(call import-module,extensions)
|
$(call import-module,extensions)
|
||||||
$(call import-module,scripting/javascript/spidermonkey-android)
|
$(call import-module,scripting/javascript/spidermonkey-android)
|
||||||
$(call import-module,scripting/javascript/bindings)
|
$(call import-module,scripting/javascript/bindings)
|
||||||
|
$(call import-module,cocos2dx/platform/android)
|
||||||
|
|
|
@ -10,35 +10,7 @@
|
||||||
|
|
||||||
using namespace cocos2d;
|
using namespace cocos2d;
|
||||||
|
|
||||||
extern "C"
|
void cocos_android_app_init (void) {
|
||||||
{
|
LOGD("cocos_android_app_init");
|
||||||
|
|
||||||
jint JNI_OnLoad(JavaVM *vm, void *reserved)
|
|
||||||
{
|
|
||||||
JniHelper::setJavaVM(vm);
|
|
||||||
|
|
||||||
return JNI_VERSION_1_4;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thiz, jint w, jint h)
|
|
||||||
{
|
|
||||||
if (!Director::getInstance()->getOpenGLView())
|
|
||||||
{
|
|
||||||
EGLView *view = EGLView::getInstance();
|
|
||||||
view->setFrameSize(w, h);
|
|
||||||
|
|
||||||
AppDelegate *pAppDelegate = new AppDelegate();
|
AppDelegate *pAppDelegate = new AppDelegate();
|
||||||
Application::getInstance()->run();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
GL::invalidateStateCache();
|
|
||||||
ShaderCache::getInstance()->reloadDefaultShaders();
|
|
||||||
DrawPrimitives::init();
|
|
||||||
TextureCache::reloadAllTextures();
|
|
||||||
NotificationCenter::getInstance()->postNotification(EVNET_COME_TO_FOREGROUND, NULL);
|
|
||||||
Director::getInstance()->setGLDefaultValues();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,6 @@
|
||||||
# project structure.
|
# project structure.
|
||||||
|
|
||||||
# Project target.
|
# Project target.
|
||||||
target=android-10
|
target=android-13
|
||||||
|
|
||||||
android.library.reference.1=../../../../cocos2dx/platform/android/java
|
android.library.reference.1=../../../../cocos2dx/platform/android/java
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
No Java files
|
|
@ -1,39 +0,0 @@
|
||||||
/****************************************************************************
|
|
||||||
Copyright (c) 2010-2012 cocos2d-x.org
|
|
||||||
|
|
||||||
http://www.cocos2d-x.org
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in
|
|
||||||
all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
THE SOFTWARE.
|
|
||||||
****************************************************************************/
|
|
||||||
package org.cocos2dx.testjavascript;
|
|
||||||
|
|
||||||
import org.cocos2dx.lib.Cocos2dxActivity;
|
|
||||||
|
|
||||||
import android.os.Bundle;
|
|
||||||
|
|
||||||
public class TestJavascript extends Cocos2dxActivity{
|
|
||||||
|
|
||||||
protected void onCreate(Bundle savedInstanceState){
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
}
|
|
||||||
|
|
||||||
static {
|
|
||||||
System.loadLibrary("testjavascript");
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue