diff --git a/samples/TestJavascript/Classes/AppDelegate.cpp b/samples/TestJavascript/Classes/AppDelegate.cpp index a333656631..6caec43d5d 100644 --- a/samples/TestJavascript/Classes/AppDelegate.cpp +++ b/samples/TestJavascript/Classes/AppDelegate.cpp @@ -2,12 +2,9 @@ #include "cocos2d.h" #include "SimpleAudioEngine.h" -//#include "CocosBuilderTest.h" #include "ScriptingCore.h" #include "cocos2dx.hpp" #include "cocos2d_specifics.hpp" -#include "js_bindings_chipmunk_manual.hpp" -#include "js_bindings_chipmunk_functions.hpp" USING_NS_CC; using namespace CocosDenshion; @@ -40,10 +37,6 @@ bool AppDelegate::applicationDidFinishLaunching() ScriptingCore* sc = ScriptingCore::getInstance(); sc->addRegisterCallback(register_all_cocos2dx); sc->addRegisterCallback(register_cocos2dx_js_extensions); - sc->addRegisterCallback(register_chipmunk_manual); - sc->addRegisterCallback(register_CCPhysicsSprite); - - sc->start(); diff --git a/scripting/javascript/bindings/Android.mk b/scripting/javascript/bindings/Android.mk index 9c22980453..ea17933f1f 100644 --- a/scripting/javascript/bindings/Android.mk +++ b/scripting/javascript/bindings/Android.mk @@ -8,12 +8,7 @@ LOCAL_MODULE_FILENAME := libscriptingcore-spidermonkey LOCAL_SRC_FILES := ScriptingCore.cpp \ cocos2d_specifics.cpp \ - CCPhysicsSprite.cpp \ - js_bindings_chipmunk_functions.cpp \ - js_bindings_chipmunk_manual.cpp \ - cocos2dx.cpp \ - js_manual_conversions.cpp - + cocos2dx.cpp LOCAL_CFLAGS := -DCOCOS2D_JAVASCRIPT diff --git a/scripting/javascript/bindings/js_manual_conversions.cpp b/scripting/javascript/bindings/js_manual_conversions.cpp index 033ac3ea2b..dc6534f17c 100644 --- a/scripting/javascript/bindings/js_manual_conversions.cpp +++ b/scripting/javascript/bindings/js_manual_conversions.cpp @@ -8,9 +8,7 @@ #include "ScriptingCore.h" #include "js_bindings_config.h" #include "js_manual_conversions.h" -//#include "android/log.h" -#define APPNAME "jstest" #define JSB_COMPATIBLE_WITH_COCOS2D_HTML5_BASIC_TYPES //#include "js_bindings_NS_manual.h" @@ -263,8 +261,6 @@ jsval long_to_jsval( JSContext *cx, long number ) #endif } -//#ifdef JSB_USE_CHIPMUNK - JSBool jsval_to_cpBB( JSContext *cx, jsval vp, cpBB *ret ) { JSObject *tmp_arg; @@ -293,8 +289,6 @@ jsval cpBB_to_jsval(JSContext *cx, cpBB bb ) return OBJECT_TO_JSVAL(typedArray); } -//#endif - jsval longlong_to_jsval( JSContext *cx, long long number ) { //NSCAssert( sizeof(long long)==8, @"Error!");