1
0
mirror of https://github.com/libretro/RetroArch synced 2025-03-02 10:13:39 +00:00

(Android) Change STL

This commit is contained in:
twinaphex 2016-05-15 13:53:12 +02:00
parent acce19d5b3
commit e730dd6ae2
3 changed files with 3 additions and 3 deletions

@ -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))

@ -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

@ -39,4 +39,4 @@ ifeq ($(USE_CLANG),1)
APP_CPPFLAGS := -Wno-invalid-source-encoding
endif
APP_STL := gnustl_static
APP_STL := c++_static