try to fix win32 build

HAVE_MMAP etc clashing with libretro-common

diff --git a/Makefile b/Makefile
index 3d33b8c..8e5cb3e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,9 +6,9 @@ CFLAGS += -Wall -ggdb -Iinclude -ffast-math
 ifndef DEBUG
 CFLAGS += -O2 -DNDEBUG
 endif
-CFLAGS += -DHAVE_MMAP=$(if $(NO_MMAP),0,1) \
-         -DHAVE_PTHREAD=$(if $(NO_PTHREAD),0,1) \
-         -DHAVE_POSIX_MEMALIGN=$(if $(NO_POSIX_MEMALIGN),0,1)
+CFLAGS += -DP_HAVE_MMAP=$(if $(NO_MMAP),0,1) \
+         -DP_HAVE_PTHREAD=$(if $(NO_PTHREAD),0,1) \
+         -DP_HAVE_POSIX_MEMALIGN=$(if $(NO_POSIX_MEMALIGN),0,1)
 CXXFLAGS += $(CFLAGS)
 #DRC_DBG = 1
 #PCNT = 1

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 64df703..2f758a6 100644 (file)
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -2098,7 +2098,7 @@ static void update_variables(bool in_flight)
          spu_config.iUseThread = 0;
    }
 
-   if (HAVE_PTHREAD) {
+   if (P_HAVE_PTHREAD) {
           var.value = NULL;
           var.key = "pcsx_rearmed_async_cd";
           if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
@@ -3037,7 +3037,7 @@ void retro_init(void)
 
 #ifdef _3DS
    vout_buf = linearMemAlign(VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2, 0x80);
-#elif defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200112L) && HAVE_POSIX_MEMALIGN
+#elif defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200112L) && P_HAVE_POSIX_MEMALIGN
    if (posix_memalign(&vout_buf, 16, VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2) != 0)
       vout_buf = (void *) 0;
 #else

diff --git a/frontend/libretro_core_options.h b/frontend/libretro_core_options.h
index b9eaf77..e20503e 100644 (file)
--- a/frontend/libretro_core_options.h
+++ b/frontend/libretro_core_options.h
@@ -750,7 +750,7 @@ struct retro_core_option_v2_definition option_defs_us[] = {
       },
       "enabled",
    },
-#if HAVE_PTHREAD
+#if P_HAVE_PTHREAD
    {
       "pcsx_rearmed_spu_thread",
       "Threaded SPU",
@@ -765,7 +765,7 @@ struct retro_core_option_v2_definition option_defs_us[] = {
       },
       "disabled",
    },
-#endif // HAVE_PTHREAD
+#endif // P_HAVE_PTHREAD
    {
       "pcsx_rearmed_show_input_settings",
       "Show Input Settings",

diff --git a/jni/Android.mk b/jni/Android.mk
index 501b067..03ccff7 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -1,224 +1 @@
-LOCAL_PATH := $(call my-dir)
-
-$(shell cd "$(LOCAL_PATH)" && ((git describe --always || echo) | sed -e 's/.*/#define REV "\0"/' > ../frontend/revision.h_))
-$(shell cd "$(LOCAL_PATH)" && (diff -q ../frontend/revision.h_ ../frontend/revision.h > /dev/null 2>&1 || cp ../frontend/revision.h_ ../frontend/revision.h))
-$(shell cd "$(LOCAL_PATH)" && (rm ../frontend/revision.h_))
-
-HAVE_CHD ?= 1
-USE_LIBRETRO_VFS ?= 0
-
-ROOT_DIR     := $(LOCAL_PATH)/..
-CORE_DIR     := $(ROOT_DIR)/libpcsxcore
-SPU_DIR      := $(ROOT_DIR)/plugins/dfsound
-GPU_DIR      := $(ROOT_DIR)/plugins/gpulib
-CDR_DIR      := $(ROOT_DIR)/plugins/cdrcimg
-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
-PEOPS_DIR    := $(ROOT_DIR)/plugins/dfxvideo
-DYNAREC_DIR  := $(ROOT_DIR)/libpcsxcore/new_dynarec
-DEPS_DIR     := $(ROOT_DIR)/deps
-LIBRETRO_COMMON := $(ROOT_DIR)/libretro-common
-EXTRA_INCLUDES :=
-
-# core
-SOURCES_C := $(CORE_DIR)/cdriso.c \
-             $(CORE_DIR)/cdrom.c \
-             $(CORE_DIR)/cheat.c \
-             $(CORE_DIR)/database.c \
-             $(CORE_DIR)/decode_xa.c \
-             $(CORE_DIR)/mdec.c \
-             $(CORE_DIR)/misc.c \
-             $(CORE_DIR)/plugins.c \
-             $(CORE_DIR)/ppf.c \
-             $(CORE_DIR)/psxbios.c \
-             $(CORE_DIR)/psxcommon.c \
-             $(CORE_DIR)/psxcounters.c \
-             $(CORE_DIR)/psxdma.c \
-             $(CORE_DIR)/psxhle.c \
-             $(CORE_DIR)/psxhw.c \
-             $(CORE_DIR)/psxinterpreter.c \
-             $(CORE_DIR)/psxmem.c \
-             $(CORE_DIR)/r3000a.c \
-             $(CORE_DIR)/sio.c \
-             $(CORE_DIR)/spu.c \
-             $(CORE_DIR)/gte.c \
-             $(CORE_DIR)/gte_nf.c \
-             $(CORE_DIR)/gte_divider.c
-
-# spu
-SOURCES_C += $(SPU_DIR)/dma.c \
-             $(SPU_DIR)/freeze.c \
-             $(SPU_DIR)/registers.c \
-             $(SPU_DIR)/spu.c \
-             $(SPU_DIR)/out.c \
-             $(SPU_DIR)/nullsnd.c
-
-# gpu
-SOURCES_C += $(GPU_DIR)/gpu.c \
-             $(GPU_DIR)/vout_pl.c
-
-# cdrcimg
-SOURCES_C += $(CDR_DIR)/cdrcimg.c
-
-# dfinput
-SOURCES_C += $(INPUT_DIR)/main.c \
-             $(INPUT_DIR)/pad.c \
-             $(INPUT_DIR)/guncon.c
-
-# frontend
-SOURCES_C += $(FRONTEND_DIR)/main.c \
-             $(FRONTEND_DIR)/plugin.c \
-             $(FRONTEND_DIR)/cspace.c \
-             $(FRONTEND_DIR)/libretro.c
-
-# libchdr
-SOURCES_C += \
-             $(DEPS_DIR)/libchdr/deps/lzma-19.00/src/Alloc.c \
-             $(DEPS_DIR)/libchdr/deps/lzma-19.00/src/Bra86.c \
-             $(DEPS_DIR)/libchdr/deps/lzma-19.00/src/BraIA64.c \
-             $(DEPS_DIR)/libchdr/deps/lzma-19.00/src/CpuArch.c \
-             $(DEPS_DIR)/libchdr/deps/lzma-19.00/src/Delta.c \
-             $(DEPS_DIR)/libchdr/deps/lzma-19.00/src/LzFind.c \
-             $(DEPS_DIR)/libchdr/deps/lzma-19.00/src/Lzma86Dec.c \
-             $(DEPS_DIR)/libchdr/deps/lzma-19.00/src/LzmaDec.c \
-             $(DEPS_DIR)/libchdr/deps/lzma-19.00/src/LzmaEnc.c \
-             $(DEPS_DIR)/libchdr/deps/lzma-19.00/src/Sort.c \
-             $(DEPS_DIR)/libchdr/src/libchdr_bitstream.c \
-             $(DEPS_DIR)/libchdr/src/libchdr_cdrom.c \
-             $(DEPS_DIR)/libchdr/src/libchdr_chd.c \
-             $(DEPS_DIR)/libchdr/src/libchdr_flac.c \
-             $(DEPS_DIR)/libchdr/src/libchdr_huffman.c
-SOURCES_ASM :=
-
-COREFLAGS := -ffast-math -funroll-loops -DHAVE_LIBRETRO -DNO_FRONTEND -DFRONTEND_SUPPORTS_RGB565 -DANDROID -DREARMED
-COREFLAGS += -DHAVE_CHD -D_7ZIP_ST
-
-ifeq ($(USE_LIBRETRO_VFS),1)
-SOURCES_C += \
-             $(LIBRETRO_COMMON)/compat/compat_posix_string.c \
-             $(LIBRETRO_COMMON)/compat/fopen_utf8.c \
-             $(LIBRETRO_COMMON)/encodings/compat_strl.c \
-             $(LIBRETRO_COMMON)/encodings/encoding_utf.c \
-             $(LIBRETRO_COMMON)/file/file_path.c \
-             $(LIBRETRO_COMMON)/streams/file_stream.c \
-             $(LIBRETRO_COMMON)/streams/file_stream_transforms.c \
-             $(LIBRETRO_COMMON)/string/stdstring.c \
-             $(LIBRETRO_COMMON)/time/rtime.c \
-             $(LIBRETRO_COMMON)/vfs/vfs_implementation.c
-COREFLAGS += -DUSE_LIBRETRO_VFS
-endif
-
-HAVE_ARI64=0
-HAVE_LIGHTREC=0
-LIGHTREC_CUSTOM_MAP=0
-HAVE_GPU_NEON=0
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-  HAVE_ARI64=1
-  HAVE_GPU_NEON=1
-else ifeq ($(TARGET_ARCH_ABI),armeabi)
-  HAVE_ARI64=1
-else ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
-  HAVE_ARI64=1
-  HAVE_GPU_NEON=1
-else ifeq ($(TARGET_ARCH_ABI),x86_64)
-  HAVE_LIGHTREC=1
-  HAVE_GPU_NEON=1
-else ifeq ($(TARGET_ARCH_ABI),x86)
-  HAVE_LIGHTREC=1
-  HAVE_GPU_NEON=1
-else
-  COREFLAGS   += -DDRC_DISABLE
-endif
-  COREFLAGS   += -DLIGHTREC_CUSTOM_MAP=$(LIGHTREC_CUSTOM_MAP)
-
-ifeq ($(HAVE_ARI64),1)
-  SOURCES_C   += $(DYNAREC_DIR)/new_dynarec.c \
-                 $(DYNAREC_DIR)/pcsxmem.c
-  ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
-    SOURCES_ASM += $(DYNAREC_DIR)/linkage_arm64.S
-  else
-    SOURCES_ASM += $(CORE_DIR)/gte_arm.S \
-                   $(SPU_DIR)/arm_utils.S \
-                   $(DYNAREC_DIR)/linkage_arm.S
-  endif
-endif
-  SOURCES_C   += $(DYNAREC_DIR)/emu_if.c
-
-ifeq ($(HAVE_LIGHTREC),1)
-  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 \
-                                         $(DEPS_DIR)/lightrec/disassembler.c \
-                                         $(DEPS_DIR)/lightrec/emitter.c \
-                                         $(DEPS_DIR)/lightrec/interpreter.c \
-                                         $(DEPS_DIR)/lightrec/lightrec.c \
-                                         $(DEPS_DIR)/lightrec/memmanager.c \
-                                         $(DEPS_DIR)/lightrec/optimizer.c \
-                                         $(DEPS_DIR)/lightrec/regcache.c \
-                                         $(DEPS_DIR)/lightrec/recompiler.c \
-                                         $(DEPS_DIR)/lightrec/reaper.c
-  SOURCES_C   += $(DEPS_DIR)/lightning/lib/jit_disasm.c \
-                                         $(DEPS_DIR)/lightning/lib/jit_memory.c \
-                                         $(DEPS_DIR)/lightning/lib/jit_names.c \
-                                         $(DEPS_DIR)/lightning/lib/jit_note.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 $(DEPS_DIR)/lightrec/tlsf/tlsf.c
-ifeq ($(LIGHTREC_CUSTOM_MAP),1)
-  SOURCES_C   += $(CORE_DIR)/lightrec/mem.c
-endif
-endif
-
-
-ifeq ($(HAVE_GPU_NEON),1)
-  COREFLAGS   += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP -DGPU_NEON
-  ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-    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
-  else
-    COREFLAGS   += -DSIMD_BUILD
-    SOURCES_C   += $(NEON_DIR)/psx_gpu/psx_gpu_simd.c
-  endif
-  SOURCES_C   += $(NEON_DIR)/psx_gpu_if.c
-else ifeq ($(TARGET_ARCH_ABI),armeabi)
-  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
-else
-  COREFLAGS += -fno-strict-aliasing -DGPU_PEOPS
-  SOURCES_C += $(PEOPS_DIR)/gpulib_if.c
-endif
-
-GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
-ifneq ($(GIT_VERSION)," unknown")
-  COREFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
-endif
-
-include $(CLEAR_VARS)
-LOCAL_MODULE        := retro
-LOCAL_SRC_FILES     := $(SOURCES_C) $(SOURCES_ASM)
-LOCAL_CFLAGS        := $(COREFLAGS)
-LOCAL_C_INCLUDES    := $(ROOT_DIR)/include
-LOCAL_C_INCLUDES    += $(DEPS_DIR)/crypto $(DEPS_DIR)/libchdr/deps/lzma-19.00/include $(DEPS_DIR)/libchdr/include $(DEPS_DIR)/libchdr/include/libchdr
-LOCAL_C_INCLUDES    += $(LIBRETRO_COMMON)/include
-LOCAL_C_INCLUDES    += $(EXTRA_INCLUDES)
-LOCAL_LDFLAGS       := -Wl,-version-script=$(FRONTEND_DIR)/link.T
-LOCAL_LDLIBS        := -lz -llog
-LOCAL_ARM_MODE      := arm
-
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-  LOCAL_ARM_NEON  := true
-endif
-
-include $(BUILD_SHARED_LIBRARY)
+$(error This file is unmaintained. Please use the libretro fork: https://github.com/libretro/pcsx_rearmed)

diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c
index d0440e2..eeb2c35 100644 (file)
--- a/libpcsxcore/cdriso.c
+++ b/libpcsxcore/cdriso.c
@@ -30,7 +30,7 @@
 #include <process.h>
 #include <windows.h>
 #define strcasecmp _stricmp
-#elif HAVE_PTHREAD
+#elif P_HAVE_PTHREAD
 #include <pthread.h>
 #include <sys/time.h>
 #include <unistd.h>

diff --git a/libpcsxcore/memmap.h b/libpcsxcore/memmap.h
index da1d0e1..d16dea0 100644 (file)
--- a/libpcsxcore/memmap.h
+++ b/libpcsxcore/memmap.h
@@ -36,7 +36,7 @@
 
 #endif //_WIN32
 
-#if defined(_WIN32) || !HAVE_MMAP
+#if defined(_WIN32) || !P_HAVE_MMAP
 #include <sys/types.h>
 
 #ifdef __cplusplus

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
index 14e7a9e..42755e5 100644 (file)
--- a/libpcsxcore/psxmem.c
+++ b/libpcsxcore/psxmem.c
@@ -44,7 +44,7 @@
 static void * psxMapDefault(unsigned long addr, size_t size,
                            int is_fixed, enum psxMapTag tag)
 {
-#if !HAVE_MMAP
+#if !P_HAVE_MMAP
        void *ptr;
 
        ptr = malloc(size);
@@ -59,7 +59,7 @@ static void * psxMapDefault(unsigned long addr, size_t size,
 
 static void psxUnmapDefault(void *ptr, size_t size, enum psxMapTag tag)
 {
-#if !HAVE_MMAP
+#if !P_HAVE_MMAP
        free(ptr);
 #else
        munmap(ptr, size);

diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c
index f5e8de5..f6730d6 100644 (file)
--- a/plugins/dfsound/spu.c
+++ b/plugins/dfsound/spu.c
@@ -829,7 +829,7 @@ static void do_samples_finish(int *SSumLR, int ns_to,
 
 // optional worker thread handling
 
-#if HAVE_PTHREAD || defined(WANT_THREAD_CODE)
+#if P_HAVE_PTHREAD || defined(WANT_THREAD_CODE)
 
 // worker thread state
 static struct spu_worker {
@@ -1084,7 +1084,7 @@ static void sync_worker_thread(int force) {}
 
 static const void * const worker = NULL;
 
-#endif // HAVE_PTHREAD || defined(WANT_THREAD_CODE)
+#endif // P_HAVE_PTHREAD || defined(WANT_THREAD_CODE)
 
 ////////////////////////////////////////////////////////////////////////
 // MAIN SPU FUNCTION
@@ -1365,7 +1365,7 @@ static void RemoveStreams(void)
 /* special code for TI C64x DSP */
 #include "spu_c64x.c"
 
-#elif HAVE_PTHREAD
+#elif P_HAVE_PTHREAD
 
 #include <pthread.h>
 #include <semaphore.h>
@@ -1464,7 +1464,7 @@ static void exit_spu_thread(void)
  worker = NULL;
 }
 
-#else // if !HAVE_PTHREAD
+#else // if !P_HAVE_PTHREAD
 
 static void init_spu_thread(void)
 {