From fb3078b01c3ea97454dceb19dbf2ff5754dadb21 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 18 Apr 2014 19:40:45 +0200
Subject: [PATCH] * No more zlib dependency for libretro port * Fixed Android
 build

---
 Makefile.libretro                   | 19 +------------------
 src/drivers/libretro/crc32-zlib.c   |  4 ----
 src/drivers/libretro/fceu/input.c   |  2 +-
 src/drivers/libretro/griffin.c      |  1 +
 src/drivers/libretro/jni/Android.mk |  6 +++---
 src/drivers/libretro/zlib.h         |  4 ++++
 6 files changed, 10 insertions(+), 26 deletions(-)
 create mode 100644 src/drivers/libretro/zlib.h

diff --git a/Makefile.libretro b/Makefile.libretro
index c81ae01..7a231d7 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -1,5 +1,4 @@
 DEBUG = 0
-EXTERNAL_ZLIB = 0
 WANT_GRIFFIN = 0
 
 ifeq ($(platform),)
@@ -41,7 +40,6 @@ ifeq ($(platform), unix)
    fpic := -fPIC
    SHARED := -shared -Wl,--version-script=src/drivers/libretro/link.T -Wl,-no-undefined
    ENDIANNESS_DEFINES = -DLSB_FIRST -DLOCAL_LE=1
-   ZLIB_DIR := ./src/zlib
 else ifeq ($(platform), osx)
    TARGET := $(TARGET_NAME)_libretro.dylib
    fpic := -fPIC
@@ -51,13 +49,11 @@ ifneq ($(arch),ppc)
    ENDIANNESS_DEFINES = -DLSB_FIRST -DLOCAL_LE=1
 endif
    CFLAGS += -DHAVE_ASPRINTF
-   ZLIB_DIR := ./src/zlib
 else ifeq ($(platform), qnx)
    TARGET := $(TARGET_NAME)_libretro_qnx.so
    fpic := -fPIC
    SHARED := -shared -Wl,--version-script=src/drivers/libretro/link.T -Wl,-no-undefined
    ENDIANNESS_DEFINES = -DLSB_FIRST -DLOCAL_LE=1
-   ZLIB_DIR := ./src/zlib
 
 	CC = qcc -Vgcc_ntoarmv7le
 	AR = qcc -Vgcc_ntoarmv7le
@@ -68,7 +64,6 @@ else ifeq ($(platform), ios)
    SHARED := -dynamiclib
    ENDIANNESS_DEFINES = -DLSB_FIRST -DLOCAL_LE=1
    CFLAGS += -DHAVE_ASPRINTF -DIOS
-   ZLIB_DIR := ./src/zlib
    CC = clang -arch armv7 -isysroot $(IOSSDK) -miphoneos-version-min=5.0
    CFLAGS += -DIOS -miphoneos-version-min=5.0
 else ifeq ($(platform), ps3)
@@ -123,7 +118,6 @@ else ifneq (,$(findstring armv,$(platform)))
    ENDIANNESS_DEFINES = -DLSB_FIRST -DLOCAL_LE=1
    fpic := -fPIC
    CC = gcc
-   ZLIB_DIR := ./src/zlib
 ifneq (,$(findstring cortexa8,$(platform)))
    PLATFORM_DEFINES += -marm -mcpu=cortex-a8
 else ifneq (,$(findstring cortexa9,$(platform)))
@@ -145,7 +139,6 @@ else
    CC = gcc
    SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=src/drivers/libretro/link.T
    ENDIANNESS_DEFINES = -DLSB_FIRST -DLOCAL_LE=1
-   ZLIB_DIR := ./src/zlib
 endif
 
 ifeq ($(DEBUG), 1)
@@ -154,17 +147,11 @@ else
 	CFLAGS += -O3 -DNDEBUG
 endif
 
-ifeq ($(EXTERNAL_ZLIB), 1)
-	ZLIB_DIR := 
-	CFLAGS += -DHAVE_EXTERNAL_ZLIB
-	LDFLAGS += -lz
-endif
-
 LIBRETRO_DIR := ./src/drivers/libretro
 FCEU_DIR := ./src
 
 CFLAGS += -DWANT_GRIFFIN
-FCEU_SRC_DIRS := $(FCEU_DIR)/boards $(FCEU_DIR)/input $(FCEU_DIR)/mappers $(ZLIB_DIR)
+FCEU_SRC_DIRS := $(FCEU_DIR)/boards $(FCEU_DIR)/input $(FCEU_DIR)/mappers
 FCEU_CSRCS := $(foreach dir,$(FCEU_SRC_DIRS),$(wildcard $(dir)/*.c))
 FCEU_CSRCS += $(LIBRETRO_DIR)/griffin.c $(FCEU_DIR)/ines.c $(FCEU_DIR)/unif.c $(FCEU_DIR)/x6502.c
 
@@ -190,10 +177,6 @@ ifeq ($(platform), psp1)
 	INCDIRS += -I$(shell psp-config --pspsdk-path)/include
 endif
 
-ifeq ($(EXTERNAL_ZLIB), 0)
-	INCDIRS += -I$(FCEU_DIR)/zlib
-endif
-
 all: $(TARGET)
 
 $(TARGET): $(OBJS)
diff --git a/src/drivers/libretro/crc32-zlib.c b/src/drivers/libretro/crc32-zlib.c
index 362efab..6c30a9c 100644
--- a/src/drivers/libretro/crc32-zlib.c
+++ b/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
diff --git a/src/drivers/libretro/fceu/input.c b/src/drivers/libretro/fceu/input.c
index 12e051a..918d41b 100644
--- a/src/drivers/libretro/fceu/input.c
+++ b/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"
diff --git a/src/drivers/libretro/griffin.c b/src/drivers/libretro/griffin.c
index aeaf2dd..ca6c75a 100644
--- a/src/drivers/libretro/griffin.c
+++ b/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"
diff --git a/src/drivers/libretro/jni/Android.mk b/src/drivers/libretro/jni/Android.mk
index d9cf19c..7af373f 100644
--- a/src/drivers/libretro/jni/Android.mk
+++ b/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)
diff --git a/src/drivers/libretro/zlib.h b/src/drivers/libretro/zlib.h
new file mode 100644
index 0000000..6891d88
--- /dev/null
+++ b/src/drivers/libretro/zlib.h
@@ -0,0 +1,4 @@
+#ifndef _ZLIB_STUB_H
+#define _ZLIB_STUB_H
+
+#endif