Merge branch 'refs/heads/master' into project-creator

AUTHORS

@@ -196,6 +196,9 @@ Developers:
     DarraghCoy
         Fix for unaligned memory access crash in CCBReader::readFloat().
 
+    Sergej Tatarincev (SevInf)
+        Making ScriptingCore.cpp compiled fine with C++11 on iOS.
+
 Retired Core Developers:
     WenSheng Yang
 	Author of windows port, CCTextField, 

cocos2dx/platform/third_party/android/prebuilt/libwebp/Android.mk

@@ -5,4 +5,13 @@ LOCAL_MODULE := cocos_libwebp_static
 LOCAL_MODULE_FILENAME := webp
 LOCAL_SRC_FILES := libs/$(TARGET_ARCH_ABI)/libwebp.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
+
+LOCAL_WHOLE_STATIC_LIBRARIES := cpufeatures
+
+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+    LOCAL_CFLAGS := -DHAVE_NEON=1
+endif
+
 include $(PREBUILT_STATIC_LIBRARY)
+
+$(call import-module,cpufeatures)

scripting/javascript/bindings/ScriptingCore.cpp

@@ -25,6 +25,7 @@
 #include <WS2tcpip.h>
 #else
 #include <sys/socket.h>
+#include <unistd.h>
 #include <netdb.h>
 #endif
 #include <pthread.h>

scripting/javascript/spidermonkey-android/Android.mk

@@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE    := spidermonkey_static
 LOCAL_MODULE_FILENAME := js_static
-LOCAL_SRC_FILES := ./lib/libjs_static.a
+LOCAL_SRC_FILES := ./lib/$(TARGET_ARCH_ABI)/libjs_static.a
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
 LOCAL_CPPFLAGS := -D__STDC_LIMIT_MACROS=1
 LOCAL_EXPORT_CPPFLAGS := -D__STDC_LIMIT_MACROS=1

scripting/javascript/spidermonkey-android/lib/armeabi-v7a/libjs_static.a.REMOVED.git-id

@@ -0,0 +1 @@
+0b43ca82a2e3c648187f17aa0ea261a8d98ac2a5

scripting/javascript/spidermonkey-android/lib/armeabi/libjs_static.a.REMOVED.git-id

@@ -0,0 +1 @@
+04eff728bf10911147107d4237d102d9b96067e7

scripting/javascript/spidermonkey-android/lib/libjs_static.a.REMOVED.git-id

@@ -1 +0,0 @@
-a0001da73e82abc77d183d416ca2b4b97e9e9ee1

template/multi-platform-js/proj.android/jni/Android.mk

@@ -2,9 +2,9 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := hello_javascript_shared
+LOCAL_MODULE := cocos2djs_shared
 
-LOCAL_MODULE_FILENAME := libhellojavascript
+LOCAL_MODULE_FILENAME := libcocos2djs
 
 LOCAL_SRC_FILES := hellojavascript/main.cpp \
                    ../../Classes/AppDelegate.cpp

template/multi-platform-js/proj.android/src/org/cocos2dx/hellojavascript/HelloJavascript.java

@@ -34,6 +34,6 @@ public class HelloJavascript extends Cocos2dxActivity{
 	}
 	
     static {
-        System.loadLibrary("hellojavascript");
+        System.loadLibrary("cocos2djs");
     }
 }