Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-17 04:39:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix libretro compile error

Browse Source
This commit is contained in:
xielei 2024-03-07 22:35:33 +08:00
parent 0159102a19
commit 15b6111e8a
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libretro/Makefile.common
View File

@ -17,6 +17,8 @@ INCFLAGS += \
-I$(CORE_DIR) \ -I$(CORE_DIR) \
-I$(COMMONDIR) \ -I$(COMMONDIR) \
-I$(CORE_DIR)/libretro \ -I$(CORE_DIR)/libretro \
-I$(EXTDIR)/libadrenotools/lib/linkernsbypass \
-I$(EXTDIR)/libadrenotools/include \
-I$(EXTDIR)/openxr \ -I$(EXTDIR)/openxr \
-I$(EXTDIR)/glslang \ -I$(EXTDIR)/glslang \
-I$(EXTDIR)/glslang-build \ -I$(EXTDIR)/glslang-build \
@ -566,6 +568,14 @@ SOURCES_CXX += $(COMMONDIR)/MemArenaPosix.cpp \
$(EXTDIR)/glslang/glslang/OSDependent/Unix/ossource.cpp $(EXTDIR)/glslang/glslang/OSDependent/Unix/ossource.cpp
endif endif
ifeq ($(TARGET_ARCH),arm64)
SOURCES_CXX += \
$(EXTDIR)/libadrenotools/src/driver.cpp \
$(EXTDIR)/libadrenotools/lib/linkernsbypass/android_linker_ns.cpp \
$(EXTDIR)/libadrenotools/lib/linkernsbypass/elf_soname_patcher.cpp
endif
SOURCES_CXX += \ SOURCES_CXX += \
$(COMMONDIR)/Render/Text/draw_text.cpp \ $(COMMONDIR)/Render/Text/draw_text.cpp \
$(EXTDIR)/jpge/jpgd.cpp \ $(EXTDIR)/jpge/jpgd.cpp \

2
libretro/jni/Android.mk
View File

@ -77,7 +77,7 @@ COREFLAGS += -DINLINE="inline" -DPPSSPP -DUSE_FFMPEG -DWITH_UPNP -DMOBILE_DEVICE
LOCAL_SRC_FILES = $(SOURCES_CXX) $(SOURCES_C) $(ASMFILES) LOCAL_SRC_FILES = $(SOURCES_CXX) $(SOURCES_C) $(ASMFILES)
LOCAL_CPPFLAGS := -Wall -std=c++17 $(COREFLAGS) -DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS $(DEFINES) LOCAL_CPPFLAGS := -Wall -std=c++17 $(COREFLAGS) -DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS $(DEFINES)
LOCAL_CFLAGS := -O2 -DANDROID $(COREFLAGS) $(DEFINES) LOCAL_CFLAGS := -O2 -DANDROID $(COREFLAGS) $(DEFINES)
LOCAL_LDLIBS += -lz -llog -lGLESv2 -lEGL -latomic LOCAL_LDLIBS += -lz -landroid -lGLESv2 -lOpenSLES -lEGL -ldl -llog -latomic
LOCAL_STATIC_LIBRARIES += $(FFMPEGLIBS) LOCAL_STATIC_LIBRARIES += $(FFMPEGLIBS)
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

2
libretro/jni/Application.mk
View File

@ -2,4 +2,4 @@ NDK_TOOLCHAIN_VERSION ?= 4.8
APP_ABI := armeabi-v7a,arm64-v8a,x86 APP_ABI := armeabi-v7a,arm64-v8a,x86
APP_STL := c++_static APP_STL := c++_static
APP_GNUSTL_CPP_FEATURES := exceptions APP_GNUSTL_CPP_FEATURES := exceptions
APP_PLATFORM := android-9 APP_PLATFORM := android-21