Merge pull request #8 from pandamicro/master

Update lib chipmunk and spider monkey for armeabi
2016-09-08 20:56:47 +08:00 · 2016-09-08 20:54:24 +08:00 · 2016-09-08 15:37:44 +08:00 · 2016-09-08 15:30:29 +08:00
440 changed files with 6 additions and 3 deletions
@@ -22,9 +22,6 @@

 #include "js-config.h"

-// Needed for cocos2d-js
-#define JS_NO_JSVAL_JSID_STRUCT_TYPES
-
 struct JSContext;
 class JSFunction;
 class JSObject;
@@ -342,7 +342,10 @@ typedef union jsval_layout
 # endif /* JS_PUNBOX64 */
 #endif  /* defined(IS_LITTLE_ENDIAN) */

+//this is a workaround for fixing binding-generator errors
+#ifndef NO_JS_ASSERT
 JS_STATIC_ASSERT(sizeof(jsval_layout) == 8);
+#endif

 /*
 * For codesize purposes on some platforms, it's important that the
@@ -1331,7 +1334,10 @@ class Value
        JS_STATIC_ASSERT(sizeof(JSValueType) == 1);
        JS_STATIC_ASSERT(sizeof(JSValueTag) == 4);
        JS_STATIC_ASSERT(sizeof(JSWhyMagic) <= 4);
+        //this is a workaround for fixing binding-generator errors
+        #ifndef NO_JS_ASSERT
        JS_STATIC_ASSERT(sizeof(Value) == 8);
+        #endif
    }

    friend jsval_layout (::JSVAL_TO_IMPL)(Value);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
pandamicroandGitHub	19845a8849	Merge pull request #8 from pandamicro/master Update lib chipmunk and spider monkey for armeabi	2016-09-08 20:56:47 +08:00
pandamicro	0737f75745	Update lib chipmunk and spider monkey for armeabi	2016-09-08 20:54:24 +08:00
pandamicroandGitHub	52409e59c0	Merge pull request #7 from pandamicro/master Update android lib chipmunk and lib spidermonkey	2016-09-08 15:37:44 +08:00
pandamicro	d16c922475	Update android lib chipmunk and lib spidermonkey	2016-09-08 15:30:29 +08:00