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
cdrom: some debugging aid
[pcsx_rearmed.git]
/
jni
/
Android.mk
diff --git
a/jni/Android.mk
b/jni/Android.mk
index
ce9762a
..
682e407
100644
(file)
--- a/
jni/Android.mk
+++ b/
jni/Android.mk
@@
-16,6
+16,7
@@
INPUT_DIR := $(ROOT_DIR)/plugins/dfinput
FRONTEND_DIR := $(ROOT_DIR)/frontend
NEON_DIR := $(ROOT_DIR)/plugins/gpu_neon
UNAI_DIR := $(ROOT_DIR)/plugins/gpu_unai
FRONTEND_DIR := $(ROOT_DIR)/frontend
NEON_DIR := $(ROOT_DIR)/plugins/gpu_neon
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
LIBRETRO_COMMON := $(ROOT_DIR)/libretro-common
DYNAREC_DIR := $(ROOT_DIR)/libpcsxcore/new_dynarec
DEPS_DIR := $(ROOT_DIR)/deps
LIBRETRO_COMMON := $(ROOT_DIR)/libretro-common
@@
-111,6
+112,7
@@
endif
HAVE_ARI64=0
HAVE_LIGHTREC=0
HAVE_ARI64=0
HAVE_LIGHTREC=0
+LIGHTREC_CUSTOM_MAP=0
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
HAVE_ARI64=1
else ifeq ($(TARGET_ARCH_ABI),armeabi)
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
HAVE_ARI64=1
else ifeq ($(TARGET_ARCH_ABI),armeabi)
@@
-124,6
+126,7
@@
else ifeq ($(TARGET_ARCH_ABI),x86)
else
COREFLAGS += -DDRC_DISABLE
endif
else
COREFLAGS += -DDRC_DISABLE
endif
+ COREFLAGS += -DLIGHTREC_CUSTOM_MAP=$(LIGHTREC_CUSTOM_MAP)
ifeq ($(HAVE_ARI64),1)
SOURCES_C += $(DYNAREC_DIR)/new_dynarec.c \
ifeq ($(HAVE_ARI64),1)
SOURCES_C += $(DYNAREC_DIR)/new_dynarec.c \
@@
-142,6
+145,7
@@
ifeq ($(HAVE_LIGHTREC),1)
COREFLAGS += -DLIGHTREC -DLIGHTREC_STATIC
EXTRA_INCLUDES += $(DEPS_DIR)/lightning/include \
$(DEPS_DIR)/lightrec \
COREFLAGS += -DLIGHTREC -DLIGHTREC_STATIC
EXTRA_INCLUDES += $(DEPS_DIR)/lightning/include \
$(DEPS_DIR)/lightrec \
+ $(DEPS_DIR)/lightrec/tlsf \
$(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 \
@@
-161,24
+165,34
@@
ifeq ($(HAVE_LIGHTREC),1)
$(DEPS_DIR)/lightning/lib/jit_print.c \
$(DEPS_DIR)/lightning/lib/jit_size.c \
$(DEPS_DIR)/lightning/lib/lightning.c
$(DEPS_DIR)/lightning/lib/jit_print.c \
$(DEPS_DIR)/lightning/lib/jit_size.c \
$(DEPS_DIR)/lightning/lib/lightning.c
- SOURCES_C += $(CORE_DIR)/lightrec/plugin.c
+ SOURCES_C += $(CORE_DIR)/lightrec/plugin.c $(DEPS_DIR)/lightrec/tlsf/tlsf.c
+ifeq ($(LIGHTREC_CUSTOM_MAP),1)
+ SOURCES_C += $(CORE_DIR)/lightrec/mem.c
+endif
endif
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
COREFLAGS += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP -DGPU_NEON
endif
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
COREFLAGS += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP -DGPU_NEON
+ COREFLAGS += -DHAVE_bgr555_to_rgb565 -DHAVE_bgr888_to_x
SOURCES_ASM += $(CORE_DIR)/gte_neon.S \
$(NEON_DIR)/psx_gpu/psx_gpu_arm_neon.S \
$(FRONTEND_DIR)/cspace_neon.S
SOURCES_C += $(NEON_DIR)/psx_gpu_if.c
else ifeq ($(TARGET_ARCH_ABI),armeabi)
SOURCES_ASM += $(CORE_DIR)/gte_neon.S \
$(NEON_DIR)/psx_gpu/psx_gpu_arm_neon.S \
$(FRONTEND_DIR)/cspace_neon.S
SOURCES_C += $(NEON_DIR)/psx_gpu_if.c
else ifeq ($(TARGET_ARCH_ABI),armeabi)
- COREFLAGS += -DUSE_GPULIB=1 -DGPU_UNAI
+ COREFLAGS += -DUSE_GPULIB=1 -DGPU_UNAI
+ COREFLAGS += -DHAVE_bgr555_to_rgb565
SOURCES_ASM += $(UNAI_DIR)/gpu_arm.S \
$(FRONTEND_DIR)/cspace_arm.S
SOURCES_C += $(UNAI_DIR)/gpulib_if.cpp
SOURCES_ASM += $(UNAI_DIR)/gpu_arm.S \
$(FRONTEND_DIR)/cspace_arm.S
SOURCES_C += $(UNAI_DIR)/gpulib_if.cpp
+else ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
+ COREFLAGS += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP
+ COREFLAGS += -DGPU_NEON -DSIMD_BUILD
+ SOURCES_C += $(NEON_DIR)/psx_gpu_if.c \
+ $(NEON_DIR)/psx_gpu/psx_gpu_simd.c
else
else
- COREFLAGS += -
DUSE_GPULIB=1 -DGPU_UNAI
- SOURCES_C += $(
UNAI_DIR)/gpulib_if.cpp
+ COREFLAGS += -
fno-strict-aliasing -DGPU_PEOPS
+ SOURCES_C += $(
PEOPS_DIR)/gpulib_if.c
endif
GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
endif
GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"