Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
walzer 2013-02-18 22:40:54 +08:00
parent 0a4700e59b 414343dc44
commit 7f3dee7ec1
9 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AUTHORS
View File

@ -196,6 +196,9 @@ Developers:
DarraghCoy DarraghCoy
Fix for unaligned memory access crash in CCBReader::readFloat(). 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: Retired Core Developers:
WenSheng Yang WenSheng Yang
Author of windows port, CCTextField, Author of windows port, CCTextField,

9
cocos2dx/platform/third_party/android/prebuilt/libwebp/Android.mk vendored
View File

@ -5,4 +5,13 @@ LOCAL_MODULE := cocos_libwebp_static
LOCAL_MODULE_FILENAME := webp LOCAL_MODULE_FILENAME := webp
LOCAL_SRC_FILES := libs/$(TARGET_ARCH_ABI)/libwebp.a LOCAL_SRC_FILES := libs/$(TARGET_ARCH_ABI)/libwebp.a
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include 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) include $(PREBUILT_STATIC_LIBRARY)
$(call import-module,cpufeatures)

1
scripting/javascript/bindings/ScriptingCore.cpp
View File

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

2
scripting/javascript/spidermonkey-android/Android.mk
View File

@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := spidermonkey_static LOCAL_MODULE := spidermonkey_static
LOCAL_MODULE_FILENAME := js_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_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_CPPFLAGS := -D__STDC_LIMIT_MACROS=1 LOCAL_CPPFLAGS := -D__STDC_LIMIT_MACROS=1
LOCAL_EXPORT_CPPFLAGS := -D__STDC_LIMIT_MACROS=1 LOCAL_EXPORT_CPPFLAGS := -D__STDC_LIMIT_MACROS=1

1
scripting/javascript/spidermonkey-android/lib/armeabi-v7a/libjs_static.a.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
0b43ca82a2e3c648187f17aa0ea261a8d98ac2a5

1
scripting/javascript/spidermonkey-android/lib/armeabi/libjs_static.a.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
04eff728bf10911147107d4237d102d9b96067e7

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

@ -1 +0,0 @@
a0001da73e82abc77d183d416ca2b4b97e9e9ee1

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

@ -2,9 +2,9 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) 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 \ LOCAL_SRC_FILES := hellojavascript/main.cpp \
../../Classes/AppDelegate.cpp ../../Classes/AppDelegate.cpp

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

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