From 58bdf43a5daa646b6a1190a32f462126b3292f44 Mon Sep 17 00:00:00 2001 From: Themaister Date: Sat, 12 Jan 2013 22:32:21 +0100 Subject: [PATCH] Fix Android build. --- android/native/jni/Android.mk | 2 +- console/griffin/griffin.c | 1 + deps/rzlib/zlib.h | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/android/native/jni/Android.mk b/android/native/jni/Android.mk index f90db274af..f5a120c542 100644 --- a/android/native/jni/Android.mk +++ b/android/native/jni/Android.mk @@ -52,7 +52,7 @@ ifeq ($(PERF_TEST), 1) LOCAL_CFLAGS += -DPERF_TEST endif -LOCAL_CFLAGS += -Wall -Wno-unused-function -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DHAVE_ZLIB -DWANT_RZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREAD -D__LIBRETRO__ -DRARCH_PERFORMANCE_MODE -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99 +LOCAL_CFLAGS += -Wall -Wno-unused-function -O3 -fno-stack-protector -funroll-loops -DNDEBUG -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_VID_CONTEXT -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_GLSL -DWANT_RZLIB -DHAVE_ZLIB -DINLINE=inline -DLSB_FIRST -DHAVE_THREAD -D__LIBRETRO__ -DRARCH_PERFORMANCE_MODE -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -std=gnu99 -I../../../deps/rzlib LOCAL_LDLIBS := -L$(SYSROOT)/usr/lib -landroid -lEGL -lGLESv2 $(LOGGER_LDLIBS) -ldl diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c index 0a4627814f..8119172eef 100644 --- a/console/griffin/griffin.c +++ b/console/griffin/griffin.c @@ -130,6 +130,7 @@ VIDEO IMAGE #include "../../xdk/image.c" #elif defined(ANDROID) #include "../../gfx/image.c" +#include "../../gfx/rpng/rpng.c" #endif /*============================================================ diff --git a/deps/rzlib/zlib.h b/deps/rzlib/zlib.h index e72705ac9f..a6476f115d 100644 --- a/deps/rzlib/zlib.h +++ b/deps/rzlib/zlib.h @@ -323,6 +323,9 @@ struct inflate_blocks_state { }; +extern int inflate(z_streamp z, int f); +extern int inflateEnd(z_streamp z); + /* defines for inflate input/output */ /* update pointers and return */