Merge pull request #20 from dumganhar/mp3-ogg-decoder

Disable ASM for tremolo since it may crashes while decoding same specific ogg audio files.

android/Android.mk

@@ -55,20 +55,20 @@ LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libtiff.a
 include $(PREBUILT_STATIC_LIBRARY)
 
 #======================================
-#include $(CLEAR_VARS)
-#
-#LOCAL_MODULE := cocos_webp_static
-#LOCAL_MODULE_FILENAME := webp
-#LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libwebp.a
-#
-#LOCAL_WHOLE_STATIC_LIBRARIES := cpufeatures
-#
-#ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-#    LOCAL_CFLAGS := -DHAVE_NEON=1
-#endif
-#
-#include $(PREBUILT_STATIC_LIBRARY)
-#
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := cocos_webp_static
+LOCAL_MODULE_FILENAME := webp
+LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libwebp.a
+
+LOCAL_WHOLE_STATIC_LIBRARIES := cpufeatures
+
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+   LOCAL_CFLAGS := -DHAVE_NEON=1
+endif
+
+include $(PREBUILT_STATIC_LIBRARY)
+
 #======================================
 include $(CLEAR_VARS)
 

android/arm64-v8a/include/anysdk/ProtocolUser.h

@@ -33,6 +33,7 @@ typedef enum
     kAccountSwitchFail,/**< enum value is callback of failing to switch account. */
     kOpenShop,/**< enum value is callback of open the shop. */
     kAccountSwitchCancel,/**< enum value is callback of canceling to switch account. */
+    kGameExitPage,/**< enum value is callback of no channel exit page. */
     kUserExtension = 50000 /**< enum value is  extension code . */
 
 

android/arm64-v8a/include/spidermonkey/js/TypeDecls.h

@@ -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;

android/arm64-v8a/include/spidermonkey/js/Value.h

@@ -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);