From e81efb24c932275090b45461f2fd4a07279d082d Mon Sep 17 00:00:00 2001 From: minggo Date: Wed, 23 Oct 2013 16:49:50 +0800 Subject: [PATCH] issue #2905: android samples run ok --- .../Cpp/AssetsManagerTest/proj.android/project.properties | 4 ++-- samples/Cpp/HelloCpp/proj.android/project.properties | 5 ++--- samples/Cpp/SimpleGame/proj.android/project.properties | 4 ++-- samples/Cpp/TestCpp/proj.android/project.properties | 4 ++-- .../Javascript/CocosDragonJS/proj.android/project.properties | 4 ++-- .../Javascript/CrystalCraze/proj.android/project.properties | 4 ++-- .../Javascript/MoonWarriors/proj.android/project.properties | 4 ++-- .../TestJavascript/proj.android/project.properties | 4 ++-- .../WatermelonWithMe/proj.android/project.properties | 4 ++-- samples/Lua/HelloLua/proj.android/project.properties | 4 ++-- samples/Lua/TestLua/proj.android/project.properties | 4 ++-- template/multi-platform-cpp/proj.android/project.properties | 4 ++-- template/multi-platform-js/proj.android/project.properties | 2 +- template/multi-platform-lua/proj.android/project.properties | 4 ++-- 14 files changed, 27 insertions(+), 28 deletions(-) diff --git a/samples/Cpp/AssetsManagerTest/proj.android/project.properties b/samples/Cpp/AssetsManagerTest/proj.android/project.properties index 5c08afb38c..f7e62936d0 100644 --- a/samples/Cpp/AssetsManagerTest/proj.android/project.properties +++ b/samples/Cpp/AssetsManagerTest/proj.android/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-13 -android.library.reference.1=../../../../cocos2dx/platform/android/java +target=android-10 +android.library.reference.1=../../../../cocos/2d/platform/android/java diff --git a/samples/Cpp/HelloCpp/proj.android/project.properties b/samples/Cpp/HelloCpp/proj.android/project.properties index 088495876a..0a6dc6664d 100644 --- a/samples/Cpp/HelloCpp/proj.android/project.properties +++ b/samples/Cpp/HelloCpp/proj.android/project.properties @@ -8,7 +8,6 @@ # project structure. # Project target. -target=android-13 +target=android-10 -android.library.reference.1=../../../../cocos2dx/platform/android/java -android.library=false +android.library.reference.1=../../../../cocos/2d/platform/android/java diff --git a/samples/Cpp/SimpleGame/proj.android/project.properties b/samples/Cpp/SimpleGame/proj.android/project.properties index 5c08afb38c..f7e62936d0 100644 --- a/samples/Cpp/SimpleGame/proj.android/project.properties +++ b/samples/Cpp/SimpleGame/proj.android/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-13 -android.library.reference.1=../../../../cocos2dx/platform/android/java +target=android-10 +android.library.reference.1=../../../../cocos/2d/platform/android/java diff --git a/samples/Cpp/TestCpp/proj.android/project.properties b/samples/Cpp/TestCpp/proj.android/project.properties index db4ff43492..0a6dc6664d 100644 --- a/samples/Cpp/TestCpp/proj.android/project.properties +++ b/samples/Cpp/TestCpp/proj.android/project.properties @@ -8,6 +8,6 @@ # project structure. # Project target. -target=android-13 +target=android-10 -android.library.reference.1=../../../../cocos2dx/platform/android/java +android.library.reference.1=../../../../cocos/2d/platform/android/java diff --git a/samples/Javascript/CocosDragonJS/proj.android/project.properties b/samples/Javascript/CocosDragonJS/proj.android/project.properties index db4ff43492..0a6dc6664d 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-13 +target=android-10 -android.library.reference.1=../../../../cocos2dx/platform/android/java +android.library.reference.1=../../../../cocos/2d/platform/android/java diff --git a/samples/Javascript/CrystalCraze/proj.android/project.properties b/samples/Javascript/CrystalCraze/proj.android/project.properties index db4ff43492..0a6dc6664d 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-13 +target=android-10 -android.library.reference.1=../../../../cocos2dx/platform/android/java +android.library.reference.1=../../../../cocos/2d/platform/android/java diff --git a/samples/Javascript/MoonWarriors/proj.android/project.properties b/samples/Javascript/MoonWarriors/proj.android/project.properties index db4ff43492..0a6dc6664d 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-13 +target=android-10 -android.library.reference.1=../../../../cocos2dx/platform/android/java +android.library.reference.1=../../../../cocos/2d/platform/android/java diff --git a/samples/Javascript/TestJavascript/proj.android/project.properties b/samples/Javascript/TestJavascript/proj.android/project.properties index db4ff43492..0a6dc6664d 100644 --- a/samples/Javascript/TestJavascript/proj.android/project.properties +++ b/samples/Javascript/TestJavascript/proj.android/project.properties @@ -8,6 +8,6 @@ # project structure. # Project target. -target=android-13 +target=android-10 -android.library.reference.1=../../../../cocos2dx/platform/android/java +android.library.reference.1=../../../../cocos/2d/platform/android/java diff --git a/samples/Javascript/WatermelonWithMe/proj.android/project.properties b/samples/Javascript/WatermelonWithMe/proj.android/project.properties index db4ff43492..0a6dc6664d 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-13 +target=android-10 -android.library.reference.1=../../../../cocos2dx/platform/android/java +android.library.reference.1=../../../../cocos/2d/platform/android/java diff --git a/samples/Lua/HelloLua/proj.android/project.properties b/samples/Lua/HelloLua/proj.android/project.properties index db4ff43492..0a6dc6664d 100644 --- a/samples/Lua/HelloLua/proj.android/project.properties +++ b/samples/Lua/HelloLua/proj.android/project.properties @@ -8,6 +8,6 @@ # project structure. # Project target. -target=android-13 +target=android-10 -android.library.reference.1=../../../../cocos2dx/platform/android/java +android.library.reference.1=../../../../cocos/2d/platform/android/java diff --git a/samples/Lua/TestLua/proj.android/project.properties b/samples/Lua/TestLua/proj.android/project.properties index db4ff43492..0a6dc6664d 100644 --- a/samples/Lua/TestLua/proj.android/project.properties +++ b/samples/Lua/TestLua/proj.android/project.properties @@ -8,6 +8,6 @@ # project structure. # Project target. -target=android-13 +target=android-10 -android.library.reference.1=../../../../cocos2dx/platform/android/java +android.library.reference.1=../../../../cocos/2d/platform/android/java diff --git a/template/multi-platform-cpp/proj.android/project.properties b/template/multi-platform-cpp/proj.android/project.properties index 6495217b66..16f145cfc9 100644 --- a/template/multi-platform-cpp/proj.android/project.properties +++ b/template/multi-platform-cpp/proj.android/project.properties @@ -8,6 +8,6 @@ # project structure. # Project target. -target=android-13 +target=android-10 -android.library.reference.1=../../../cocos2dx/platform/android/java +android.library.reference.1=../../../cocos/2d/platform/android/java diff --git a/template/multi-platform-js/proj.android/project.properties b/template/multi-platform-js/proj.android/project.properties index 6495217b66..f0d6a80641 100644 --- a/template/multi-platform-js/proj.android/project.properties +++ b/template/multi-platform-js/proj.android/project.properties @@ -10,4 +10,4 @@ # Project target. target=android-13 -android.library.reference.1=../../../cocos2dx/platform/android/java +android.library.reference.1=../../../cocos/2d/platform/android/java diff --git a/template/multi-platform-lua/proj.android/project.properties b/template/multi-platform-lua/proj.android/project.properties index 6495217b66..16f145cfc9 100644 --- a/template/multi-platform-lua/proj.android/project.properties +++ b/template/multi-platform-lua/proj.android/project.properties @@ -8,6 +8,6 @@ # project structure. # Project target. -target=android-13 +target=android-10 -android.library.reference.1=../../../cocos2dx/platform/android/java +android.library.reference.1=../../../cocos/2d/platform/android/java