File tree 26 files changed +39
-35
lines changed
26 files changed +39
-35
lines changed Original file line number Diff line number Diff line change 38
38
MY_HEADER_SEARCH_PATHS += $(MY_MOAI_ROOT)/src/moaicore
39
39
MY_HEADER_SEARCH_PATHS += $(MY_MOAI_ROOT)/src/moaiext-untz
40
40
MY_HEADER_SEARCH_PATHS += $(MY_MOAI_ROOT)/src/uslscore
41
- MY_HEADER_SEARCH_PATHS += $(MY_MOAI_ROOT)/src/zipfs
41
+ MY_HEADER_SEARCH_PATHS += $(MY_MOAI_ROOT)/src/zlcore
42
42
MY_HEADER_SEARCH_PATHS += $(MY_MOAI_ROOT)/3rdparty
43
43
MY_HEADER_SEARCH_PATHS += $(MY_MOAI_ROOT)/3rdparty/box2d-2.2.1/
44
44
MY_HEADER_SEARCH_PATHS += $(MY_MOAI_ROOT)/3rdparty/box2d-2.2.1/Box2D
121
121
LOCAL_STATIC_LIBRARIES += libtinyxml
122
122
LOCAL_STATIC_LIBRARIES += libvorbis
123
123
LOCAL_STATIC_LIBRARIES += libogg
124
- LOCAL_STATIC_LIBRARIES += libzipfs
124
+ LOCAL_STATIC_LIBRARIES += libzlcore
125
125
126
126
include $(BUILD_SHARED_LIBRARY)
127
127
148
148
include ssl/Android.mk
149
149
include tinyxml/Android.mk
150
150
include vorbis/Android.mk
151
- include zipfs /Android.mk
151
+ include zlcore /Android.mk
152
152
153
153
include aku/Android.mk
154
154
include moaicore/Android.mk
Original file line number Diff line number Diff line change 11
11
LOCAL_MODULE := aku
12
12
LOCAL_ARM_MODE := $(MY_ARM_MODE)
13
13
LOCAL_CFLAGS := $(DISABLE_ADCOLONY) $(DISABLE_BILLING) $(DISABLE_CHARTBOOST) $(DISABLE_CRITTERCISM) $(DISABLE_FACEBOOK) $(DISABLE_NOTIFICATIONS) $(DISABLE_TAPJOY)
14
- LOCAL_CFLAGS += -include $(MY_MOAI_ROOT)/src/zipfs/zipfs_replace .h
14
+ LOCAL_CFLAGS += -include $(MY_MOAI_ROOT)/src/zlcore/zl_replace .h
15
15
16
16
LOCAL_C_INCLUDES := $(MY_HEADER_SEARCH_PATHS)
17
17
LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/src/aku/pch.cpp
Original file line number Diff line number Diff line change 8
8
9
9
LOCAL_MODULE := box2D
10
10
LOCAL_ARM_MODE := $(MY_ARM_MODE)
11
- LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zipfs/zipfs_replace .h
11
+ LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zlcore/zl_replace .h
12
12
13
13
LOCAL_C_INCLUDES := $(MY_HEADER_SEARCH_PATHS)
14
14
LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/3rdparty/box2d-2.2.1/Box2D/Collision/Shapes/b2ChainShape.cpp
Original file line number Diff line number Diff line change 8
8
9
9
LOCAL_MODULE := cares
10
10
LOCAL_ARM_MODE := $(MY_ARM_MODE)
11
- LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zipfs/zipfs_replace .h -DCARES_STATICLIB
11
+ LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zlcore/zl_replace .h -DCARES_STATICLIB
12
12
13
13
LOCAL_C_INCLUDES := $(MY_HEADER_SEARCH_PATHS)
14
14
LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/3rdparty/c-ares-1.7.5/ares__close_sockets.c
Original file line number Diff line number Diff line change 9
9
LOCAL_MODULE := chipmunk
10
10
LOCAL_ARM_MODE := $(MY_ARM_MODE)
11
11
LOCAL_CFLAGS := -std=c99
12
- LOCAL_CFLAGS += -include $(MY_MOAI_ROOT)/src/zipfs/zipfs_replace .h
12
+ LOCAL_CFLAGS += -include $(MY_MOAI_ROOT)/src/zlcore/zl_replace .h
13
13
14
14
LOCAL_C_INCLUDES := $(MY_HEADER_SEARCH_PATHS)
15
15
LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/3rdparty/chipmunk-5.3.4/src/chipmunk.c
Original file line number Diff line number Diff line change 8
8
9
9
LOCAL_MODULE := contrib
10
10
LOCAL_ARM_MODE := $(MY_ARM_MODE)
11
- LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zipfs/zipfs_replace .h
11
+ LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zlcore/zl_replace .h
12
12
13
13
LOCAL_C_INCLUDES := $(MY_HEADER_SEARCH_PATHS)
14
14
LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/3rdparty/contrib/utf8.c
Original file line number Diff line number Diff line change 14
14
LOCAL_MODULE := crypto
15
15
LOCAL_ARM_MODE := $(MY_ARM_MODE)
16
16
LOCAL_CFLAGS := -w -DL_ENDIAN -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_STORE
17
- LOCAL_CFLAGS += -include $(MY_MOAI_ROOT)/src/zipfs/zipfs_replace .h
17
+ LOCAL_CFLAGS += -include $(MY_MOAI_ROOT)/src/zlcore/zl_replace .h
18
18
19
19
LOCAL_C_INCLUDES := $(MY_MOAI_ROOT)/3rdparty/openssl-1.0.0d/include-android
20
20
LOCAL_C_INCLUDES += $(MY_MOAI_ROOT)/src
Original file line number Diff line number Diff line change 14
14
MY_HEADER_SEARCH_PATHS += $(MY_MOAI_ROOT)/3rdparty/openssl-1.0.0d/include-android
15
15
MY_HEADER_SEARCH_PATHS += $(MY_MOAI_ROOT)/src
16
16
MY_CFLAGS += -w -DL_ENDIAN -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_STORE
17
- MY_CFLAGS += -include $(MY_MOAI_ROOT)/src/zipfs/zipfs_replace .h
17
+ MY_CFLAGS += -include $(MY_MOAI_ROOT)/src/zlcore/zl_replace .h
18
18
19
19
include crypto-a/Android.mk
20
20
include crypto-b/Android.mk
Original file line number Diff line number Diff line change 9
9
LOCAL_MODULE := curl
10
10
LOCAL_ARM_MODE := $(MY_ARM_MODE)
11
11
LOCAL_CFLAGS := -DHAVE_CONFIG_H -DUSE_SSL -DUSE_SSLEAY -DUSE_OPENSSL -DBUILDING_LIBCURL
12
- LOCAL_CFLAGS += -include $(MY_MOAI_ROOT)/src/zipfs/zipfs_replace .h
12
+ LOCAL_CFLAGS += -include $(MY_MOAI_ROOT)/src/zlcore/zl_replace .h
13
13
14
14
LOCAL_C_INCLUDES := $(MY_HEADER_SEARCH_PATHS)
15
15
LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/3rdparty/curl-7.19.7/lib/file.c
Original file line number Diff line number Diff line change 9
9
LOCAL_MODULE := expat
10
10
LOCAL_ARM_MODE := $(MY_ARM_MODE)
11
11
LOCAL_CFLAGS := -DHAVE_MEMMOVE=1 -DXML_STATIC
12
- LOCAL_CFLAGS += -include $(MY_MOAI_ROOT)/src/zipfs/zipfs_replace .h
12
+ LOCAL_CFLAGS += -include $(MY_MOAI_ROOT)/src/zlcore/zl_replace .h
13
13
14
14
LOCAL_C_INCLUDES := $(MY_HEADER_SEARCH_PATHS)
15
15
LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/3rdparty/expat-2.0.1/lib/xmlparse.c
Original file line number Diff line number Diff line change 9
9
LOCAL_MODULE := freetype
10
10
LOCAL_ARM_MODE := $(MY_ARM_MODE)
11
11
LOCAL_CFLAGS := -DPIC -DFT2_BUILD_LIBRARY -DDARWIN_NO_CARBON
12
- LOCAL_CFLAGS += -include $(MY_MOAI_ROOT)/src/zipfs/zipfs_replace .h
12
+ LOCAL_CFLAGS += -include $(MY_MOAI_ROOT)/src/zlcore/zl_replace .h
13
13
14
14
LOCAL_C_INCLUDES := $(MY_HEADER_SEARCH_PATHS)
15
15
LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/3rdparty/freetype-2.4.4/src/autofit/autofit.c
Original file line number Diff line number Diff line change 8
8
9
9
LOCAL_MODULE := jpg
10
10
LOCAL_ARM_MODE := $(MY_ARM_MODE)
11
- LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zipfs/zipfs_replace .h
11
+ LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zlcore/zl_replace .h
12
12
13
13
LOCAL_C_INCLUDES := $(MY_HEADER_SEARCH_PATHS)
14
14
LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/3rdparty/jpeg-8c/jaricom.c
Original file line number Diff line number Diff line change 8
8
9
9
LOCAL_MODULE := json
10
10
LOCAL_ARM_MODE := $(MY_ARM_MODE)
11
- LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zipfs/zipfs_replace .h
11
+ LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zlcore/zl_replace .h
12
12
13
13
LOCAL_C_INCLUDES := $(MY_HEADER_SEARCH_PATHS)
14
14
LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/3rdparty/jansson-2.1/src/dump.c
Original file line number Diff line number Diff line change 8
8
9
9
LOCAL_MODULE := lua
10
10
LOCAL_ARM_MODE := $(MY_ARM_MODE)
11
- LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zipfs/zipfs_replace .h
11
+ LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zlcore/zl_replace .h
12
12
13
13
LOCAL_C_INCLUDES := $(MY_HEADER_SEARCH_PATHS)
14
14
LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/3rdparty/lua-5.1.3/src/lapi.c
Original file line number Diff line number Diff line change 8
8
9
9
LOCAL_MODULE := moaicore
10
10
LOCAL_ARM_MODE := $(MY_ARM_MODE)
11
- LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zipfs/zipfs_replace .h
11
+ LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zlcore/zl_replace .h
12
12
13
13
LOCAL_C_INCLUDES := $(MY_HEADER_SEARCH_PATHS)
14
14
LOCAL_SRC_FILES += $(wildcard $(MY_MOAI_ROOT)/src/moaicore/*.cpp)
Original file line number Diff line number Diff line change 11
11
LOCAL_MODULE := moaiext-android
12
12
LOCAL_ARM_MODE := $(MY_ARM_MODE)
13
13
LOCAL_CFLAGS := $(DISABLE_ADCOLONY) $(DISABLE_BILLING) $(DISABLE_CHARTBOOST) $(DISABLE_CRITTERCISM) $(DISABLE_FACEBOOK) $(DISABLE_NOTIFICATIONS) $(DISABLE_TAPJOY)
14
- LOCAL_CFLAGS += -include $(MY_MOAI_ROOT)/src/zipfs/zipfs_replace .h
14
+ LOCAL_CFLAGS += -include $(MY_MOAI_ROOT)/src/zlcore/zl_replace .h
15
15
16
16
LOCAL_C_INCLUDES := $(MY_HEADER_SEARCH_PATHS)
17
17
LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/src/moaiext-android/MOAIAppAndroid.cpp
Original file line number Diff line number Diff line change 8
8
9
9
LOCAL_MODULE := moaiext-luaext
10
10
LOCAL_ARM_MODE := $(MY_ARM_MODE)
11
- LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zipfs/zipfs_replace .h
11
+ LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zlcore/zl_replace .h
12
12
13
13
LOCAL_C_INCLUDES := $(MY_HEADER_SEARCH_PATHS)
14
14
LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/3rdparty/luacrypto-0.2.0/src/lcrypto.c
Original file line number Diff line number Diff line change 8
8
9
9
LOCAL_MODULE := moaiext-untz
10
10
LOCAL_ARM_MODE := $(MY_ARM_MODE)
11
- LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zipfs/zipfs_replace .h
11
+ LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zlcore/zl_replace .h
12
12
13
13
LOCAL_C_INCLUDES := $(MY_HEADER_SEARCH_PATHS)
14
14
LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/3rdparty/untz/src/AudioMixer.cpp
Original file line number Diff line number Diff line change 8
8
9
9
LOCAL_MODULE := ogg
10
10
LOCAL_ARM_MODE := $(MY_ARM_MODE)
11
- LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zipfs/zipfs_replace .h
11
+ LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zlcore/zl_replace .h
12
12
13
13
LOCAL_C_INCLUDES := $(MY_HEADER_SEARCH_PATHS)
14
14
LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/3rdparty/libogg-1.2.2/src/bitwise.c
Original file line number Diff line number Diff line change 8
8
9
9
LOCAL_MODULE := png
10
10
LOCAL_ARM_MODE := $(MY_ARM_MODE)
11
- LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zipfs/zipfs_replace .h
11
+ LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zlcore/zl_replace .h
12
12
13
13
LOCAL_C_INCLUDES := $(MY_HEADER_SEARCH_PATHS)
14
14
LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/3rdparty/lpng140/png.c
Original file line number Diff line number Diff line change 10
10
LOCAL_ARM_MODE := $(MY_ARM_MODE)
11
11
LOCAL_CFLAGS := -w -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -DSQLITE_ENABLE_COLUMN_METADATA
12
12
LOCAL_CFLAGS += -D_UNICODE -DUNICODE -D_LIB -DNDEBUG -Dfdatasync=fsync
13
- LOCAL_CFLAGS += -include $(MY_MOAI_ROOT)/src/zipfs/zipfs_replace .h
13
+ LOCAL_CFLAGS += -include $(MY_MOAI_ROOT)/src/zlcore/zl_replace .h
14
14
15
15
LOCAL_C_INCLUDES := $(MY_HEADER_SEARCH_PATHS)
16
16
LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/3rdparty/sqlite-3.6.16/sqlite3.c
Original file line number Diff line number Diff line change 9
9
LOCAL_MODULE := ssl
10
10
LOCAL_ARM_MODE := $(MY_ARM_MODE)
11
11
LOCAL_CFLAGS := -DOPENSSL_NO_DEPRECATED
12
- LOCAL_CFLAGS += -include $(MY_MOAI_ROOT)/src/zipfs/zipfs_replace .h
12
+ LOCAL_CFLAGS += -include $(MY_MOAI_ROOT)/src/zlcore/zl_replace .h
13
13
14
14
LOCAL_C_INCLUDES := $(MY_HEADER_SEARCH_PATHS)
15
15
LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/3rdparty/openssl-1.0.0d/ssl/bio_ssl.c
Original file line number Diff line number Diff line change 9
9
LOCAL_MODULE := tinyxml
10
10
LOCAL_ARM_MODE := $(MY_ARM_MODE)
11
11
LOCAL_CFLAGS := -DTIXML_USE_STL
12
- LOCAL_CFLAGS += -include $(MY_MOAI_ROOT)/src/zipfs/zipfs_replace .h
12
+ LOCAL_CFLAGS += -include $(MY_MOAI_ROOT)/src/zlcore/zl_replace .h
13
13
14
14
LOCAL_C_INCLUDES := $(MY_HEADER_SEARCH_PATHS)
15
15
LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/3rdparty/tinyxml/tinyxml.cpp
Original file line number Diff line number Diff line change 8
8
9
9
LOCAL_MODULE := uslscore
10
10
LOCAL_ARM_MODE := $(MY_ARM_MODE)
11
- LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zipfs/zipfs_replace .h
11
+ LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zlcore/zl_replace .h
12
12
13
13
LOCAL_C_INCLUDES := $(MY_HEADER_SEARCH_PATHS)
14
14
LOCAL_SRC_FILES += $(wildcard $(MY_MOAI_ROOT)/src/uslscore/*.cpp)
Original file line number Diff line number Diff line change 8
8
9
9
LOCAL_MODULE := vorbis
10
10
LOCAL_ARM_MODE := $(MY_ARM_MODE)
11
- LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zipfs/zipfs_replace .h
11
+ LOCAL_CFLAGS := -include $(MY_MOAI_ROOT)/src/zlcore/zl_replace .h
12
12
13
13
LOCAL_C_INCLUDES := $(MY_HEADER_SEARCH_PATHS)
14
14
LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/3rdparty/libvorbis-1.3.2/lib/analysis.c
Original file line number Diff line number Diff line change 6
6
7
7
include $(CLEAR_VARS)
8
8
9
- LOCAL_MODULE := zipfs
9
+ LOCAL_MODULE := zlcore
10
10
LOCAL_ARM_MODE := $(MY_ARM_MODE)
11
11
12
12
LOCAL_C_INCLUDES := $(MY_HEADER_SEARCH_PATHS)
13
- LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/src/zipfs/zipfs-pch.c
14
- LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/src/zipfs/zipfs.c
15
- LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/src/zipfs/zipfs_util.c
16
- LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/src/zipfs/zipfs_vfscanf.c
17
- LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/src/zipfs/ZIPFSString.c
18
- LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/src/zipfs/ZIPFSVirtualPath.c
19
- LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/src/zipfs/ZIPFSZipFile.c
13
+ LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/src/zlcore/zlcore-pch.cpp
14
+ LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/src/zlcore/zl_mutex.cpp
15
+ LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/src/zlcore/zl_util.cpp
16
+ LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/src/zlcore/zl_vfscanf.cpp
17
+ LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/src/zlcore/zlcore.cpp
18
+ LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/src/zlcore/ZLDirectoryItr.cpp
19
+ LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/src/zlcore/ZLFile.cpp
20
+ LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/src/zlcore/ZLFileSystem.cpp
21
+ LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/src/zlcore/ZLVirtualPath.cpp
22
+ LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/src/zlcore/ZLZipArchive.cpp
23
+ LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/src/zlcore/ZLZipStream.cpp
20
24
LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/3rdparty/tlsf-2.0/tlsf.c
21
25
22
26
LOCAL_SRC_FILES += $(MY_MOAI_ROOT)/3rdparty/zlib-1.2.3/adler32.c
You can’t perform that action at this time.
0 commit comments