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
standalone: some ppf loading
[pcsx_rearmed.git]
/
Makefile.libretro
diff --git
a/Makefile.libretro
b/Makefile.libretro
index
222941d
..
265ae69
100644
(file)
--- a/
Makefile.libretro
+++ b/
Makefile.libretro
@@
-3,6
+3,7
@@
DEBUG ?= 0
WANT_ZLIB ?= 1
HAVE_CHD ?= 1
DEBUG ?= 0
WANT_ZLIB ?= 1
HAVE_CHD ?= 1
+HAVE_PHYSICAL_CDROM ?= 1
USE_LIBRETRO_VFS ?= 0
# Dynarec options: lightrec, ari64
USE_LIBRETRO_VFS ?= 0
# Dynarec options: lightrec, ari64
@@
-75,6
+76,12
@@
else ifeq ($(platform), miyoo)
endif
CC_AS ?= $(CC)
endif
CC_AS ?= $(CC)
+# workaround wrong owner in libretro infra
+GIT_VERSION1 := $(shell test -d /builds/libretro/pcsx_rearmed && git rev-parse --short HEAD 2>&1)
+ifneq ($(findstring dubious ownership,$(GIT_VERSION1)),)
+DUMMY := $(shell git config --global --add safe.directory /builds/libretro/pcsx_rearmed)
+endif
+
TARGET_NAME := pcsx_rearmed
ARCH_DETECTED := $(shell $(CC) $(CFLAGS) -dumpmachine | awk -F- '{print $$1}')
GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
TARGET_NAME := pcsx_rearmed
ARCH_DETECTED := $(shell $(CC) $(CFLAGS) -dumpmachine | awk -F- '{print $$1}')
GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
@@
-105,7
+112,7
@@
ifneq (,$(shell $(CC) -E -dD $(CFLAGS) include/arm_features.h | grep 'HAVE_NEON3
BUILTIN_GPU = neon
endif
endif
BUILTIN_GPU = neon
endif
endif
-ifneq (,$(fi
ndstring
$(ARCH_DETECTED),i686 x86_64 arm64 aarch64))
+ifneq (,$(fi
lter
$(ARCH_DETECTED),i686 x86_64 arm64 aarch64))
BUILTIN_GPU = neon
endif
BUILTIN_GPU = neon
endif
@@
-124,7
+131,6
@@
endif
else ifneq (,$(findstring CortexA73_G12B,$(platform)))
TARGET := $(TARGET_NAME)_libretro.so
fpic := -fPIC
else ifneq (,$(findstring CortexA73_G12B,$(platform)))
TARGET := $(TARGET_NAME)_libretro.so
fpic := -fPIC
- SHARED := -shared -Wl,-version-script=link.T
ARCH = arm64
BUILTIN_GPU = neon
HAVE_NEON = 1
ARCH = arm64
BUILTIN_GPU = neon
HAVE_NEON = 1
@@
-136,7
+142,6
@@
else ifneq (,$(findstring CortexA73_G12B,$(platform)))
else ifneq (,$(findstring h5,$(platform)))
TARGET := $(TARGET_NAME)_libretro.so
fpic := -fPIC
else ifneq (,$(findstring h5,$(platform)))
TARGET := $(TARGET_NAME)_libretro.so
fpic := -fPIC
- SHARED := -shared -Wl,-version-script=link.T
ARCH = arm64
BUILTIN_GPU = neon
HAVE_NEON = 1
ARCH = arm64
BUILTIN_GPU = neon
HAVE_NEON = 1
@@
-169,6
+174,7
@@
else ifeq ($(platform), osx)
CFLAGS += $(ARCHFLAGS)
CXXFLAGS += $(ARCHFLAGS)
LDFLAGS += $(ARCHFLAGS)
CFLAGS += $(ARCHFLAGS)
CXXFLAGS += $(ARCHFLAGS)
LDFLAGS += $(ARCHFLAGS)
+ HAVE_PHYSICAL_CDROM = 0
# iOS
else ifneq (,$(findstring ios,$(platform)))
# iOS
else ifneq (,$(findstring ios,$(platform)))
@@
-198,6
+204,7
@@
else
CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
endif
CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
endif
+ HAVE_PHYSICAL_CDROM = 0
CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
ifeq ($(platform),$(filter $(platform),ios9 ios-arm64))
MINVERSION = -miphoneos-version-min=8.0
CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
ifeq ($(platform),$(filter $(platform),ios9 ios-arm64))
MINVERSION = -miphoneos-version-min=8.0
@@
-224,6
+231,7
@@
endif
BUILTIN_GPU = neon
HAVE_NEON = 1
DYNAREC = 0
BUILTIN_GPU = neon
HAVE_NEON = 1
DYNAREC = 0
+ HAVE_PHYSICAL_CDROM = 0
CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
# Nintendo Switch (libnx)
CC_AS = perl ./tools/gas-preprocessor.pl $(CC)
# Nintendo Switch (libnx)
@@
-246,6
+254,7
@@
else ifeq ($(platform), libnx)
BUILTIN_GPU = neon
HAVE_NEON = 1
DYNAREC = ari64
BUILTIN_GPU = neon
HAVE_NEON = 1
DYNAREC = ari64
+ HAVE_PHYSICAL_CDROM = 0
# Lakka Switch (arm64)
else ifeq ($(platform), arm64)
# Lakka Switch (arm64)
else ifeq ($(platform), arm64)
@@
-254,6
+263,7
@@
else ifeq ($(platform), arm64)
BUILTIN_GPU = neon
HAVE_NEON = 1
DYNAREC = ari64
BUILTIN_GPU = neon
HAVE_NEON = 1
DYNAREC = ari64
+ HAVE_PHYSICAL_CDROM = 0
fpic := -fPIC
CFLAGS := $(filter-out -O2, $(CFLAGS))
CFLAGS += -O3 -ftree-vectorize
fpic := -fPIC
CFLAGS := $(filter-out -O2, $(CFLAGS))
CFLAGS += -O3 -ftree-vectorize
@@
-270,11
+280,13
@@
else ifeq ($(platform), psl1ght)
LIBPTHREAD :=
LIBDL :=
NEED_SYSCONF := 1
LIBPTHREAD :=
LIBDL :=
NEED_SYSCONF := 1
+ HAVE_PHYSICAL_CDROM = 0
# PSP
else ifeq ($(platform), psp1)
TARGET := $(TARGET_NAME)_libretro_psp1.a
CFLAGS += -DPSP -G0
# PSP
else ifeq ($(platform), psp1)
TARGET := $(TARGET_NAME)_libretro_psp1.a
CFLAGS += -DPSP -G0
+ HAVE_PHYSICAL_CDROM = 0
# Vita
else ifeq ($(platform), vita)
# Vita
else ifeq ($(platform), vita)
@@
-298,6
+310,7
@@
else ifeq ($(platform), vita)
STATIC_LINKING = 1
NO_PTHREAD=1
NO_POSIX_MEMALIGN := 1
STATIC_LINKING = 1
NO_PTHREAD=1
NO_POSIX_MEMALIGN := 1
+ HAVE_PHYSICAL_CDROM = 0
# CTR(3DS)
else ifeq ($(platform), ctr)
# CTR(3DS)
else ifeq ($(platform), ctr)
@@
-309,6
+322,7
@@
else ifeq ($(platform), ctr)
CFLAGS += -Ifrontend/3ds -I$(CTRULIB)/include
CFLAGS += -Werror=implicit-function-declaration
CFLAGS += -DHAVE_UNISTD_H
CFLAGS += -Ifrontend/3ds -I$(CTRULIB)/include
CFLAGS += -Werror=implicit-function-declaration
CFLAGS += -DHAVE_UNISTD_H
+ CFLAGS += -DZ7_DECL_Int32_AS_long
OBJS += frontend/3ds/utils.o
OBJS += frontend/3ds/utils.o
@@
-320,11
+334,13
@@
else ifeq ($(platform), ctr)
HAVE_NEON = 0
STATIC_LINKING = 1
NO_POSIX_MEMALIGN := 1
HAVE_NEON = 0
STATIC_LINKING = 1
NO_POSIX_MEMALIGN := 1
+ HAVE_PHYSICAL_CDROM = 0
# Xbox 360
else ifeq ($(platform), xenon)
TARGET := $(TARGET_NAME)_libretro_xenon360.a
CFLAGS += -D__LIBXENON__ -m32 -D__ppc__
# Xbox 360
else ifeq ($(platform), xenon)
TARGET := $(TARGET_NAME)_libretro_xenon360.a
CFLAGS += -D__LIBXENON__ -m32 -D__ppc__
+ HAVE_PHYSICAL_CDROM = 0
# Nintendo GC/Wii/WiiU
else ifneq (,$(filter $(platform),ngc wii wiiu))
# Nintendo GC/Wii/WiiU
else ifneq (,$(filter $(platform),ngc wii wiiu))
@@
-339,8
+355,10
@@
else ifneq (,$(filter $(platform),ngc wii wiiu))
# -mwup was removed in newer devkitPPC versions
CFLAGS += -DHW_WUP
CFLAGS += -I frontend/wiiu
# -mwup was removed in newer devkitPPC versions
CFLAGS += -DHW_WUP
CFLAGS += -I frontend/wiiu
+ CFLAGS += -DZ7_DECL_Int32_AS_long
LIGHTREC_CUSTOM_MAP := 1
LIGHTREC_CUSTOM_MAP_OBJ := libpcsxcore/lightrec/mem_wiiu.o
LIGHTREC_CUSTOM_MAP := 1
LIGHTREC_CUSTOM_MAP_OBJ := libpcsxcore/lightrec/mem_wiiu.o
+ LIGHTREC_CODE_INV := 1
endif
ARCH = powerpc
BUILTIN_GPU = peops
endif
ARCH = powerpc
BUILTIN_GPU = peops
@@
-355,6
+373,7
@@
else ifneq (,$(filter $(platform),ngc wii wiiu))
LIBDL :=
LIBPTHREAD :=
LIBRT :=
LIBDL :=
LIBPTHREAD :=
LIBRT :=
+ HAVE_PHYSICAL_CDROM = 0
# QNX
else ifeq ($(platform), qnx)
# QNX
else ifeq ($(platform), qnx)
@@
-371,6
+390,7
@@
else ifeq ($(platform), qnx)
LIBPTHREAD :=
LIBDL :=
LIBM :=
LIBPTHREAD :=
LIBDL :=
LIBM :=
+ HAVE_PHYSICAL_CDROM = 0
#Raspberry Pi 1
else ifeq ($(platform), rpi1)
#Raspberry Pi 1
else ifeq ($(platform), rpi1)
@@
-449,8
+469,7
@@
else ifeq ($(platform), classic_armv7_a7)
TARGET := $(TARGET_NAME)_libretro.so
fpic := -fPIC
CFLAGS += -Ofast \
TARGET := $(TARGET_NAME)_libretro.so
fpic := -fPIC
CFLAGS += -Ofast \
- -flto=4 -fwhole-program -fuse-linker-plugin \
- -fdata-sections -ffunction-sections -Wl,--gc-sections \
+ -flto=auto -fuse-linker-plugin \
-fno-stack-protector -fno-ident -fomit-frame-pointer \
-falign-functions=1 -falign-jumps=1 -falign-loops=1 \
-fno-unwind-tables -fno-asynchronous-unwind-tables -fno-unroll-loops \
-fno-stack-protector -fno-ident -fomit-frame-pointer \
-falign-functions=1 -falign-jumps=1 -falign-loops=1 \
-fno-unwind-tables -fno-asynchronous-unwind-tables -fno-unroll-loops \
@@
-480,7
+499,8
@@
else ifeq ($(platform), classic_armv8_a35)
TARGET := $(TARGET_NAME)_libretro.so
fpic := -fPIC
CFLAGS += -Ofast \
TARGET := $(TARGET_NAME)_libretro.so
fpic := -fPIC
CFLAGS += -Ofast \
- -fmerge-all-constants -fno-math-errno -march=armv8-a \
+ -fmerge-all-constants -fno-math-errno \
+ -fno-stack-protector -fomit-frame-pointer \
-marm -mcpu=cortex-a35 -mtune=cortex-a35 -mfpu=neon-fp-armv8 -mfloat-abi=hard
HAVE_NEON = 1
HAVE_NEON_ASM = 1
-marm -mcpu=cortex-a35 -mtune=cortex-a35 -mfpu=neon-fp-armv8 -mfloat-abi=hard
HAVE_NEON = 1
HAVE_NEON_ASM = 1
@@
-540,10
+560,14
@@
else ifeq ($(platform), miyoo)
else ifeq ($(platform), emscripten)
TARGET := $(TARGET_NAME)_libretro_$(platform).bc
fpic := -fPIC
else ifeq ($(platform), emscripten)
TARGET := $(TARGET_NAME)_libretro_$(platform).bc
fpic := -fPIC
- SHARED := -shared -Wl,--no-undefined -Wl,--version-script=link.T
- CFLAGS += -DNO_DYLIB
+ NO_MMAP = 1
+ CFLAGS += -DNO_DYLIB -DNO_SOCKET
+ CFLAGS += -msimd128 -ftree-vectorize
+ LIBPTHREAD :=
+ NO_PTHREAD=1
DYNAREC =
STATIC_LINKING = 1
DYNAREC =
STATIC_LINKING = 1
+ HAVE_PHYSICAL_CDROM = 0
# Windows
else
# Windows
else
@@
-581,7
+605,13
@@
ifndef HAVE_NEON_ASM
HAVE_NEON_ASM = $(shell $(CC) -E -dD $(CFLAGS) include/arm_features.h | grep -q HAVE_NEON32 && echo 1 || echo 0)
endif
ifeq ($(NO_UNDEF_CHECK)$(shell $(LD) -v 2> /dev/null | awk '{print $$1}'),GNU)
HAVE_NEON_ASM = $(shell $(CC) -E -dD $(CFLAGS) include/arm_features.h | grep -q HAVE_NEON32 && echo 1 || echo 0)
endif
ifeq ($(NO_UNDEF_CHECK)$(shell $(LD) -v 2> /dev/null | awk '{print $$1}'),GNU)
-MAIN_LDFLAGS += -Wl,--no-undefined
+ ifeq (,$(findstring $(platform),win32))
+ MAIN_LDFLAGS += -Wl,-version-script=frontend/link.T
+ endif
+ ifneq ($(STATIC_LINKING), 1)
+ CFLAGS += -ffunction-sections -fdata-sections
+ endif
+MAIN_LDFLAGS += -Wl,--gc-sections -Wl,--no-undefined
endif
ifdef ALLOW_LIGHTREC_ON_ARM
CFLAGS += -DALLOW_LIGHTREC_ON_ARM
endif
ifdef ALLOW_LIGHTREC_ON_ARM
CFLAGS += -DALLOW_LIGHTREC_ON_ARM
@@
-603,21
+633,12
@@
SOUND_DRIVERS = libretro
PLUGINS =
NO_CONFIG_MAK = yes
PLUGINS =
NO_CONFIG_MAK = yes
-# what does this do
-#libretro_all: all
-#ifeq ($(platform),ios)
-#ifeq ($(DYNAREC),1)
-# make -f Makefile.libretro DYNAREC=0 platform=$(platform) clean
-# make -f Makefile.libretro DYNAREC=0 platform=$(platform)
-#endif
-#endif
-
$(info TARGET: $(TARGET))
$(info platform: $(platform))
$(info ARCH: $(ARCH))
$(info DYNAREC: $(DYNAREC))
$(info BUILTIN_GPU: $(BUILTIN_GPU))
$(info TARGET: $(TARGET))
$(info platform: $(platform))
$(info ARCH: $(ARCH))
$(info DYNAREC: $(DYNAREC))
$(info BUILTIN_GPU: $(BUILTIN_GPU))
-$(info CC: $(CC))
+$(info CC: $(CC)
: $(shell $(CC) --version | head -1)
)
$(info CFLAGS: $(CFLAGS))
$(info MAIN_LDLIBS: $(MAIN_LDLIBS))
$(info )
$(info CFLAGS: $(CFLAGS))
$(info MAIN_LDLIBS: $(MAIN_LDLIBS))
$(info )