WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-24 07:06:36 +00:00
Code Issues Projects Releases Wiki Activity

Use system zlib

Browse Source
This commit is contained in:
elasota
2020-10-17 18:04:28 -04:00
parent 8031f66226
commit fbf73fd832
5 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PortabilityLayer/Android.mk
View File

@@ -11,7 +11,9 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../MacRomanConversion \
$(LOCAL_PATH)/../stb
LOCAL_CFLAGS := -DGP_DEBUG_CONFIG=0
LOCAL_CFLAGS := -DGP_DEBUG_CONFIG=0 -DGP_ZLIB_BUILTIN=1
LOCAL_EXPORT_LDLIBS := -lz
# Add your application source files here...
LOCAL_SRC_FILES := \
@@ -107,6 +109,6 @@ LOCAL_SRC_FILES := \
ZipFileProxy.cpp
LOCAL_STATIC_LIBRARIES := zlib MacRomanConversion stb
LOCAL_STATIC_LIBRARIES := MacRomanConversion stb
include $(BUILD_STATIC_LIBRARY)

4
PortabilityLayer/DeflateCodec.cpp
View File

@@ -3,7 +3,11 @@
#include "GpIOStream.h"
#include "MemoryManager.h"
#ifdef GP_ZLIB_BUILTIN
#include <zlib.h>
#else
#include "zlib.h"
#endif
namespace
{