issue #3900: Fixes wrong include.

cocos/scripting/javascript/bindings/js_bindings_config.h

@@ -88,33 +88,6 @@
 #endif // JSB_REPRESENT_LONGLONG_AS_STR
 
 
-/** @def JSB_INCLUDE_NS
- Whether or not it should include JS bindings for basic NS* / Cocoa / CocoaTouch objects.
- It should be enabled in order to support bindings for any objective-c projects.
- Not needed for pure C projects.
- Enabled by default.
- */
-#ifndef JSB_INCLUDE_NS
-#define JSB_INCLUDE_NS 1
-#endif // JSB_INCLUDE_NS
-
-
-/** @def JSB_INCLUDE_COCOS2D
- Whether or not it should include JS bindings for cocos2d.
- */
-#ifndef JSB_INCLUDE_COCOS2D
-#define JSB_INCLUDE_COCOS2D 1
-
-#include "cocos2d.h"
-#if defined(__CC_PLATFORM_IOS)
-#define JSB_INCLUDE_COCOS2D_IOS 1
-#elif defined(__CC_PLATFORM_MAC)
-#define JSB_INCLUDE_COCOS2D_MAC 1
-#endif
-
-#endif // JSB_INCLUDE_COCOS2D
-
-
 /** @def JSB_INCLUDE_CHIPMUNK
  Whether or not it should include JS bindings for Chipmunk
  */

cocos/scripting/javascript/bindings/js_bindings_core.cpp

@@ -24,15 +24,12 @@
 #include "js_bindings_config.h"
 #include "js_bindings_core.h"
 
-
 // cocos2d + chipmunk registration files
 #include "chipmunk/js_bindings_chipmunk_registration.h"
-
+#include "cocos2d.h"
 
 //#pragma mark - Hash
 
-using namespace cocos2d;
-
 typedef struct _hashJSObject
 {
 	JSObject			*jsObject;

cocos/scripting/javascript/bindings/js_bindings_core.h

@@ -26,9 +26,6 @@
 
 #include "jsapi.h"
 #include "jsfriendapi.h"
-#include "cocos2d.h"
-#include "chipmunk.h"
-#include "SimpleAudioEngine.h"
 
 #ifdef __cplusplus
 extern "C" {

cocos/scripting/javascript/bindings/js_bindings_opengl.h

@@ -1,4 +1,3 @@
-#include "cocos2d.h"
 #include "ScriptingCore.h"
 #include "cocos2d_specifics.hpp"
 

cocos/scripting/javascript/bindings/js_manual_conversions.h

@@ -11,6 +11,7 @@
 #include "js_bindings_config.h"
 #include "cocos2d.h"
 #include "spidermonkey_specifics.h"
+#include "chipmunk.h"
 
 // just a simple utility to avoid mem leaking when using JSString
 class JSStringWrapper

cocos/scripting/javascript/bindings/localstorage/js_bindings_system_functions.cpp

@@ -3,18 +3,12 @@
 * Generated by "generate_js_bindings.py -c system_jsb.ini" on 2012-12-17
 * Script version: v0.5
 */
-#include "cocos2d.h"
-#include "js_bindings_config.h"
-//#ifdef JSB_INCLUDE_SYSTEM
-
-#include "local-storage/LocalStorage.h"
-
-#include "jsfriendapi.h"
+#include "js_bindings_system_functions.h"
 #include "js_bindings_config.h"
 #include "js_bindings_core.h"
 #include "js_manual_conversions.h"
-#include "js_bindings_system_functions.h"
 #include "ScriptingCore.h"
+#include "local-storage/LocalStorage.h"
 
 USING_NS_CC;
 

cocos/scripting/javascript/bindings/localstorage/js_bindings_system_functions.h

@@ -4,9 +4,7 @@
 * Script version: v0.5
 */
 #include "js_bindings_config.h"
-//#ifdef JSB_INCLUDE_SYSTEM
-
-//#include "LocalStorage.h"
+#include "jsapi.h"
 
 #ifdef __cplusplus
 extern "C" {