diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | frontend/libretro.c | 4 | ||||
| -rw-r--r-- | frontend/libretro_core_options.h | 6 | ||||
| -rw-r--r-- | jni/Android.mk | 2 |
4 files changed, 9 insertions, 6 deletions
@@ -136,17 +136,20 @@ endif # builtin gpu OBJS += plugins/gpulib/gpu.o plugins/gpulib/vout_pl.o ifeq "$(BUILTIN_GPU)" "neon" +CFLAGS += -DGPU_NEON OBJS += plugins/gpu_neon/psx_gpu_if.o plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.o plugins/gpu_neon/psx_gpu_if.o: CFLAGS += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP plugins/gpu_neon/psx_gpu_if.o: plugins/gpu_neon/psx_gpu/*.c endif ifeq "$(BUILTIN_GPU)" "peops" +CFLAGS += -DGPU_PEOPS # note: code is not safe for strict-aliasing? (Castlevania problems) plugins/dfxvideo/gpulib_if.o: CFLAGS += -fno-strict-aliasing plugins/dfxvideo/gpulib_if.o: plugins/dfxvideo/prim.c plugins/dfxvideo/soft.c OBJS += plugins/dfxvideo/gpulib_if.o endif ifeq "$(BUILTIN_GPU)" "unai" +CFLAGS += -DGPU_UNAI OBJS += plugins/gpu_unai/gpulib_if.o ifeq "$(ARCH)" "arm" OBJS += plugins/gpu_unai/gpu_arm.o diff --git a/frontend/libretro.c b/frontend/libretro.c index 45c4c9c..e48069a 100644 --- a/frontend/libretro.c +++ b/frontend/libretro.c @@ -191,8 +191,6 @@ static void vout_set_mode(int w, int h, int raw_w, int raw_h, int bpp) previous_width = vout_width; previous_height = vout_height; - SysPrintf("setting mode width: %d height %d\n", vout_width, vout_height); - struct retro_system_av_info info; retro_get_system_av_info(&info); environ_cb(RETRO_ENVIRONMENT_SET_GEOMETRY, &info.geometry); @@ -1633,7 +1631,7 @@ static void update_variables(bool in_flight) } #endif -#ifdef DRC_DISABLE +#ifdef GPU_PEOPS var.value = "NULL"; var.key = "pcsx_rearmed_gpu_peops_fix_0"; diff --git a/frontend/libretro_core_options.h b/frontend/libretro_core_options.h index e2b557a..bdc214f 100644 --- a/frontend/libretro_core_options.h +++ b/frontend/libretro_core_options.h @@ -421,11 +421,11 @@ struct retro_core_option_definition option_defs_us[] = { }, /* GPU PEOPS OPTIONS */ -#ifdef DRC_DISABLE +#ifdef GPU_PEOPS { "pcsx_rearmed_show_gpu_peops_settings", - "Show Advance GPU Settings", - "Enable or disable various GPU fixes. A core restart might be needed for settings to take effect. NOTE: Quick Menu must be toggled for this setting to take effect.", + "Advanced GPU P.E.Op.S. Settings", + "Shows or hides advanced GPU plugin settings. NOTE: Quick Menu must be toggled for this setting to take effect.", { { "disabled", NULL }, { "enabled", NULL }, diff --git a/jni/Android.mk b/jni/Android.mk index 1051e99..2867791 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -17,6 +17,7 @@ NEON_DIR := $(ROOT_DIR)/plugins/gpu_neon UNAI_DIR := $(ROOT_DIR)/plugins/gpu_unai DYNAREC_DIR := $(ROOT_DIR)/libpcsxcore/new_dynarec DEPS_DIR := $(ROOT_DIR)/deps +LIBRETRO_COMMON := $(ROOT_DIR)/libretro-common # core SOURCES_C := $(CORE_DIR)/cdriso.c \ @@ -157,6 +158,7 @@ LOCAL_SRC_FILES := $(SOURCES_C) $(SOURCES_ASM) LOCAL_CFLAGS := $(COREFLAGS) LOCAL_C_INCLUDES := $(ROOT_DIR)/include LOCAL_C_INCLUDES += $(DEPS_DIR)/crypto $(DEPS_DIR)/flac-1.3.2/include $(DEPS_DIR)/flac-1.3.2/src/libFLAC/include $(DEPS_DIR)/lzma-16.04/C $(DEPS_DIR)/libchdr +LOCAL_C_INCLUDES += $(LIBRETRO_COMMON)/include LOCAL_LDFLAGS := -Wl,-version-script=$(FRONTEND_DIR)/link.T LOCAL_LDLIBS := -lz -llog LOCAL_ARM_MODE := arm |