From e730dd6ae25d34dc72069e0141b2c1bf73e9c299 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 15 May 2016 13:53:12 +0200 Subject: [PATCH] (Android) Change STL --- pkg/android/phoenix/jni/Android.mk | 2 +- pkg/android/phoenix/jni/Android2.mk | 2 +- pkg/android/phoenix/jni/Application.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/android/phoenix/jni/Android.mk b/pkg/android/phoenix/jni/Android.mk index 5125d92e9c..cabb27547c 100644 --- a/pkg/android/phoenix/jni/Android.mk +++ b/pkg/android/phoenix/jni/Android.mk @@ -63,7 +63,7 @@ DEFINES += -DHAVE_CHEEVOS DEFINES += -DHAVE_SL LOCAL_CFLAGS += -Wall -std=gnu99 -pthread -Wno-unused-function -fno-stack-protector -funroll-loops $(DEFINES) -LOCAL_CPPFLAGS := -fexceptions -std=gnu++11 -fno-rtti -Wno-reorder $(DEFINES) +LOCAL_CPPFLAGS := -fexceptions -fpermissive -std=gnu++11 -fno-rtti -Wno-reorder $(DEFINES) # Let ndk-build set the optimization flags but remove -O3 like in cf3c3 LOCAL_CFLAGS := $(subst -O3,-O2,$(LOCAL_CFLAGS)) diff --git a/pkg/android/phoenix/jni/Android2.mk b/pkg/android/phoenix/jni/Android2.mk index f1177b051e..05b7f196ad 100644 --- a/pkg/android/phoenix/jni/Android2.mk +++ b/pkg/android/phoenix/jni/Android2.mk @@ -65,7 +65,7 @@ DEFINES += -DDEBUG_ANDROID DEFINES += -DHAVE_SL LOCAL_CFLAGS += -Wall -std=gnu99 -pthread -Wno-unused-function -fno-stack-protector -funroll-loops $(DEFINES) -LOCAL_CPPFLAGS := -fexceptions -std=gnu++11 -fno-rtti -Wno-reorder $(DEFINES) +LOCAL_CPPFLAGS := -fexceptions -fpermissive -std=gnu++11 -fno-rtti -Wno-reorder $(DEFINES) ifeq ($(NDK_DEBUG),1) LOCAL_CFLAGS += -O0 -g diff --git a/pkg/android/phoenix/jni/Application.mk b/pkg/android/phoenix/jni/Application.mk index 1763880a0c..b179dbfca3 100644 --- a/pkg/android/phoenix/jni/Application.mk +++ b/pkg/android/phoenix/jni/Application.mk @@ -39,4 +39,4 @@ ifeq ($(USE_CLANG),1) APP_CPPFLAGS := -Wno-invalid-source-encoding endif -APP_STL := gnustl_static +APP_STL := c++_static