From b3dd85a611ba3a97560573ad63771f62a0b51466 Mon Sep 17 00:00:00 2001 From: jianglong0156 Date: Wed, 15 Apr 2015 17:09:06 +0800 Subject: [PATCH] improve code formate --- .../experimental/jsb_cocos2dx_experimental_webView_manual.cpp | 2 +- .../experimental/jsb_cocos2dx_experimental_webView_manual.h | 2 +- samples/js-tests/project/Classes/AppDelegate.cpp | 2 +- samples/js-tests/src/GUITest/UIWebViewTest/UIWebViewTest.js | 2 +- tools/tojs/cocos2dx_experimental_webView.ini | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frameworks/js-bindings/bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.cpp b/frameworks/js-bindings/bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.cpp index 5ed03316ec..9e57d3f3c0 100644 --- a/frameworks/js-bindings/bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.cpp +++ b/frameworks/js-bindings/bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.cpp @@ -135,4 +135,4 @@ void register_all_cocos2dx_experimental_webView_manual(JSContext* cx, JS::Handle JS_DefineFunction(cx, JS::RootedObject(cx, jsb_cocos2d_experimental_ui_WebView_prototype), "setOnJSCallback", jsb_cocos2dx_experimental_webView_setOnJSCallback, 1, JSPROP_ENUMERATE | JSPROP_PERMANENT); } -#endif \ No newline at end of file +#endif diff --git a/frameworks/js-bindings/bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.h b/frameworks/js-bindings/bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.h index 55c21ea656..f9d536f634 100644 --- a/frameworks/js-bindings/bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.h +++ b/frameworks/js-bindings/bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.h @@ -6,4 +6,4 @@ void register_all_cocos2dx_experimental_webView_manual(JSContext* cx, JS::HandleObject global); -#endif /* defined(__jsb_cocos2dx_experimental_webView_manual__) */ \ No newline at end of file +#endif /* defined(__jsb_cocos2dx_experimental_webView_manual__) */ diff --git a/samples/js-tests/project/Classes/AppDelegate.cpp b/samples/js-tests/project/Classes/AppDelegate.cpp index 6267f6fd65..0394e3b1ce 100644 --- a/samples/js-tests/project/Classes/AppDelegate.cpp +++ b/samples/js-tests/project/Classes/AppDelegate.cpp @@ -42,7 +42,7 @@ #include "js_Effect3D_bindings.h" #endif -#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) +#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) #include "jsb_cocos2dx_experimental_webView_auto.hpp" #include "experimental/jsb_cocos2dx_experimental_webView_manual.h" #endif diff --git a/samples/js-tests/src/GUITest/UIWebViewTest/UIWebViewTest.js b/samples/js-tests/src/GUITest/UIWebViewTest/UIWebViewTest.js index 5d9e420b2d..e4f62c7433 100644 --- a/samples/js-tests/src/GUITest/UIWebViewTest/UIWebViewTest.js +++ b/samples/js-tests/src/GUITest/UIWebViewTest/UIWebViewTest.js @@ -152,4 +152,4 @@ var UIWebViewTest = UIScene.extend({ onWebViewDidFailLoading: function (sender, url) { cc.log("onWebViewDidFailLoading, url is " + url); } -}); \ No newline at end of file +}); diff --git a/tools/tojs/cocos2dx_experimental_webView.ini b/tools/tojs/cocos2dx_experimental_webView.ini index 0aa5f6395a..4efe75c9d9 100644 --- a/tools/tojs/cocos2dx_experimental_webView.ini +++ b/tools/tojs/cocos2dx_experimental_webView.ini @@ -7,7 +7,7 @@ prefix = cocos2dx_experimental_webView # all classes will be embedded in that namespace target_namespace = ccexp -macro_judgement = #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) +macro_judgement = #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) android_headers = -I%(androidndkdir)s/platforms/android-14/arch-arm/usr/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.7/libs/armeabi-v7a/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.7/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a/include -I%(androidndkdir)s/sources/cxx-stl/gnu-libstdc++/4.8/include android_flags = -D_SIZE_T_DEFINED_