From e0136428bb70a34bdeb7195ed00bc2a581760698 Mon Sep 17 00:00:00 2001 From: Night Owl Date: Sat, 4 Jun 2016 17:20:18 +0500 Subject: [PATCH] Remov flag -fpermissive from Android Makefiles. --- cl_dll/Android.mk | 2 +- dlls/Android.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cl_dll/Android.mk b/cl_dll/Android.mk index b5f3f311..94489844 100755 --- a/cl_dll/Android.mk +++ b/cl_dll/Android.mk @@ -91,7 +91,7 @@ SRCS+=./input_xash3d.cpp SRCS+=./scoreboard.cpp SRCS+=./MOTD.cpp INCLUDES = -I../common -I. -I../game_shared -I../pm_shared -I../engine -I../dlls -DEFINES = -Wno-write-strings -DLINUX -D_LINUX -Dstricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -DCLIENT_WEAPONS -DCLIENT_DLL -fpermissive -w +DEFINES = -Wno-write-strings -DLINUX -D_LINUX -Dstricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp -DCLIENT_WEAPONS -DCLIENT_DLL -w LOCAL_C_INCLUDES := $(LOCAL_PATH)/. \ $(LOCAL_PATH)/../common \ diff --git a/dlls/Android.mk b/dlls/Android.mk index 38e6a019..e0266879 100644 --- a/dlls/Android.mk +++ b/dlls/Android.mk @@ -14,9 +14,9 @@ LOCAL_MODULE_FILENAME = libserver_hardfp endif LOCAL_CFLAGS += -D_LINUX -DCLIENT_WEAPONS -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -D_snprintf=snprintf \ - -fno-exceptions -w -fpermissive + -fno-exceptions -w -LOCAL_CPPFLAGS := $(LOCAL_CFLAGS) -frtti -fpermissive +LOCAL_CPPFLAGS := $(LOCAL_CFLAGS) -frtti LOCAL_C_INCLUDES := $(SDL_PATH)/include \ $(LOCAL_PATH)/. \