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
Generate dynarec AND interpreter on iOS (with single invocation!)
[pcsx_rearmed.git]
/
Makefile.libretro
diff --git
a/Makefile.libretro
b/Makefile.libretro
index
d566e23
..
1efb7f9
100644
(file)
--- a/
Makefile.libretro
+++ b/
Makefile.libretro
@@
-20,8
+20,12
@@
CC_AS ?= $(CC)
CFLAGS ?=
TARGET_NAME := pcsx_rearmed
CFLAGS ?=
TARGET_NAME := pcsx_rearmed
-
+LIBM := -lm
+LIBZ := -lz
+LIBPTHREAD := -lpthread
+LIBDL := -ldl
MMAP_WIN32=0
MMAP_WIN32=0
+EXTRA_LDFLAGS =
# Unix
ifeq ($(platform), unix)
# Unix
ifeq ($(platform), unix)
@@
-29,6
+33,15
@@
ifeq ($(platform), unix)
fpic := -fPIC
SHARED := -shared -Wl,--version-script=libretro/link.T
fpic := -fPIC
SHARED := -shared -Wl,--version-script=libretro/link.T
+else ifeq ($(platform), linux-portable)
+ TARGET := $(TARGET_NAME)_libretro.so
+ fpic := -fPIC -nostdlib
+ EXTRA_LDFLAGS += -fPIC -nostdlib
+ LIBM :=
+ LIBZ :=
+ LIBPTHREAD :=
+ LIBDL :=
+ SHARED := -shared -Wl,--version-script=libretro/link.T
# OS X
else ifeq ($(platform), osx)
TARGET := $(TARGET_NAME)_libretro.dylib
# OS X
else ifeq ($(platform), osx)
TARGET := $(TARGET_NAME)_libretro.dylib
@@
-43,12
+56,17
@@
else ifeq ($(platform), osx)
# iOS
else ifeq ($(platform), ios)
ARCH := arm
# iOS
else ifeq ($(platform), ios)
ARCH := arm
+ USE_DYNAREC ?= 1
TARGET := $(TARGET_NAME)_libretro_ios.dylib
TARGET := $(TARGET_NAME)_libretro_ios.dylib
+ifeq ($(USE_DYNAREC),0)
+ # Override
+ TARGET := $(TARGET_NAME)_interpreter_libretro_ios.dylib
+endif
fpic := -fPIC
SHARED := -dynamiclib
ifeq ($(IOSSDK),)
fpic := -fPIC
SHARED := -dynamiclib
ifeq ($(IOSSDK),)
- IOSSDK := $(shell xc
run -sdk iphoneos -show-sdk-p
ath)
+ IOSSDK := $(shell xc
odebuild -version -sdk iphoneos P
ath)
endif
CC = clang -arch armv7 -isysroot $(IOSSDK)
endif
CC = clang -arch armv7 -isysroot $(IOSSDK)
@@
-58,7
+76,6
@@
else ifeq ($(platform), ios)
ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
HAVE_NEON = 1
BUILTIN_GPU = neon
ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
HAVE_NEON = 1
BUILTIN_GPU = neon
- USE_DYNAREC = 1
CFLAGS += -DIOS
OSXVER = `sw_vers -productVersion | cut -d. -f 2`
OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
CFLAGS += -DIOS
OSXVER = `sw_vers -productVersion | cut -d. -f 2`
OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
@@
-175,12
+192,11
@@
CFLAGS += -fPIC
ifeq ($(platform),win)
MAIN_LDLIBS += -lws2_32
else ifneq ($(platform),qnx)
ifeq ($(platform),win)
MAIN_LDLIBS += -lws2_32
else ifneq ($(platform),qnx)
- LDLIBS +=
-lpthread
- MAIN_LDLIBS +=
-ldl
+ LDLIBS +=
$(LIBPHTREAD)
+ MAIN_LDLIBS +=
$(LIBDL)
endif
MAIN_LDFLAGS += -shared
endif
MAIN_LDFLAGS += -shared
-MAIN_LDLIBS += -lm -lz
-EXTRA_LDFLAGS =
+MAIN_LDLIBS += $(LIBM) $(LIBZ)
TARGET ?= libretro.so
PLATFORM = libretro
TARGET ?= libretro.so
PLATFORM = libretro
@@
-189,6
+205,14
@@
SOUND_DRIVERS = libretro
PLUGINS =
NO_CONFIG_MAK = yes
PLUGINS =
NO_CONFIG_MAK = yes
+libretro_all: all
+ifeq ($(platform),ios)
+ifeq ($(USE_DYNAREC),1)
+ make -f Makefile.libretro USE_DYNAREC=0 platform=$(platform) clean
+ make -f Makefile.libretro USE_DYNAREC=0 platform=$(platform)
+endif
+endif
+
include Makefile
# no special AS needed for gpu_neon
include Makefile
# no special AS needed for gpu_neon