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 #144 from hevey/master
[pcsx_rearmed.git]
/
Makefile.libretro
diff --git
a/Makefile.libretro
b/Makefile.libretro
index
a7fa0eb
..
de818aa
100644
(file)
--- a/
Makefile.libretro
+++ b/
Makefile.libretro
@@
-22,6
+22,10
@@
CC_AS ?= $(CC)
CFLAGS ?=
TARGET_NAME := pcsx_rearmed
CFLAGS ?=
TARGET_NAME := pcsx_rearmed
+GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
+ifneq ($(GIT_VERSION)," unknown")
+ CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
+endif
LIBZ := -lz
LIBPTHREAD := -lpthread
LIBDL := -ldl
LIBZ := -lz
LIBPTHREAD := -lpthread
LIBDL := -ldl
@@
-49,6
+53,13
@@
else ifeq ($(platform), osx)
fpic += -mmacosx-version-min=10.1
# iOS
fpic += -mmacosx-version-min=10.1
# iOS
+else ifeq ($(platform),$(filter $(platform),ios9 ios-arm64))
+ ARCH := arm64
+ USE_DYNAREC = 0
+ HAVE_NEON = 0
+ BUILTIN_GPU = peops
+ TARGET := $(TARGET_NAME)_libretro_ios.dylib
+
else ifneq (,$(findstring ios,$(platform)))
ARCH := arm
USE_DYNAREC ?= 1
else ifneq (,$(findstring ios,$(platform)))
ARCH := arm
USE_DYNAREC ?= 1
@@
-151,8
+162,9
@@
else ifeq ($(platform), ctr)
# CFLAGS += -DPCSX
# BUILTIN_GPU = unai
USE_DYNAREC = 1
# CFLAGS += -DPCSX
# BUILTIN_GPU = unai
USE_DYNAREC = 1
- DRC_CACHE_BASE =
1
+ DRC_CACHE_BASE =
0
ARCH = arm
ARCH = arm
+ HAVE_NEON = 0
STATIC_LINKING = 1
STATIC_LINKING = 1
@@
-248,8
+260,10
@@
else ifneq (,$(findstring armv,$(platform)))
# Windows
else
TARGET := $(TARGET_NAME)_libretro.dll
# Windows
else
TARGET := $(TARGET_NAME)_libretro.dll
+ BUILTIN_GPU = peops
+ PLATFORM = libretro
MAIN_LDFLAGS += -static-libgcc -static-libstdc++ -s
MAIN_LDFLAGS += -static-libgcc -static-libstdc++ -s
- CFLAGS += -D__WIN32__
+ CFLAGS += -D__WIN32__
-DNO_DYLIB
MMAP_WIN32=1
MAIN_LDLIBS += -lws2_32
LIBPTHREAD :=
MMAP_WIN32=1
MAIN_LDLIBS += -lws2_32
LIBPTHREAD :=