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 #187 from jdgleaver/negcon-response
[pcsx_rearmed.git]
/
Makefile.libretro
diff --git
a/Makefile.libretro
b/Makefile.libretro
index
b085912
..
0544aab
100644
(file)
--- a/
Makefile.libretro
+++ b/
Makefile.libretro
@@
-28,7
+28,11
@@
ifneq ($(GIT_VERSION)," unknown")
endif
LIBZ := -lz
LIBPTHREAD := -lpthread
endif
LIBZ := -lz
LIBPTHREAD := -lpthread
+ifneq ($(findstring Haiku,$(shell uname -s)),)
+LIBDL := -lroot -lnetwork
+else
LIBDL := -ldl
LIBDL := -ldl
+endif
MMAP_WIN32=0
EXTRA_LDFLAGS =
MMAP_WIN32=0
EXTRA_LDFLAGS =
@@
-36,6
+40,9
@@
EXTRA_LDFLAGS =
ifeq ($(platform), unix)
TARGET := $(TARGET_NAME)_libretro.so
fpic := -fPIC
ifeq ($(platform), unix)
TARGET := $(TARGET_NAME)_libretro.so
fpic := -fPIC
+ifneq ($(findstring SunOS,$(shell uname -s)),)
+ CC = gcc
+endif
else ifeq ($(platform), linux-portable)
TARGET := $(TARGET_NAME)_libretro.so
else ifeq ($(platform), linux-portable)
TARGET := $(TARGET_NAME)_libretro.so
@@
-236,6
+243,10
@@
else ifneq (,$(findstring armv,$(platform)))
ifneq (,$(findstring cortexa8,$(platform)))
CFLAGS += -marm -mcpu=cortex-a8
ASFLAGS += -mcpu=cortex-a8
ifneq (,$(findstring cortexa8,$(platform)))
CFLAGS += -marm -mcpu=cortex-a8
ASFLAGS += -mcpu=cortex-a8
+ else ifneq (,$(findstring cortexa7,$(platform)))
+ CFLAGS += -marm -mcpu=cortex-a7
+ ASFLAGS += -mcpu=cortex-a7
+ LIBZ :=
else ifneq (,$(findstring cortexa9,$(platform)))
CFLAGS += -marm -mcpu=cortex-a9
ASFLAGS += -mcpu=cortex-a9
else ifneq (,$(findstring cortexa9,$(platform)))
CFLAGS += -marm -mcpu=cortex-a9
ASFLAGS += -mcpu=cortex-a9