From 0402f91ee1cbf3459475b83ae1af0cf4c0f77c8c Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 14 Sep 2014 04:50:10 +0200
Subject: [PATCH] Move zlib to Makefile.common too

---
 Makefile            | 15 ---------------
 Makefile.common     | 46 +++++++++++++++++++++++++++++++++++++++++++++
 Makefile.emscripten | 29 ----------------------------
 Makefile.win        | 20 --------------------
 4 files changed, 46 insertions(+), 64 deletions(-)

diff --git a/Makefile b/Makefile
index 23b87b0fa5..2ae5c408ed 100644
--- a/Makefile
+++ b/Makefile
@@ -40,21 +40,6 @@ ifeq ($(HAVE_DYLIB), 1)
    LIBS += $(DYLIB_LIB)
 endif
 
-ifeq ($(HAVE_ZLIB), 1)
-   HAVE_COMPRESSION = 1 
-   ZLIB_OBJS =	deps/rzlib/unzip.o \
-		deps/rzlib/ioapi.o 
-   OBJ += gfx/rpng/rpng.o file_extract.o decompress/zip_support.o
-   OBJ += $(ZLIB_OBJS)
-   JOYCONFIG_OBJ += decompress/zip_support.o
-   JOYCONFIG_OBJ += $(ZLIB_OBJS)
-   JOYCONFIG_LIBS += -lz
-   RETROLAUNCH_OBJ += decompress/zip_support.o
-   RETROLAUNCH_OBJ += $(ZLIB_OBJS)
-   LIBS += $(ZLIB_LIBS)
-   DEFINES += $(ZLIB_CFLAGS) -DHAVE_ZLIB_DEFLATE -DHAVE_ZLIB
-endif
-
 ifeq ($(HAVE_DYNAMIC), 1)
    LIBS += $(DYLIB_LIB)
 else
diff --git a/Makefile.common b/Makefile.common
index ba22accfae..485dfbd09f 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -508,6 +508,52 @@ ifeq ($(HAVE_7ZIP),1)
    JOYCONFIG_OBJ += $(7ZOBJ)
 endif
 
+ifeq ($(HAVE_ZLIB), 1)
+   ZLIB_OBJS =	decompress/zip_support.o 
+   OBJ += gfx/rpng/rpng.o file_extract.o
+   OBJ += $(ZLIB_OBJS)
+   RETROLAUNCH_OBJ += $(ZLIB_OBJS)
+   JOYCONFIG_OBJ += $(ZLIB_OBJS)
+   DEFINES += -DHAVE_ZLIB
+   HAVE_COMPRESSION = 1 
+   ifeq ($(WANT_MINIZ), 1)
+      DEFINES += -DWANT_MINIZ
+   else
+      LIBS += -lz
+      JOYCONFIG_LIBS += -lz
+		HAVE_ZLIB_DEFLATE = 1
+   endif
+endif
+
+ifeq ($(WANT_MINIZ),1)
+	OBJ += deps/rzlib/adler32.o \
+			 deps/rzlib/compress.o \
+			 deps/rzlib/crc32.o \
+			 deps/rzlib/deflate.o \
+			 deps/rzlib/gzclose.o \
+			 deps/rzlib/gzlib.o \
+			 deps/rzlib/gzread.o \
+			 deps/rzlib/gzwrite.o \
+			 deps/rzlib/inffast.o \
+			 deps/rzlib/inflate.o \
+			 deps/rzlib/inftrees.o \
+			 deps/rzlib/trees.o \
+			 deps/rzlib/uncompr.o \
+			 deps/rzlib/zutil.o \
+			 deps/rzlib/ioapi.o \
+			 deps/rzlib/unzip.o
+else
+ZLIB_OBJS = deps/rzlib/unzip.o deps/rzlib/ioapi.o
+OBJ += $(ZLIB_OBJS)
+RETROLAUNCH_OBJ += $(ZLIB_OBJS)
+JOYCONFIG_OBJ += $(ZLIB_OBJS)
+HAVE_ZLIB_DEFLATE = 1
+endif
+
+ifeq ($(HAVE_ZLIB_DEFLATE),1)
+DEFINES += -DHAVE_ZLIB_DEFLATE
+endif
+
 # Camera
 
 ifeq ($(HAVE_V4L2),1)
diff --git a/Makefile.emscripten b/Makefile.emscripten
index 4ede3fa1b3..5bdcce78c8 100644
--- a/Makefile.emscripten
+++ b/Makefile.emscripten
@@ -28,35 +28,6 @@ include Makefile.common
 
 libretro = libretro_emscripten.bc
 
-ifeq ($(HAVE_ZLIB), 1)
-   OBJ += gfx/rpng/rpng.o file_extract.o
-   DEFINES += -DHAVE_ZLIB
-   ifeq ($(WANT_MINIZ), 1)
-      OBJ += deps/rzlib/adler32.o \
-				 deps/rzlib/compress.o \
-				 deps/rzlib/crc32.o \
-				 deps/rzlib/deflate.o \
-				 deps/rzlib/gzclose.o \
-				 deps/rzlib/gzlib.o \
-				 deps/rzlib/gzread.o \
-				 deps/rzlib/gzwrite.o \
-				 deps/rzlib/inffast.o \
-				 deps/rzlib/inflate.o \
-				 deps/rzlib/inftrees.o \
-				 deps/rzlib/trees.o \
-				 deps/rzlib/uncompr.o \
-				 deps/rzlib/zutil.o \
-				 deps/rzlib/ioapi.o \
-				 deps/rzlib/unzip.o \
-				 decompress/zip_support.o
-      DEFINES += -DWANT_MINIZ
-   else
-      OBJ += deps/rzlib/ioapi.o deps/rzlib/unzip.o decompress/zip_support.o
-      LIBS += -lz
-      DEFINES += -DHAVE_ZLIB_DEFLATE
-   endif
-endif
-
 ifneq ($(V), 1)
    Q := @
 endif
diff --git a/Makefile.win b/Makefile.win
index 1b0fb13257..4deb7bb2f9 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -89,26 +89,6 @@ endif
 
 libretro ?= -lretro
 
-ifeq ($(HAVE_ZLIB), 1)
-   ZLIB_OBJS =	deps/rzlib/unzip.o \
-		deps/rzlib/ioapi.o \
-		decompress/zip_support.o 
-   OBJ += gfx/rpng/rpng.o file_extract.o
-   OBJ += $(ZLIB_OBJS)
-   RETROLAUNCH_OBJ += $(ZLIB_OBJS)
-   JOYCONFIG_OBJ += $(ZLIB_OBJS)
-   DEFINES += -DHAVE_ZLIB
-   HAVE_COMPRESSION = 1 
-   ifeq ($(WANT_MINIZ), 1)
-      OBJ += deps/miniz/miniz.o
-      DEFINES += -DWANT_MINIZ
-   else
-      LIBS += -lz
-      JOYCONFIG_LIBS += -lz
-      DEFINES += -DHAVE_ZLIB_DEFLATE
-   endif
-endif
-
 ifeq ($(DYNAMIC), 1)
    DEFINES += -DHAVE_DYNAMIC
 else