Merge pull request #11 from chuanweizhang2013/master

fix android crash
cocos2d · May 15, 2014 · c1b4020 · c1b4020
2 parents 6a69b2d + 8458287
commit c1b4020
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 20 deletions.
diff --git a/templates/js-template-runtime/cocos-project-template.json b/templates/js-template-runtime/cocos-project-template.json
@@ -149,7 +149,7 @@
          "project_replace_project_name":{
             "src_project_name":"HelloJavascript",
             "files":[
-               "res/config.json",
+               "config.json",
                ".project",
                "frameworks/runtime-src/proj.win32/PROJECT_NAME.vcxproj",
                "frameworks/runtime-src/proj.win32/PROJECT_NAME.vcxproj.filters",

diff --git a/...s-template-runtime/frameworks/runtime-src/proj.android/jni/javascript/Runtime_android.cpp b/...s-template-runtime/frameworks/runtime-src/proj.android/jni/javascript/Runtime_android.cpp
@@ -6,24 +6,6 @@
 using namespace std;
 using namespace cocos2d;
 
-string getSDCardPath();
-string getProjSearchPath()
-{
-	extern std::string getPackageNameJNI();
-	string searchPath = getSDCardPath();
-	searchPath += "/";
-	searchPath += getPackageNameJNI();
-	return searchPath;
-}
-
-vector<string> getSearchPath()
-{
-	extern std::string getPackageNameJNI();
-	vector<string> searchPathArray;
-	searchPathArray.push_back(getProjSearchPath());
-	return searchPathArray;
-}
-
 string getSDCardPath()
 {
 	JniMethodInfo t;

diff --git a/templates/js-template-runtime/frameworks/runtime-src/proj.android/jni/javascript/main.cpp b/templates/js-template-runtime/frameworks/runtime-src/proj.android/jni/javascript/main.cpp
@@ -18,7 +18,7 @@ void cocos_android_app_init (JNIEnv* env, jobject thiz) {
 
 extern "C"
 {
-    bool Java_org_cocos2dx_lua_AppActivity_nativeIsLandScape(JNIEnv *env, jobject thisz)
+    bool Java_org_cocos2dx_javascript_AppActivity_nativeIsLandScape(JNIEnv *env, jobject thisz)
     {
         if (!ConfigParser::getInstance()->isInit())
         {