From 8d519e03df9b074db164bc32d49ec79b4f96c3cc Mon Sep 17 00:00:00 2001 From: Logan McNaughton Date: Wed, 21 Jun 2017 15:47:56 -0600 Subject: [PATCH] Add COMMON_LDFLAGS to Android makefiles --- src/GLideNHQ/mupen64plus-video-glidenhq.mk | 1 + src/mupen64plus-video-gliden64.mk | 2 +- src/osal/mupen64plus-video-osal.mk | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/GLideNHQ/mupen64plus-video-glidenhq.mk b/src/GLideNHQ/mupen64plus-video-glidenhq.mk index 18e61161..5b74d49d 100644 --- a/src/GLideNHQ/mupen64plus-video-glidenhq.mk +++ b/src/GLideNHQ/mupen64plus-video-glidenhq.mk @@ -43,6 +43,7 @@ LOCAL_CFLAGS := \ #-DSDL_NO_COMPAT \ LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS) -std=c++11 -fexceptions +LOCAL_LDFLAGS := $(COMMON_LDFLAGS) LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) diff --git a/src/mupen64plus-video-gliden64.mk b/src/mupen64plus-video-gliden64.mk index 1852bf1c..7b2a6e94 100644 --- a/src/mupen64plus-video-gliden64.mk +++ b/src/mupen64plus-video-gliden64.mk @@ -123,7 +123,7 @@ MY_LOCAL_CFLAGS := \ MY_LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS) -std=c++11 -g -MY_LOCAL_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 MY_LOCAL_LDLIBS := -llog -latomic -lEGL diff --git a/src/osal/mupen64plus-video-osal.mk b/src/osal/mupen64plus-video-osal.mk index 6888ff8d..ad9c591c 100644 --- a/src/osal/mupen64plus-video-osal.mk +++ b/src/osal/mupen64plus-video-osal.mk @@ -23,5 +23,6 @@ LOCAL_CFLAGS := \ #-DSDL_NO_COMPAT \ LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS) -std=c++11 -g -fexceptions +LOCAL_LDFLAGS := $(COMMON_LDFLAGS) include $(BUILD_SHARED_LIBRARY)