* No more zlib dependency for libretro port

* Fixed Android build

src/drivers/libretro/crc32-zlib.c

@@ -5,8 +5,6 @@
 extern "C" {
 #endif
 
-#ifdef HAVE_EXTERNAL_ZLIB
-
 static const unsigned long crc_table[256] = {
   0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
   0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
@@ -82,8 +80,6 @@ unsigned long crc32(unsigned long crc, const unsigned char *buf, unsigned int le
 	return crc ^ 0xffffffffL;
 }
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif

src/drivers/libretro/fceu/input.c

@@ -24,7 +24,7 @@
 #include "x6502.h"
 
 #include "fceu.h"
-
+#include "netplay.h"
 #include "input.h"
 #include "vsuni.h"
 #include "fds.h"

src/drivers/libretro/griffin.c

@@ -2,6 +2,7 @@
 
 #include "drivers/libretro/libretro.c"
 #include "drivers/libretro/memstream.c"
+#include "drivers/libretro/crc32-zlib.c"
 
 #include "cart.c"
 #include "cheat.c"

src/drivers/libretro/jni/Android.mk

@@ -19,13 +19,13 @@ FCEU_DIR := ../../..
 LIBRETRO_DIR := ..
 
 LOCAL_MODULE    := retro
-FCEU_SRC_DIRS := $(FCEU_DIR) $(FCEU_DIR)/boards $(FCEU_DIR)/input $(FCEU_DIR)/mappers $(FCEU_DIR)/zlib
+FCEU_SRC_DIRS := $(FCEU_DIR)/boards $(FCEU_DIR)/input $(FCEU_DIR)/mappers
 
 FCEU_SRC_FILES := $(foreach dir,$(FCEU_SRC_DIRS),$(wildcard $(dir)/*.c))
 
-LOCAL_SRC_FILES  = $(LIBRETRO_DIR)/libretro.c $(LIBRETRO_DIR)/memstream.c $(FCEU_SRC_FILES)
+LOCAL_SRC_FILES  = $(LIBRETRO_DIR)/griffin.c $(FCEU_DIR)/ines.c $(FCEU_DIR)/unif.c $(FCEU_DIR)/x6502.c $(FCEU_SRC_FILES)
 
-LOCAL_CFLAGS += -DINLINE=inline -DSOUND_QUALITY=0 -DPSS_STYLE=1 -DLSB_FIRST -D__LIBRETRO__ -DHAVE_ASPRINTF -DFCEU_VERSION_NUMERIC=9813 -DFRONTEND_SUPPORTS_RGB565
+LOCAL_CFLAGS += -DWANT_GRIFFIN -DINLINE=inline -DSOUND_QUALITY=0 -DPSS_STYLE=1 -DLSB_FIRST -D__LIBRETRO__ -DHAVE_ASPRINTF -DFCEU_VERSION_NUMERIC=9813 -DFRONTEND_SUPPORTS_RGB565
 LOCAL_C_INCLUDES = $(LOCAL_PATH)/$(FCEU_DIR)
 
 include $(BUILD_SHARED_LIBRARY)

src/drivers/libretro/zlib.h

@@ -0,0 +1,4 @@
+#ifndef _ZLIB_STUB_H
+#define _ZLIB_STUB_H
+
+#endif