notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #235 from retro-wertz/core_fixes
[pcsx_rearmed.git]
/
Makefile.libretro
diff --git
a/Makefile.libretro
b/Makefile.libretro
index
11093b5
..
28a47fd
100644
(file)
--- a/
Makefile.libretro
+++ b/
Makefile.libretro
@@
-1,6
+1,7
@@
# Makefile for PCSX ReARMed (libretro)
DEBUG=0
# Makefile for PCSX ReARMed (libretro)
DEBUG=0
+WANT_ZLIB=1
ifeq ($(platform),)
platform = unix
ifeq ($(platform),)
platform = unix
@@
-26,13
+27,16
@@
GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
ifneq ($(GIT_VERSION)," unknown")
CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
endif
ifneq ($(GIT_VERSION)," unknown")
CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
endif
+ifneq ($(WANT_ZLIB),1)
LIBZ := -lz
LIBZ := -lz
+endif
LIBPTHREAD := -lpthread
ifneq ($(findstring Haiku,$(shell uname -s)),)
LIBDL := -lroot -lnetwork
else
LIBDL := -ldl
endif
LIBPTHREAD := -lpthread
ifneq ($(findstring Haiku,$(shell uname -s)),)
LIBDL := -lroot -lnetwork
else
LIBDL := -ldl
endif
+LIBM := -lm
MMAP_WIN32=0
EXTRA_LDFLAGS =
MMAP_WIN32=0
EXTRA_LDFLAGS =
@@
-51,6
+55,7
@@
else ifeq ($(platform), linux-portable)
LIBZ :=
LIBPTHREAD :=
LIBDL :=
LIBZ :=
LIBPTHREAD :=
LIBDL :=
+ LIBM :=
NO_UNDEF_CHECK = 1
# OS X
NO_UNDEF_CHECK = 1
# OS X
@@
-212,6
+217,7
@@
else ifeq ($(platform), qnx)
MAIN_LDLIBS += -lsocket
LIBPTHREAD :=
LIBDL :=
MAIN_LDLIBS += -lsocket
LIBPTHREAD :=
LIBDL :=
+ LIBM :=
#Raspberry Pi 2
else ifeq ($(platform), rpi2)
#Raspberry Pi 2
else ifeq ($(platform), rpi2)
@@
-314,11
+320,12
@@
else
MAIN_LDLIBS += -lws2_32
LIBPTHREAD :=
LIBDL :=
MAIN_LDLIBS += -lws2_32
LIBPTHREAD :=
LIBDL :=
+ LIBM :=
endif
CFLAGS += $(fpic)
MAIN_LDFLAGS += -shared
endif
CFLAGS += $(fpic)
MAIN_LDFLAGS += -shared
-MAIN_LDLIBS += $(LIBPTHREAD) $(LIBDL) $(LIBZ)
+MAIN_LDLIBS += $(LIBPTHREAD) $(LIB
M) $(LIB
DL) $(LIBZ)
# try to autodetect stuff for the lazy
ifndef ARCH
# try to autodetect stuff for the lazy
ifndef ARCH