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
lightrec: initial hle support
[pcsx_rearmed.git]
/
Makefile.libretro
diff --git
a/Makefile.libretro
b/Makefile.libretro
index
d66ccc3
..
831964f
100644
(file)
--- a/
Makefile.libretro
+++ b/
Makefile.libretro
@@
-39,6
+39,13
@@
else ifeq ($(platform), tvos-arm64)
endif
CC = cc -arch arm64 -isysroot $(IOSSDK)
CXX = c++ -arch arm64 -isysroot $(IOSSDK)
endif
CC = cc -arch arm64 -isysroot $(IOSSDK)
CXX = c++ -arch arm64 -isysroot $(IOSSDK)
+else ifeq ($(platform), osx)
+ ifeq ($(CROSS_COMPILE),1)
+ TARGET_RULE = -target $(LIBRETRO_APPLE_PLATFORM) -isysroot $(LIBRETRO_APPLE_ISYSROOT)
+ CFLAGS += $(TARGET_RULE)
+ CXXFLAGS += $(TARGET_RULE)
+ LDFLAGS += $(TARGET_RULE)
+ endif
else ifeq ($(platform), psl1ght)
CC = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT)
AR = $(PS3DEV)/ppu/bin/ppu-ar$(EXE_EXT)
else ifeq ($(platform), psl1ght)
CC = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT)
AR = $(PS3DEV)/ppu/bin/ppu-ar$(EXE_EXT)
@@
-68,7
+75,7
@@
endif
CC_AS ?= $(CC)
TARGET_NAME := pcsx_rearmed
CC_AS ?= $(CC)
TARGET_NAME := pcsx_rearmed
-ARCH_DETECTED := $(shell $(CC) -dumpmachine | awk -F- '{print $$1}')
+ARCH_DETECTED := $(shell $(CC)
$(CFLAGS)
-dumpmachine | awk -F- '{print $$1}')
GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
ifneq ($(GIT_VERSION)," unknown")
CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
ifneq ($(GIT_VERSION)," unknown")
CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
@@
-97,7
+104,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 (,$(findstring $(ARCH_DETECTED),i686 x86_64 aarch64))
+ifneq (,$(findstring $(ARCH_DETECTED),i686 x86_64 a
rm64 a
arch64))
BUILTIN_GPU = neon
endif
BUILTIN_GPU = neon
endif
@@
-152,22
+159,12
@@
else ifeq ($(platform), osx)
DYNAREC := 0
TARGET := $(TARGET_NAME)_libretro.dylib
fpic := -fPIC
DYNAREC := 0
TARGET := $(TARGET_NAME)_libretro.dylib
fpic := -fPIC
- HAVE_NEON = 0
MACSOSVER = `sw_vers -productVersion | cut -d. -f 1`
OSXVER = `sw_vers -productVersion | cut -d. -f 2`
OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
ifeq ($(OSX_LT_MAVERICKS),YES)
fpic += -mmacosx-version-min=10.1
endif
MACSOSVER = `sw_vers -productVersion | cut -d. -f 1`
OSXVER = `sw_vers -productVersion | cut -d. -f 2`
OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
ifeq ($(OSX_LT_MAVERICKS),YES)
fpic += -mmacosx-version-min=10.1
endif
-
- ifeq ($(CROSS_COMPILE),1)
- TARGET_RULE = -target $(LIBRETRO_APPLE_PLATFORM) -isysroot $(LIBRETRO_APPLE_ISYSROOT)
- CFLAGS += $(TARGET_RULE)
- CPPFLAGS += $(TARGET_RULE)
- CXXFLAGS += $(TARGET_RULE)
- LDFLAGS += $(TARGET_RULE)
- endif
-
CFLAGS += $(ARCHFLAGS)
CXXFLAGS += $(ARCHFLAGS)
LDFLAGS += $(ARCHFLAGS)
CFLAGS += $(ARCHFLAGS)
CXXFLAGS += $(ARCHFLAGS)
LDFLAGS += $(ARCHFLAGS)
@@
-236,7
+233,7
@@
else ifeq ($(platform), libnx)
ARCH := arm64
HAVE_VFS_FD = 0
CFLAGS += -O3 -fomit-frame-pointer -ffast-math -I$(DEVKITPRO)/libnx/include/ -fPIE -Wl,--allow-multiple-definition # -include $(LIBNX)/include/switch.h
ARCH := arm64
HAVE_VFS_FD = 0
CFLAGS += -O3 -fomit-frame-pointer -ffast-math -I$(DEVKITPRO)/libnx/include/ -fPIE -Wl,--allow-multiple-definition # -include $(LIBNX)/include/switch.h
- CFLAGS += -specs=$(DEVKITPRO)/libnx/switch.specs -DNO_
OS -DNO_DYLIB -DNO_SOCKET
-D__arm64__ -D__ARM_NEON__
+ CFLAGS += -specs=$(DEVKITPRO)/libnx/switch.specs -DNO_
DYLIB
-D__arm64__ -D__ARM_NEON__
CFLAGS += -D__SWITCH__ -DHAVE_LIBNX
CFLAGS += -DARM -D__aarch64__=1 -march=armv8-a -mtune=cortex-a57 -mtp=soft -DHAVE_INTTYPES -DLSB_FIRST -ffast-math -mcpu=cortex-a57+crc+fp+simd -ffunction-sections
CFLAGS += -ftree-vectorize
CFLAGS += -D__SWITCH__ -DHAVE_LIBNX
CFLAGS += -DARM -D__aarch64__=1 -march=armv8-a -mtune=cortex-a57 -mtp=soft -DHAVE_INTTYPES -DLSB_FIRST -ffast-math -mcpu=cortex-a57+crc+fp+simd -ffunction-sections
CFLAGS += -ftree-vectorize
@@
-264,6
+261,14
@@
else ifeq ($(platform), arm64)
else ifeq ($(platform), psl1ght)
TARGET := $(TARGET_NAME)_libretro_psl1ght.a
CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__
else ifeq ($(platform), psl1ght)
TARGET := $(TARGET_NAME)_libretro_psl1ght.a
CFLAGS += -DBLARGG_BIG_ENDIAN=1 -D__ppc__
+ CFLAGS += -DNO_DYLIB
+ NO_UNDEF_CHECK := 1
+ STATIC_LINKING := 1
+ NO_MMAP := 1
+ NO_PTHREAD := 1
+ LIBPTHREAD :=
+ LIBDL :=
+ NEED_SYSCONF := 1
# PSP
else ifeq ($(platform), psp1)
# PSP
else ifeq ($(platform), psp1)
@@
-279,7
+284,7
@@
else ifeq ($(platform), vita)
CFLAGS += -fno-asynchronous-unwind-tables -ftree-vectorize -funroll-loops
CFLAGS += -fno-optimize-sibling-calls
CFLAGS += -I$(VITASDK)/include -Ifrontend/vita
CFLAGS += -fno-asynchronous-unwind-tables -ftree-vectorize -funroll-loops
CFLAGS += -fno-optimize-sibling-calls
CFLAGS += -I$(VITASDK)/include -Ifrontend/vita
- CFLAGS += -DNO_
SOCKET -DNO_OS -DNO_
DYLIB
+ CFLAGS += -DNO_DYLIB
ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
# CFLAGS += -U__ARM_NEON__
ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
# CFLAGS += -U__ARM_NEON__
@@
-296,7
+301,7
@@
else ifeq ($(platform), vita)
# CTR(3DS)
else ifeq ($(platform), ctr)
TARGET := $(TARGET_NAME)_libretro_ctr.a
# CTR(3DS)
else ifeq ($(platform), ctr)
TARGET := $(TARGET_NAME)_libretro_ctr.a
- CFLAGS += -DARM11 -D_3DS -DNO_
OS -DNO_DYLIB -DNO_SOCKET
-DGPU_UNAI_USE_FLOATMATH -DGPU_UNAI_USE_FLOAT_DIV_MULTINV
+ CFLAGS += -DARM11 -D_3DS -DNO_
DYLIB
-DGPU_UNAI_USE_FLOATMATH -DGPU_UNAI_USE_FLOAT_DIV_MULTINV
CFLAGS += -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp -mtp=soft
CFLAGS += -Wall -mword-relocations
CFLAGS += -fomit-frame-pointer -ffast-math -funroll-loops
CFLAGS += -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp -mtp=soft
CFLAGS += -Wall -mword-relocations
CFLAGS += -fomit-frame-pointer -ffast-math -funroll-loops
@@
-325,8
+330,10
@@
else ifneq (,$(filter $(platform),ngc wii wiiu))
TARGET := $(TARGET_NAME)_libretro_$(platform).a
ifeq ($(platform), ngc)
CFLAGS += -DHW_DOL -mogc
TARGET := $(TARGET_NAME)_libretro_$(platform).a
ifeq ($(platform), ngc)
CFLAGS += -DHW_DOL -mogc
+ NEED_SYSCONF := 1
else ifeq ($(platform), wii)
CFLAGS += -DHW_RVL -mrvl
else ifeq ($(platform), wii)
CFLAGS += -DHW_RVL -mrvl
+ NEED_SYSCONF := 1
else ifeq ($(platform), wiiu)
# -mwup was removed in newer devkitPPC versions
CFLAGS += -DHW_WUP
else ifeq ($(platform), wiiu)
# -mwup was removed in newer devkitPPC versions
CFLAGS += -DHW_WUP
@@
-338,7
+345,7
@@
else ifneq (,$(filter $(platform),ngc wii wiiu))
BUILTIN_GPU = peops
CFLAGS += -D__ppc__ -D__powerpc__
CFLAGS += -DGEKKO -mcpu=750 -meabi -mhard-float
BUILTIN_GPU = peops
CFLAGS += -D__ppc__ -D__powerpc__
CFLAGS += -DGEKKO -mcpu=750 -meabi -mhard-float
- CFLAGS += -DNO_
SOCKET -DNO_
DYLIB
+ CFLAGS += -DNO_DYLIB
STATIC_LINKING := 1
THREAD_RENDERING := 0
NO_PTHREAD := 1
STATIC_LINKING := 1
THREAD_RENDERING := 0
NO_PTHREAD := 1
@@
-533,7
+540,8
@@
else ifeq ($(platform), emscripten)
TARGET := $(TARGET_NAME)_libretro_$(platform).bc
fpic := -fPIC
SHARED := -shared -Wl,--no-undefined -Wl,--version-script=link.T
TARGET := $(TARGET_NAME)_libretro_$(platform).bc
fpic := -fPIC
SHARED := -shared -Wl,--no-undefined -Wl,--version-script=link.T
- CFLAGS += -DNO_DYLIB -DNO_SOCKET
+ CFLAGS += -DNO_DYLIB
+ DYNAREC =
STATIC_LINKING = 1
# Windows
STATIC_LINKING = 1
# Windows