From 55312729794341b028f9a598facd61e1eb92ee4c Mon Sep 17 00:00:00 2001 From: folecr Date: Tue, 30 Jul 2013 12:23:45 -0700 Subject: [PATCH] Update a bunch of JS projects for android --- .../proj.android/AndroidManifest.xml | 9 ++++- .../CocosDragonJS/proj.android/jni/Android.mk | 2 + .../proj.android/jni/cocosdragonjs/main.cpp | 34 ++-------------- .../proj.android/project.properties | 2 +- .../CocosDragonJS/proj.android/src/nojava.txt | 1 + .../cocos2dx/cocosdragonjs/CocosDragonJS.java | 39 ------------------- .../proj.android/AndroidManifest.xml | 9 ++++- .../CrystalCraze/proj.android/jni/Android.mk | 2 + .../proj.android/jni/crystalcraze/main.cpp | 34 ++-------------- .../proj.android/project.properties | 2 +- .../CrystalCraze/proj.android/src/nojava.txt | 1 + .../cocos2dx/crystalcraze/CrystalCraze.java | 39 ------------------- .../proj.android/AndroidManifest.xml | 9 ++++- .../MoonWarriors/proj.android/jni/Android.mk | 2 + .../proj.android/jni/moonwarriors/main.cpp | 34 ++-------------- .../proj.android/project.properties | 2 +- .../MoonWarriors/proj.android/src/nojava.txt | 1 + .../cocos2dx/moonwarriors/MoonWarriors.java | 39 ------------------- .../proj.android/AndroidManifest.xml | 9 ++++- .../proj.android/jni/Android.mk | 2 + .../jni/watermelonwithme/main.cpp | 34 ++-------------- .../proj.android/project.properties | 2 +- .../proj.android/src/nojava.txt | 1 + .../watermelonwithme/WatermelonWithMe.java | 39 ------------------- 24 files changed, 56 insertions(+), 292 deletions(-) create mode 100644 samples/Javascript/CocosDragonJS/proj.android/src/nojava.txt delete mode 100644 samples/Javascript/CocosDragonJS/proj.android/src/org/cocos2dx/cocosdragonjs/CocosDragonJS.java create mode 100644 samples/Javascript/CrystalCraze/proj.android/src/nojava.txt delete mode 100644 samples/Javascript/CrystalCraze/proj.android/src/org/cocos2dx/crystalcraze/CrystalCraze.java create mode 100644 samples/Javascript/MoonWarriors/proj.android/src/nojava.txt delete mode 100644 samples/Javascript/MoonWarriors/proj.android/src/org/cocos2dx/moonwarriors/MoonWarriors.java create mode 100644 samples/Javascript/WatermelonWithMe/proj.android/src/nojava.txt delete mode 100644 samples/Javascript/WatermelonWithMe/proj.android/src/org/cocos2dx/watermelonwithme/WatermelonWithMe.java diff --git a/samples/Javascript/CocosDragonJS/proj.android/AndroidManifest.xml b/samples/Javascript/CocosDragonJS/proj.android/AndroidManifest.xml index dc1cdd7869..34607944fc 100644 --- a/samples/Javascript/CocosDragonJS/proj.android/AndroidManifest.xml +++ b/samples/Javascript/CocosDragonJS/proj.android/AndroidManifest.xml @@ -10,11 +10,16 @@ - + android:configChanges="orientation|screenSize|smallestScreenSize"> + + + + diff --git a/samples/Javascript/CocosDragonJS/proj.android/jni/Android.mk b/samples/Javascript/CocosDragonJS/proj.android/jni/Android.mk index 1575e28b83..d2615a756b 100644 --- a/samples/Javascript/CocosDragonJS/proj.android/jni/Android.mk +++ b/samples/Javascript/CocosDragonJS/proj.android/jni/Android.mk @@ -16,6 +16,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static LOCAL_WHOLE_STATIC_LIBRARIES += spidermonkey_static LOCAL_WHOLE_STATIC_LIBRARIES += scriptingcore-spidermonkey +LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT @@ -26,3 +27,4 @@ $(call import-module,CocosDenshion/android) $(call import-module,external/chipmunk) $(call import-module,scripting/javascript/spidermonkey-android) $(call import-module,scripting/javascript/bindings) +$(call import-module,cocos2dx/platform/android) diff --git a/samples/Javascript/CocosDragonJS/proj.android/jni/cocosdragonjs/main.cpp b/samples/Javascript/CocosDragonJS/proj.android/jni/cocosdragonjs/main.cpp index 5f73b61c4e..3d2a59ddfc 100644 --- a/samples/Javascript/CocosDragonJS/proj.android/jni/cocosdragonjs/main.cpp +++ b/samples/Javascript/CocosDragonJS/proj.android/jni/cocosdragonjs/main.cpp @@ -10,35 +10,7 @@ using namespace cocos2d; -extern "C" -{ - -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(); - Application::getInstance()->run(); - } - else - { - GL::invalidateStateCache(); - ShaderCache::getInstance()->reloadDefaultShaders(); - DrawPrimitives::init(); - TextureCache::reloadAllTextures(); - NotificationCenter::getInstance()->postNotification(EVNET_COME_TO_FOREGROUND, NULL); - Director::getInstance()->setGLDefaultValues(); - } -} - +void cocos_android_app_init (void) { + LOGD("cocos_android_app_init"); + AppDelegate *pAppDelegate = new AppDelegate(); } diff --git a/samples/Javascript/CocosDragonJS/proj.android/project.properties b/samples/Javascript/CocosDragonJS/proj.android/project.properties index 522ea9f05d..db4ff43492 100644 --- a/samples/Javascript/CocosDragonJS/proj.android/project.properties +++ b/samples/Javascript/CocosDragonJS/proj.android/project.properties @@ -8,6 +8,6 @@ # project structure. # Project target. -target=android-10 +target=android-13 android.library.reference.1=../../../../cocos2dx/platform/android/java diff --git a/samples/Javascript/CocosDragonJS/proj.android/src/nojava.txt b/samples/Javascript/CocosDragonJS/proj.android/src/nojava.txt new file mode 100644 index 0000000000..b8ad10a43d --- /dev/null +++ b/samples/Javascript/CocosDragonJS/proj.android/src/nojava.txt @@ -0,0 +1 @@ +No Java files diff --git a/samples/Javascript/CocosDragonJS/proj.android/src/org/cocos2dx/cocosdragonjs/CocosDragonJS.java b/samples/Javascript/CocosDragonJS/proj.android/src/org/cocos2dx/cocosdragonjs/CocosDragonJS.java deleted file mode 100644 index 05b7271009..0000000000 --- a/samples/Javascript/CocosDragonJS/proj.android/src/org/cocos2dx/cocosdragonjs/CocosDragonJS.java +++ /dev/null @@ -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.cocosdragonjs; - -import org.cocos2dx.lib.Cocos2dxActivity; - -import android.os.Bundle; - -public class CocosDragonJS extends Cocos2dxActivity{ - - protected void onCreate(Bundle savedInstanceState){ - super.onCreate(savedInstanceState); - } - - static { - System.loadLibrary("cocosdragonjs"); - } -} diff --git a/samples/Javascript/CrystalCraze/proj.android/AndroidManifest.xml b/samples/Javascript/CrystalCraze/proj.android/AndroidManifest.xml index 97429419fa..6fa336830f 100644 --- a/samples/Javascript/CrystalCraze/proj.android/AndroidManifest.xml +++ b/samples/Javascript/CrystalCraze/proj.android/AndroidManifest.xml @@ -10,11 +10,16 @@ - + android:configChanges="orientation|screenSize|smallestScreenSize"> + + + + diff --git a/samples/Javascript/CrystalCraze/proj.android/jni/Android.mk b/samples/Javascript/CrystalCraze/proj.android/jni/Android.mk index 2b64628b7a..de9f96689d 100644 --- a/samples/Javascript/CrystalCraze/proj.android/jni/Android.mk +++ b/samples/Javascript/CrystalCraze/proj.android/jni/Android.mk @@ -16,6 +16,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static LOCAL_WHOLE_STATIC_LIBRARIES += spidermonkey_static LOCAL_WHOLE_STATIC_LIBRARIES += scriptingcore-spidermonkey +LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT @@ -26,3 +27,4 @@ $(call import-module,CocosDenshion/android) $(call import-module,external/chipmunk) $(call import-module,scripting/javascript/spidermonkey-android) $(call import-module,scripting/javascript/bindings) +$(call import-module,cocos2dx/platform/android) diff --git a/samples/Javascript/CrystalCraze/proj.android/jni/crystalcraze/main.cpp b/samples/Javascript/CrystalCraze/proj.android/jni/crystalcraze/main.cpp index 5f73b61c4e..3d2a59ddfc 100644 --- a/samples/Javascript/CrystalCraze/proj.android/jni/crystalcraze/main.cpp +++ b/samples/Javascript/CrystalCraze/proj.android/jni/crystalcraze/main.cpp @@ -10,35 +10,7 @@ using namespace cocos2d; -extern "C" -{ - -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(); - Application::getInstance()->run(); - } - else - { - GL::invalidateStateCache(); - ShaderCache::getInstance()->reloadDefaultShaders(); - DrawPrimitives::init(); - TextureCache::reloadAllTextures(); - NotificationCenter::getInstance()->postNotification(EVNET_COME_TO_FOREGROUND, NULL); - Director::getInstance()->setGLDefaultValues(); - } -} - +void cocos_android_app_init (void) { + LOGD("cocos_android_app_init"); + AppDelegate *pAppDelegate = new AppDelegate(); } diff --git a/samples/Javascript/CrystalCraze/proj.android/project.properties b/samples/Javascript/CrystalCraze/proj.android/project.properties index 522ea9f05d..db4ff43492 100644 --- a/samples/Javascript/CrystalCraze/proj.android/project.properties +++ b/samples/Javascript/CrystalCraze/proj.android/project.properties @@ -8,6 +8,6 @@ # project structure. # Project target. -target=android-10 +target=android-13 android.library.reference.1=../../../../cocos2dx/platform/android/java diff --git a/samples/Javascript/CrystalCraze/proj.android/src/nojava.txt b/samples/Javascript/CrystalCraze/proj.android/src/nojava.txt new file mode 100644 index 0000000000..b8ad10a43d --- /dev/null +++ b/samples/Javascript/CrystalCraze/proj.android/src/nojava.txt @@ -0,0 +1 @@ +No Java files diff --git a/samples/Javascript/CrystalCraze/proj.android/src/org/cocos2dx/crystalcraze/CrystalCraze.java b/samples/Javascript/CrystalCraze/proj.android/src/org/cocos2dx/crystalcraze/CrystalCraze.java deleted file mode 100644 index 64e8a1f7da..0000000000 --- a/samples/Javascript/CrystalCraze/proj.android/src/org/cocos2dx/crystalcraze/CrystalCraze.java +++ /dev/null @@ -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.crystalcraze; - -import org.cocos2dx.lib.Cocos2dxActivity; - -import android.os.Bundle; - -public class CrystalCraze extends Cocos2dxActivity{ - - protected void onCreate(Bundle savedInstanceState){ - super.onCreate(savedInstanceState); - } - - static { - System.loadLibrary("crystalcraze"); - } -} diff --git a/samples/Javascript/MoonWarriors/proj.android/AndroidManifest.xml b/samples/Javascript/MoonWarriors/proj.android/AndroidManifest.xml index ba04752cc1..8c1aa00cc0 100644 --- a/samples/Javascript/MoonWarriors/proj.android/AndroidManifest.xml +++ b/samples/Javascript/MoonWarriors/proj.android/AndroidManifest.xml @@ -10,11 +10,16 @@ - + android:configChanges="orientation|screenSize|smallestScreenSize"> + + + + diff --git a/samples/Javascript/MoonWarriors/proj.android/jni/Android.mk b/samples/Javascript/MoonWarriors/proj.android/jni/Android.mk index 91eb4e64bb..5567a3879c 100644 --- a/samples/Javascript/MoonWarriors/proj.android/jni/Android.mk +++ b/samples/Javascript/MoonWarriors/proj.android/jni/Android.mk @@ -16,6 +16,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static LOCAL_WHOLE_STATIC_LIBRARIES += spidermonkey_static LOCAL_WHOLE_STATIC_LIBRARIES += scriptingcore-spidermonkey +LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT @@ -26,3 +27,4 @@ $(call import-module,CocosDenshion/android) $(call import-module,external/chipmunk) $(call import-module,scripting/javascript/spidermonkey-android) $(call import-module,scripting/javascript/bindings) +$(call import-module,cocos2dx/platform/android) diff --git a/samples/Javascript/MoonWarriors/proj.android/jni/moonwarriors/main.cpp b/samples/Javascript/MoonWarriors/proj.android/jni/moonwarriors/main.cpp index 5f73b61c4e..3d2a59ddfc 100644 --- a/samples/Javascript/MoonWarriors/proj.android/jni/moonwarriors/main.cpp +++ b/samples/Javascript/MoonWarriors/proj.android/jni/moonwarriors/main.cpp @@ -10,35 +10,7 @@ using namespace cocos2d; -extern "C" -{ - -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(); - Application::getInstance()->run(); - } - else - { - GL::invalidateStateCache(); - ShaderCache::getInstance()->reloadDefaultShaders(); - DrawPrimitives::init(); - TextureCache::reloadAllTextures(); - NotificationCenter::getInstance()->postNotification(EVNET_COME_TO_FOREGROUND, NULL); - Director::getInstance()->setGLDefaultValues(); - } -} - +void cocos_android_app_init (void) { + LOGD("cocos_android_app_init"); + AppDelegate *pAppDelegate = new AppDelegate(); } diff --git a/samples/Javascript/MoonWarriors/proj.android/project.properties b/samples/Javascript/MoonWarriors/proj.android/project.properties index 522ea9f05d..db4ff43492 100644 --- a/samples/Javascript/MoonWarriors/proj.android/project.properties +++ b/samples/Javascript/MoonWarriors/proj.android/project.properties @@ -8,6 +8,6 @@ # project structure. # Project target. -target=android-10 +target=android-13 android.library.reference.1=../../../../cocos2dx/platform/android/java diff --git a/samples/Javascript/MoonWarriors/proj.android/src/nojava.txt b/samples/Javascript/MoonWarriors/proj.android/src/nojava.txt new file mode 100644 index 0000000000..b8ad10a43d --- /dev/null +++ b/samples/Javascript/MoonWarriors/proj.android/src/nojava.txt @@ -0,0 +1 @@ +No Java files diff --git a/samples/Javascript/MoonWarriors/proj.android/src/org/cocos2dx/moonwarriors/MoonWarriors.java b/samples/Javascript/MoonWarriors/proj.android/src/org/cocos2dx/moonwarriors/MoonWarriors.java deleted file mode 100644 index 46f8edc518..0000000000 --- a/samples/Javascript/MoonWarriors/proj.android/src/org/cocos2dx/moonwarriors/MoonWarriors.java +++ /dev/null @@ -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.moonwarriors; - -import org.cocos2dx.lib.Cocos2dxActivity; - -import android.os.Bundle; - -public class MoonWarriors extends Cocos2dxActivity{ - - protected void onCreate(Bundle savedInstanceState){ - super.onCreate(savedInstanceState); - } - - static { - System.loadLibrary("moonwarriors"); - } -} diff --git a/samples/Javascript/WatermelonWithMe/proj.android/AndroidManifest.xml b/samples/Javascript/WatermelonWithMe/proj.android/AndroidManifest.xml index a55e396581..aae0c2ff1d 100644 --- a/samples/Javascript/WatermelonWithMe/proj.android/AndroidManifest.xml +++ b/samples/Javascript/WatermelonWithMe/proj.android/AndroidManifest.xml @@ -10,11 +10,16 @@ - + android:configChanges="orientation|screenSize|smallestScreenSize"> + + + + diff --git a/samples/Javascript/WatermelonWithMe/proj.android/jni/Android.mk b/samples/Javascript/WatermelonWithMe/proj.android/jni/Android.mk index 46c62e42d6..33fdf59cf3 100644 --- a/samples/Javascript/WatermelonWithMe/proj.android/jni/Android.mk +++ b/samples/Javascript/WatermelonWithMe/proj.android/jni/Android.mk @@ -16,6 +16,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static LOCAL_WHOLE_STATIC_LIBRARIES += spidermonkey_static LOCAL_WHOLE_STATIC_LIBRARIES += scriptingcore-spidermonkey +LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT @@ -26,3 +27,4 @@ $(call import-module,CocosDenshion/android) $(call import-module,external/chipmunk) $(call import-module,scripting/javascript/spidermonkey-android) $(call import-module,scripting/javascript/bindings) +$(call import-module,cocos2dx/platform/android) diff --git a/samples/Javascript/WatermelonWithMe/proj.android/jni/watermelonwithme/main.cpp b/samples/Javascript/WatermelonWithMe/proj.android/jni/watermelonwithme/main.cpp index 5f73b61c4e..3d2a59ddfc 100644 --- a/samples/Javascript/WatermelonWithMe/proj.android/jni/watermelonwithme/main.cpp +++ b/samples/Javascript/WatermelonWithMe/proj.android/jni/watermelonwithme/main.cpp @@ -10,35 +10,7 @@ using namespace cocos2d; -extern "C" -{ - -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(); - Application::getInstance()->run(); - } - else - { - GL::invalidateStateCache(); - ShaderCache::getInstance()->reloadDefaultShaders(); - DrawPrimitives::init(); - TextureCache::reloadAllTextures(); - NotificationCenter::getInstance()->postNotification(EVNET_COME_TO_FOREGROUND, NULL); - Director::getInstance()->setGLDefaultValues(); - } -} - +void cocos_android_app_init (void) { + LOGD("cocos_android_app_init"); + AppDelegate *pAppDelegate = new AppDelegate(); } diff --git a/samples/Javascript/WatermelonWithMe/proj.android/project.properties b/samples/Javascript/WatermelonWithMe/proj.android/project.properties index 522ea9f05d..db4ff43492 100644 --- a/samples/Javascript/WatermelonWithMe/proj.android/project.properties +++ b/samples/Javascript/WatermelonWithMe/proj.android/project.properties @@ -8,6 +8,6 @@ # project structure. # Project target. -target=android-10 +target=android-13 android.library.reference.1=../../../../cocos2dx/platform/android/java diff --git a/samples/Javascript/WatermelonWithMe/proj.android/src/nojava.txt b/samples/Javascript/WatermelonWithMe/proj.android/src/nojava.txt new file mode 100644 index 0000000000..b8ad10a43d --- /dev/null +++ b/samples/Javascript/WatermelonWithMe/proj.android/src/nojava.txt @@ -0,0 +1 @@ +No Java files diff --git a/samples/Javascript/WatermelonWithMe/proj.android/src/org/cocos2dx/watermelonwithme/WatermelonWithMe.java b/samples/Javascript/WatermelonWithMe/proj.android/src/org/cocos2dx/watermelonwithme/WatermelonWithMe.java deleted file mode 100644 index 46d55dd3d8..0000000000 --- a/samples/Javascript/WatermelonWithMe/proj.android/src/org/cocos2dx/watermelonwithme/WatermelonWithMe.java +++ /dev/null @@ -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.watermelonwithme; - -import org.cocos2dx.lib.Cocos2dxActivity; - -import android.os.Bundle; - -public class WatermelonWithMe extends Cocos2dxActivity{ - - protected void onCreate(Bundle savedInstanceState){ - super.onCreate(savedInstanceState); - } - - static { - System.loadLibrary("watermelonwithme"); - } -}