Skip to content

Commit c1e5d0b

Browse files
committed
Merge pull request #193 from WenhaiLin/cocos-runtime
重新编译ios平台需要的第三方库以支持bitcode;websocket开始ssl支持
2 parents f97968c + 0cb9701 commit c1e5d0b

File tree

1,201 files changed

+19280
-11982
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,201 files changed

+19280
-11982
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

android/libs/Android.mk

+126
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
LOCAL_PATH := $(call my-dir)
2+
3+
include $(CLEAR_VARS)
4+
LOCAL_MODULE := cocos_zlib_static
5+
LOCAL_MODULE_FILENAME := zlib
6+
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libz.a
7+
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include
8+
include $(PREBUILT_STATIC_LIBRARY)
9+
10+
LOCAL_PATH := $(call my-dir)
11+
12+
include $(CLEAR_VARS)
13+
LOCAL_MODULE := cocos_chipmunk_static
14+
LOCAL_MODULE_FILENAME := chipmunk
15+
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libchipmunk.a
16+
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include
17+
include $(PREBUILT_STATIC_LIBRARY)
18+
19+
LOCAL_PATH := $(call my-dir)
20+
21+
include $(CLEAR_VARS)
22+
LOCAL_MODULE := cocos_curl_static
23+
LOCAL_MODULE_FILENAME := curl
24+
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libcurl.a
25+
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android
26+
LOCAL_STATIC_LIBRARIES += cocos_ssl_static
27+
LOCAL_STATIC_LIBRARIES += cocos_crypto_static
28+
include $(PREBUILT_STATIC_LIBRARY)
29+
30+
include $(CLEAR_VARS)
31+
32+
LOCAL_MODULE := cocos_crypto_static
33+
LOCAL_MODULE_FILENAME := crypto
34+
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libcrypto.a
35+
include $(PREBUILT_STATIC_LIBRARY)
36+
37+
LOCAL_MODULE := cocos_ssl_static
38+
LOCAL_MODULE_FILENAME := ssl
39+
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libssl.a
40+
include $(PREBUILT_STATIC_LIBRARY)
41+
42+
LOCAL_PATH := $(call my-dir)
43+
44+
include $(CLEAR_VARS)
45+
LOCAL_MODULE := cocos_freetype2_static
46+
LOCAL_MODULE_FILENAME := freetype2
47+
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libfreetype.a
48+
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android \
49+
$(LOCAL_PATH)/../../include/android/freetype2
50+
include $(PREBUILT_STATIC_LIBRARY)
51+
52+
LOCAL_PATH := $(call my-dir)
53+
54+
include $(CLEAR_VARS)
55+
LOCAL_MODULE := cocos_jpeg_static
56+
LOCAL_MODULE_FILENAME := jpeg
57+
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libjpeg.a
58+
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android
59+
include $(PREBUILT_STATIC_LIBRARY)
60+
61+
LOCAL_PATH := $(call my-dir)
62+
63+
include $(CLEAR_VARS)
64+
LOCAL_MODULE := cocos_png_static
65+
LOCAL_MODULE_FILENAME := png
66+
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libpng.a
67+
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android
68+
include $(PREBUILT_STATIC_LIBRARY)
69+
70+
LOCAL_PATH := $(call my-dir)
71+
72+
include $(CLEAR_VARS)
73+
LOCAL_MODULE := spidermonkey_static
74+
LOCAL_MODULE_FILENAME := js_static
75+
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libjs_static.a
76+
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android
77+
LOCAL_CPPFLAGS := -D__STDC_LIMIT_MACROS=1 -Wno-invalid-offsetof
78+
LOCAL_EXPORT_CPPFLAGS := -D__STDC_LIMIT_MACROS=1 -Wno-invalid-offsetof
79+
include $(PREBUILT_STATIC_LIBRARY)
80+
81+
LOCAL_PATH := $(call my-dir)
82+
83+
include $(CLEAR_VARS)
84+
LOCAL_MODULE := cocos_tiff_static
85+
LOCAL_MODULE_FILENAME := tiff
86+
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libtiff.a
87+
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android
88+
include $(PREBUILT_STATIC_LIBRARY)
89+
90+
LOCAL_PATH := $(call my-dir)
91+
92+
include $(CLEAR_VARS)
93+
LOCAL_MODULE := cocos_webp_static
94+
LOCAL_MODULE_FILENAME := webp
95+
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libwebp.a
96+
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android
97+
98+
LOCAL_WHOLE_STATIC_LIBRARIES := cpufeatures
99+
100+
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
101+
LOCAL_CFLAGS := -DHAVE_NEON=1
102+
endif
103+
104+
include $(PREBUILT_STATIC_LIBRARY)
105+
106+
$(call import-module, android/cpufeatures)
107+
108+
LOCAL_PATH := $(call my-dir)
109+
110+
include $(CLEAR_VARS)
111+
LOCAL_MODULE := websockets_static
112+
LOCAL_MODULE_FILENAME := libwebsockets_static
113+
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libwebsockets.a
114+
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include/android
115+
LOCAL_CPPFLAGS := -D__STDC_LIMIT_MACROS=1
116+
LOCAL_EXPORT_CPPFLAGS := -D__STDC_LIMIT_MACROS=1
117+
include $(PREBUILT_STATIC_LIBRARY)
118+
119+
LOCAL_PATH := $(call my-dir)
120+
121+
include $(CLEAR_VARS)
122+
LOCAL_MODULE := luajit_static
123+
LOCAL_MODULE_FILENAME := libluajit
124+
LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libluajit.a
125+
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../include
126+
include $(PREBUILT_STATIC_LIBRARY)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

chipmunk/prebuilt/android/Android.mk

-8
This file was deleted.

chipmunk/prebuilt/ios/libchipmunk.a

-747 KB
Binary file not shown.

0 commit comments

Comments
 (0)