MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-07 03:13:49 +00:00
Code Issues Projects Releases Wiki Activity

Fix some incorrectly set android makefile options

Browse Source
This commit is contained in:
fzurita 2019-11-01 17:43:09 -04:00 committed by Sergey Lipskiy
parent a87f7c4022
commit 686c7799db
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/GLideNHQ/mupen64plus-video-glidenhq.mk
View File

@ -38,10 +38,11 @@ LOCAL_CFLAGS := \
$(COMMON_CFLAGS) \ $(COMMON_CFLAGS) \
-DOS_ANDROID \ -DOS_ANDROID \
-DTXFILTER_LIB \ -DTXFILTER_LIB \
-fsigned-char \ -fsigned-char
#-DDEBUG \
#-DSDL_NO_COMPAT \
LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS) -std=c++11 -fexceptions LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS) -std=c++17 -fexceptions \
-DOS_ANDROID \
-DTXFILTER_LIB \
-fsigned-char
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

39
src/mupen64plus-video-gliden64.mk
View File

@ -127,19 +127,18 @@ MY_LOCAL_SRC_FILES :=
$(SRCDIR)/uCodes/ZSortBOSS.cpp \ $(SRCDIR)/uCodes/ZSortBOSS.cpp \
$(SRCDIR)/xxHash/xxhash.c \ $(SRCDIR)/xxHash/xxhash.c \
MY_LOCAL_CFLAGS := \ MY_COMMON_FLAGS := \
$(COMMON_CFLAGS) \ -g \
-g \ -DTXFILTER_LIB \
-DTXFILTER_LIB \ -DOS_ANDROID \
-DOS_ANDROID \ -DMUPENPLUSAPI \
-DUSE_SDL \ -DEGL \
-DMUPENPLUSAPI \ -DEGL_EGLEXT_PROTOTYPES \
-DEGL \ -fsigned-char
-DEGL_EGLEXT_PROTOTYPES \
-fsigned-char \
#-DSDL_NO_COMPAT \
MY_LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS) -std=c++11 -g MY_LOCAL_CFLAGS := $(COMMON_CFLAGS) $(MY_COMMON_FLAGS)
MY_LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS) $(MY_COMMON_FLAGS) -std=c++17
MY_LOCAL_LDFLAGS := $(COMMON_LDFLAGS) -Wl,-version-script,$(LOCAL_PATH)/$(SRCDIR)/mupenplus/video_api_export.ver MY_LOCAL_LDFLAGS := $(COMMON_LDFLAGS) -Wl,-version-script,$(LOCAL_PATH)/$(SRCDIR)/mupenplus/video_api_export.ver
@ -151,8 +150,8 @@ ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
MY_LOCAL_SRC_FILES += $(SRCDIR)/Neon/gSPNeon.cpp MY_LOCAL_SRC_FILES += $(SRCDIR)/Neon/gSPNeon.cpp
MY_LOCAL_SRC_FILES += $(SRCDIR)/Neon/RSP_LoadMatrixNeon.cpp MY_LOCAL_SRC_FILES += $(SRCDIR)/Neon/RSP_LoadMatrixNeon.cpp
MY_LOCAL_SRC_FILES += $(SRCDIR)/Neon/CRC_OPT_NEON.cpp MY_LOCAL_SRC_FILES += $(SRCDIR)/Neon/CRC_OPT_NEON.cpp
MY_LOCAL_CFLAGS += -D__NEON_OPT MY_LOCAL_CPPFLAGS += -D__NEON_OPT
MY_LOCAL_CFLAGS += -D__VEC4_OPT -mfpu=neon MY_LOCAL_CPPFLAGS += -D__VEC4_OPT -mfpu=neon
else ifeq ($(TARGET_ARCH_ABI), arm64-v8a) else ifeq ($(TARGET_ARCH_ABI), arm64-v8a)
# Use for ARM8a: # Use for ARM8a:
@ -160,19 +159,19 @@ else ifeq ($(TARGET_ARCH_ABI), arm64-v8a)
MY_LOCAL_SRC_FILES += $(SRCDIR)/Neon/gSPNeon.cpp MY_LOCAL_SRC_FILES += $(SRCDIR)/Neon/gSPNeon.cpp
MY_LOCAL_SRC_FILES += $(SRCDIR)/Neon/RSP_LoadMatrixNeon.cpp MY_LOCAL_SRC_FILES += $(SRCDIR)/Neon/RSP_LoadMatrixNeon.cpp
MY_LOCAL_SRC_FILES += $(SRCDIR)/Neon/CRC_OPT_NEON.cpp MY_LOCAL_SRC_FILES += $(SRCDIR)/Neon/CRC_OPT_NEON.cpp
MY_LOCAL_CFLAGS += -D__NEON_OPT MY_LOCAL_CPPFLAGS += -D__NEON_OPT
MY_LOCAL_CFLAGS += -D__VEC4_OPT -mfpu=neon MY_LOCAL_CPPFLAGS += -D__VEC4_OPT -mfpu=neon
else ifeq ($(TARGET_ARCH_ABI), x86) else ifeq ($(TARGET_ARCH_ABI), x86)
# MY_LOCAL_CFLAGS += -DX86_ASM # MY_LOCAL_CPPFLAGS += -DX86_ASM
MY_LOCAL_CFLAGS += -D__VEC4_OPT MY_LOCAL_CPPFLAGS += -D__VEC4_OPT
MY_LOCAL_SRC_FILES += $(SRCDIR)/3DMath.cpp MY_LOCAL_SRC_FILES += $(SRCDIR)/3DMath.cpp
MY_LOCAL_SRC_FILES += $(SRCDIR)/RSP_LoadMatrix.cpp MY_LOCAL_SRC_FILES += $(SRCDIR)/RSP_LoadMatrix.cpp
MY_LOCAL_SRC_FILES += $(SRCDIR)/CRC_OPT.cpp MY_LOCAL_SRC_FILES += $(SRCDIR)/CRC_OPT.cpp
else ifeq ($(TARGET_ARCH_ABI), x86_64) else ifeq ($(TARGET_ARCH_ABI), x86_64)
# MY_LOCAL_CFLAGS += -DX86_ASM # MY_LOCAL_CPPFLAGS += -DX86_ASM
MY_LOCAL_CFLAGS += -D__VEC4_OPT MY_LOCAL_CPPFLAGS += -D__VEC4_OPT
MY_LOCAL_SRC_FILES += $(SRCDIR)/3DMath.cpp MY_LOCAL_SRC_FILES += $(SRCDIR)/3DMath.cpp
MY_LOCAL_SRC_FILES += $(SRCDIR)/RSP_LoadMatrix.cpp MY_LOCAL_SRC_FILES += $(SRCDIR)/RSP_LoadMatrix.cpp
MY_LOCAL_SRC_FILES += $(SRCDIR)/CRC_OPT.cpp MY_LOCAL_SRC_FILES += $(SRCDIR)/CRC_OPT.cpp