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

Merge pull request #10118 from htlxyz/fixed_show_dialog_on_android_without_runtime 

fixed show open wifi dialog on android without runtime
This commit is contained in:
minggo 2015-01-21 09:24:16 +08:00
parent e849243894 52b03039fa
commit 8979f53058
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
templates/lua-template-default/cocos-project-template.json
View File

@ -246,6 +246,13 @@
"files": [ "files": [
"frameworks/runtime-src/proj.ios_mac/ios/Info.plist" "frameworks/runtime-src/proj.ios_mac/ios/Info.plist"
] ]
} },
"modify_files":[
{
"file_path": "frameworks/runtime-src/Classes/ide-support/CodeIDESupport.h",
"pattern": "#define CC_CODE_IDE_DEBUG_SUPPORT 1",
"replace_string": "#define CC_CODE_IDE_DEBUG_SUPPORT 0"
}
]
} }
} }

3
templates/lua-template-default/frameworks/runtime-src/proj.android/jni/hellolua/main.cpp
View File

@ -4,6 +4,7 @@
#include <jni.h> #include <jni.h>
#include <android/log.h> #include <android/log.h>
#include "ide-support/SimpleConfigParser.h" #include "ide-support/SimpleConfigParser.h"
#include "ide-support/CodeIDESupport.h"
#define LOG_TAG "main" #define LOG_TAG "main"
#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__) #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
@ -24,7 +25,7 @@ extern "C"
bool Java_org_cocos2dx_lua_AppActivity_nativeIsDebug(JNIEnv *env, jobject thisz) bool Java_org_cocos2dx_lua_AppActivity_nativeIsDebug(JNIEnv *env, jobject thisz)
{ {
#if (COCOS2D_DEBUG > 0) #if (COCOS2D_DEBUG > 0) && (CC_CODE_IDE_DEBUG_SUPPORT > 0)
return true; return true;
#else #else
return false; return false;