notaz.gp2x.de
/
picodrive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
2edc89c
)
Merge pull request #2 from sergiobenrocha2/master
author
Twinaphex
<libretro@gmail.com>
Tue, 5 Aug 2014 00:27:31 +0000
(
02:27
+0200)
committer
Twinaphex
<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
patch
|
blob
|
blame
|
history
diff --git
a/Makefile.libretro
b/Makefile.libretro
index
6e43abc
..
640fecf
100644
(file)
--- 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