diff --git a/android/phoenix/jni/Android.mk b/android/phoenix/jni/Android.mk index 21b16cb04b..e854d8c5ab 100644 --- a/android/phoenix/jni/Android.mk +++ b/android/phoenix/jni/Android.mk @@ -55,6 +55,7 @@ else endif LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -fno-stack-protector -funroll-loops -DNDEBUG -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER -DHAVE_FILTERS_BUILTIN +#LOCAL_CFLAGS += -DHAVE_7ZIP -DHAVE_COMPRESSION -D_7ZIP_ST LOCAL_CFLAGS += -O2 diff --git a/decompress/7zip_support.c b/decompress/7zip_support.c index 39af856183..6eb4dacccc 100644 --- a/decompress/7zip_support.c +++ b/decompress/7zip_support.c @@ -156,7 +156,7 @@ static SRes ConvertUtf16toCharString(const UInt16 *s, char *outstring) // Extract the relative path relative_path from a 7z archive archive_path and allocate a buf for it to write it in. -long read_7zip_file(const char * archive_path, const char *relative_path, void **buf) +int read_7zip_file(const char * archive_path, const char *relative_path, void **buf) { CFileInStream archiveStream; CLookToRead lookStream; diff --git a/decompress/7zip_support.h b/decompress/7zip_support.h index ab30c8c669..d08d5031cc 100644 --- a/decompress/7zip_support.h +++ b/decompress/7zip_support.h @@ -20,7 +20,8 @@ extern "C" { #endif -long read_7zip_file(const char * archive_path, const char *relative_path, void **buf); +int read_7zip_file(const char * archive_path, + const char *relative_path, void **buf); #ifdef __cplusplus }