From: Twinaphex <libretro@gmail.com>
Date: Tue, 5 Aug 2014 00:27:31 +0000 (+0200)
Subject: Merge pull request #2 from sergiobenrocha2/master
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d84817550ac064fbba7ee718fb3baeda7d5546da;hp=2edc89c4fd3fa57de4ea0f48da74659ab8de1b1b;p=picodrive.git

Merge pull request #2 from sergiobenrocha2/master

Libretro core should use zlib from the system, in linux build.
---

diff --git a/Makefile.libretro b/Makefile.libretro
index 6e43abcf..640fecf5 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -36,6 +36,7 @@ asm_mix = 0
 ifeq ($(platform), unix)
    TARGET := $(TARGET_NAME)_libretro.so
    SHARED := -shared
+   DONT_COMPILE_IN_ZLIB = 1
 else ifeq ($(platform), osx)
    TARGET := $(TARGET_NAME)_libretro.dylib
    SHARED := -dynamiclib