Merge pull request #2 from sergiobenrocha2/master
authorTwinaphex <libretro@gmail.com>
Tue, 5 Aug 2014 00:27:31 +0000 (02:27 +0200)
committerTwinaphex <libretro@gmail.com>
Tue, 5 Aug 2014 00:27:31 +0000 (02:27 +0200)
Libretro core should use zlib from the system, in linux build.

Makefile.libretro

index 6e43abc..640fecf 100644 (file)
@@ -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