Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix Android Libretro build issues.

Browse source
This commit is contained in:
Filippo Scognamiglio 2020-08-03 12:24:43 +02:00
parent af4822de0d
commit 9f7839c96a
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libretro/Makefile.common
View file

@ -486,7 +486,6 @@ SOURCES_CXX += $(NATIVEDIR)/math/dataconv.cpp \
$(COREDIR)/Util/PPGeDraw.cpp \ $(COREDIR)/Util/PPGeDraw.cpp \
$(COREDIR)/Util/AudioFormat.cpp \ $(COREDIR)/Util/AudioFormat.cpp \
$(COREDIR)/Util/PortManager.cpp \ $(COREDIR)/Util/PortManager.cpp \
$(EXTDIR)/disarm.cpp \
$(CORE_DIR)/UI/TextureUtil.cpp \ $(CORE_DIR)/UI/TextureUtil.cpp \
$(CORE_DIR)/UI/GameInfoCache.cpp $(CORE_DIR)/UI/GameInfoCache.cpp
@ -509,6 +508,7 @@ ifeq ($(WITH_DYNAREC),1)
$(COREDIR)/MIPS/ARM/ArmJit.cpp \ $(COREDIR)/MIPS/ARM/ArmJit.cpp \
$(COREDIR)/MIPS/ARM/ArmRegCache.cpp \ $(COREDIR)/MIPS/ARM/ArmRegCache.cpp \
$(COREDIR)/MIPS/ARM/ArmRegCacheFPU.cpp \ $(COREDIR)/MIPS/ARM/ArmRegCacheFPU.cpp \
$(EXTDIR)/disarm.cpp \
$(GPUCOMMONDIR)/VertexDecoderArm.cpp $(GPUCOMMONDIR)/VertexDecoderArm.cpp
ifeq ($(HAVE_NEON),1) ifeq ($(HAVE_NEON),1)
@ -545,6 +545,7 @@ ifeq ($(WITH_DYNAREC),1)
SOURCES_CXX += \ SOURCES_CXX += \
$(COREDIR)/MIPS/ARM/ArmCompVFPUNEON.cpp \ $(COREDIR)/MIPS/ARM/ArmCompVFPUNEON.cpp \
$(COREDIR)/MIPS/ARM/ArmCompVFPUNEONUtil.cpp \ $(COREDIR)/MIPS/ARM/ArmCompVFPUNEONUtil.cpp \
$(COREDIR)/Util/AudioFormatNEON.cpp \
$(COMMONDIR)/ColorConvNEON.cpp \ $(COMMONDIR)/ColorConvNEON.cpp \
$(GPUDIR)/Common/TextureDecoderNEON.cpp $(GPUDIR)/Common/TextureDecoderNEON.cpp
@ -591,11 +592,6 @@ endif
SOURCES_C += $(NATIVEDIR)/math/fast/fast_matrix_sse.c SOURCES_C += $(NATIVEDIR)/math/fast/fast_matrix_sse.c
endif endif
endif endif
SOURCES_CXX += \
$(COMMONDIR)/ArmEmitter.cpp \
$(COMMONDIR)/Arm64Emitter.cpp \
$(COREDIR)/Util/DisArm64.cpp
#UDIS86 #UDIS86
# Compiled and linked even on ARM for now # Compiled and linked even on ARM for now

1
libretro/jni/Android.mk
View file

@ -9,6 +9,7 @@ COREFLAGS :=
CORE_DIR := ../.. CORE_DIR := ../..
FFMPEGDIR := $(CORE_DIR)/ffmpeg FFMPEGDIR := $(CORE_DIR)/ffmpeg
FFMPEGLIBS += libavformat libavcodec libavutil libswresample libswscale FFMPEGLIBS += libavformat libavcodec libavutil libswresample libswscale
WITH_DYNAREC := 1
ifeq ($(TARGET_ARCH),arm64) ifeq ($(TARGET_ARCH),arm64)
COREFLAGS += -DARM64 -D_ARCH_64 COREFLAGS += -DARM64 -D_ARCH_64