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
Fix Travis
[pcsx_rearmed.git]
/
Makefile.libretro
diff --git
a/Makefile.libretro
b/Makefile.libretro
index
c1e4051
..
cb514b7
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
@@
-53,7
+60,7
@@
else ifeq ($(platform), osx)
fpic += -mmacosx-version-min=10.1
# iOS
fpic += -mmacosx-version-min=10.1
# iOS
-else ifeq ($(platform),$(filter $(platform),ios
9 ios
-arm64))
+else ifeq ($(platform),$(filter $(platform),ios-arm64))
ARCH := arm64
USE_DYNAREC = 0
HAVE_NEON = 0
ARCH := arm64
USE_DYNAREC = 0
HAVE_NEON = 0
@@
-66,7
+73,7
@@
else ifneq (,$(findstring ios,$(platform)))
HAVE_NEON = 1
BUILTIN_GPU = neon
TARGET := $(TARGET_NAME)_libretro_ios.dylib
HAVE_NEON = 1
BUILTIN_GPU = neon
TARGET := $(TARGET_NAME)_libretro_ios.dylib
-ifeq ($(USE_DYNAREC),
0
)
+ifeq ($(USE_DYNAREC),
1
)
# Override
TARGET := $(TARGET_NAME)_interpreter_libretro_ios.dylib
endif
# Override
TARGET := $(TARGET_NAME)_interpreter_libretro_ios.dylib
endif
@@
-160,7
+167,7
@@
else ifeq ($(platform), ctr)
CFLAGS += -Werror=implicit-function-declaration
# CFLAGS += -DPCSX
CFLAGS += -Werror=implicit-function-declaration
# CFLAGS += -DPCSX
-
#
BUILTIN_GPU = unai
+
BUILTIN_GPU = unai
USE_DYNAREC = 1
DRC_CACHE_BASE = 0
ARCH = arm
USE_DYNAREC = 1
DRC_CACHE_BASE = 0
ARCH = arm
@@
-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