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

Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3

This commit is contained in:
bofeng-song 2014-05-20 16:58:24 +08:00
parent 14298dce6a 96b580fd88
commit 21d98762a6
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,5 +25,14 @@ extern "C"
} }
return ConfigParser::getInstance()->isLanscape(); return ConfigParser::getInstance()->isLanscape();
} }
bool Java_org_cocos2dx_lua_AppActivity_nativeIsDebug(JNIEnv *env, jobject thisz)
{
#ifdef NDEBUG
return false;
#else
return true;
#endif
}
} }

5
templates/lua-template-runtime/frameworks/runtime-src/proj.android/src/org/cocos2dx/lua/AppActivity.java
View File

@ -69,8 +69,8 @@ public class AppActivity extends Cocos2dxActivity{
//2.Set the format of window //2.Set the format of window
// Check the wifi is opened when the android:debuggable is "true". // Check the wifi is opened when the native is debug.
if(0!=((this.getApplicationInfo().flags) & ApplicationInfo.FLAG_DEBUGGABLE)) if(nativeIsDebug())
{ {
if(!isWifiConnected()) if(!isWifiConnected())
{ {
@ -123,5 +123,6 @@ public class AppActivity extends Cocos2dxActivity{
} }
private static native boolean nativeIsLandScape(); private static native boolean nativeIsLandScape();
private static native boolean nativeIsDebug();
} }

2
templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm
View File

@ -128,7 +128,7 @@ void createSimulator(const char* viewName, float width, float height,bool isLand
{ {
float tmpvalue =width; float tmpvalue =width;
width = height; width = height;
height = width; height = tmpvalue;
} }
[g_nsAppDelegate createSimulator:[NSString stringWithUTF8String:viewName] viewWidth:width viewHeight:height factor:frameZoomFactor]; [g_nsAppDelegate createSimulator:[NSString stringWithUTF8String:viewName] viewWidth:width viewHeight:height factor:frameZoomFactor];

2
templates/lua-template-runtime/frameworks/runtime-src/proj.win32/SimulatorWindow.cpp
View File

@ -312,7 +312,7 @@ void createSimulator(const char* viewName, float width, float height, bool isLan
{ {
float tmpvalue =width; float tmpvalue =width;
width = height; width = height;
height = width; height = tmpvalue;
} }
g_eglView = GLView::createWithRect(viewName,Rect(0,0,width,height),frameZoomFactor); g_eglView = GLView::createWithRect(viewName,Rect(0,0,width,height),frameZoomFactor);

2
templates/lua-template-runtime/runtime/config.json
View File

@ -1,6 +1,6 @@
{ {
"version":"v3-lua-runtime-1.1.1", "version":"v3-lua-runtime-1.1.1",
"zip_file_size":"20853321", "zip_file_size":"20854899",
"repo_name":"cocos-runtime-bin", "repo_name":"cocos-runtime-bin",
"repo_parent":"https://github.com/chukong/" "repo_parent":"https://github.com/chukong/"
} }