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
gpu_neon: rework buffer selection
[pcsx_rearmed.git]
/
jni
/
Android.mk
diff --git
a/jni/Android.mk
b/jni/Android.mk
index
501b067
..
856cb3a
100644
(file)
--- a/
jni/Android.mk
+++ b/
jni/Android.mk
@@
-19,7
+19,7
@@
UNAI_DIR := $(ROOT_DIR)/plugins/gpu_unai
PEOPS_DIR := $(ROOT_DIR)/plugins/dfxvideo
DYNAREC_DIR := $(ROOT_DIR)/libpcsxcore/new_dynarec
DEPS_DIR := $(ROOT_DIR)/deps
PEOPS_DIR := $(ROOT_DIR)/plugins/dfxvideo
DYNAREC_DIR := $(ROOT_DIR)/libpcsxcore/new_dynarec
DEPS_DIR := $(ROOT_DIR)/deps
-LIBRETRO_COMMON := $(
ROOT
_DIR)/libretro-common
+LIBRETRO_COMMON := $(
DEPS
_DIR)/libretro-common
EXTRA_INCLUDES :=
# core
EXTRA_INCLUDES :=
# core
@@
-93,7
+93,7
@@
SOURCES_C += \
SOURCES_ASM :=
COREFLAGS := -ffast-math -funroll-loops -DHAVE_LIBRETRO -DNO_FRONTEND -DFRONTEND_SUPPORTS_RGB565 -DANDROID -DREARMED
SOURCES_ASM :=
COREFLAGS := -ffast-math -funroll-loops -DHAVE_LIBRETRO -DNO_FRONTEND -DFRONTEND_SUPPORTS_RGB565 -DANDROID -DREARMED
-COREFLAGS += -DHAVE_CHD -D_7ZIP_ST
+COREFLAGS += -D
P_HAVE_MMAP=1 -DP_HAVE_PTHREAD=1 -DP_HAVE_POSIX_MEMALIGN=1 -D
HAVE_CHD -D_7ZIP_ST
ifeq ($(USE_LIBRETRO_VFS),1)
SOURCES_C += \
ifeq ($(USE_LIBRETRO_VFS),1)
SOURCES_C += \
@@
-113,6
+113,7
@@
endif
HAVE_ARI64=0
HAVE_LIGHTREC=0
LIGHTREC_CUSTOM_MAP=0
HAVE_ARI64=0
HAVE_LIGHTREC=0
LIGHTREC_CUSTOM_MAP=0
+LIGHTREC_THREADED_COMPILER=0
HAVE_GPU_NEON=0
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
HAVE_ARI64=1
HAVE_GPU_NEON=0
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
HAVE_ARI64=1
@@
-132,6
+133,7
@@
else
COREFLAGS += -DDRC_DISABLE
endif
COREFLAGS += -DLIGHTREC_CUSTOM_MAP=$(LIGHTREC_CUSTOM_MAP)
COREFLAGS += -DDRC_DISABLE
endif
COREFLAGS += -DLIGHTREC_CUSTOM_MAP=$(LIGHTREC_CUSTOM_MAP)
+ COREFLAGS += -DLIGHTREC_ENABLE_THREADED_COMPILER=$(LIGHTREC_THREADED_COMPILER)
ifeq ($(HAVE_ARI64),1)
SOURCES_C += $(DYNAREC_DIR)/new_dynarec.c \
ifeq ($(HAVE_ARI64),1)
SOURCES_C += $(DYNAREC_DIR)/new_dynarec.c \
@@
-145,6
+147,7
@@
ifeq ($(HAVE_ARI64),1)
endif
endif
SOURCES_C += $(DYNAREC_DIR)/emu_if.c
endif
endif
SOURCES_C += $(DYNAREC_DIR)/emu_if.c
+ SOURCES_C += $(DYNAREC_DIR)/events.c
ifeq ($(HAVE_LIGHTREC),1)
COREFLAGS += -DLIGHTREC -DLIGHTREC_STATIC
ifeq ($(HAVE_LIGHTREC),1)
COREFLAGS += -DLIGHTREC -DLIGHTREC_STATIC
@@
-154,6
+157,7
@@
ifeq ($(HAVE_LIGHTREC),1)
$(ROOT_DIR)/include/lightning \
$(ROOT_DIR)/include/lightrec
SOURCES_C += $(DEPS_DIR)/lightrec/blockcache.c \
$(ROOT_DIR)/include/lightning \
$(ROOT_DIR)/include/lightrec
SOURCES_C += $(DEPS_DIR)/lightrec/blockcache.c \
+ $(DEPS_DIR)/lightrec/constprop.c \
$(DEPS_DIR)/lightrec/disassembler.c \
$(DEPS_DIR)/lightrec/emitter.c \
$(DEPS_DIR)/lightrec/interpreter.c \
$(DEPS_DIR)/lightrec/disassembler.c \
$(DEPS_DIR)/lightrec/emitter.c \
$(DEPS_DIR)/lightrec/interpreter.c \