Skip to content

Commit

Permalink
improve code formate
Browse files Browse the repository at this point in the history
  • Loading branch information
jianglong0156 committed Apr 15, 2015
1 parent 40a4de2 commit b3dd85a
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

void register_all_cocos2dx_experimental_webView_manual(JSContext* cx, JS::HandleObject global);

#endif /* defined(__jsb_cocos2dx_experimental_webView_manual__) */
#endif /* defined(__jsb_cocos2dx_experimental_webView_manual__) */
2 changes: 1 addition & 1 deletion samples/js-tests/project/Classes/AppDelegate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,4 +152,4 @@ var UIWebViewTest = UIScene.extend({
onWebViewDidFailLoading: function (sender, url) {
cc.log("onWebViewDidFailLoading, url is " + url);
}
});
});
2 changes: 1 addition & 1 deletion tools/tojs/cocos2dx_experimental_webView.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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_
Expand Down

0 comments on commit b3dd85a

Please sign in to comment.