summaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index c069363f6..640b9260b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,7 +17,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(SDL_PATH)/include \
LOCAL_CPPFLAGS += -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DENABLE_NLS -DENABLE_LIBXML
LOCAL_CPPFLAGS += -frtti -fexceptions -Wno-error=format-security -fvisibility=hidden
-LOCAL_CPPFLAGS += -ffast-math -funswitch-loops -pedantic -Wall -Wc++11-compat -std=c++0x -funsafe-loop-optimizations -flto -fwhole-program
+LOCAL_CPPFLAGS += -ffast-math -funswitch-loops -pedantic -Wall -Wc++17-compat -std=c++11 -funsafe-loop-optimizations -flto -fwhole-program
LOCAL_CPPFLAGS += -fpic -fpie
LOCAL_SHARED_LIBRARIES := SDL2 SDL2_mixer sdl_net SDL2_ttf SDL2_image libcurl intl png sdl2_gfx xml2
@@ -48,9 +48,9 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
$(wildcard $(LOCAL_PATH)/src/const/gui/*.cpp) \
$(wildcard $(LOCAL_PATH)/src/const/net/*.cpp) \
$(wildcard $(LOCAL_PATH)/src/progs/*.cpp) \
- $(wildcard $(LOCAL_PATH)/src/progs/manaplus/*.cpp) \
- $(wildcard $(LOCAL_PATH)/src/progs/manaplus/gui/*.cpp) \
- $(wildcard $(LOCAL_PATH)/src/progs/manaplus/actions/*.cpp) \
+ $(wildcard $(LOCAL_PATH)/src/progs/manaverse/*.cpp) \
+ $(wildcard $(LOCAL_PATH)/src/progs/manaverse/gui/*.cpp) \
+ $(wildcard $(LOCAL_PATH)/src/progs/manaverse/actions/*.cpp) \
$(wildcard $(LOCAL_PATH)/src/resources/*.cpp) \
$(wildcard $(LOCAL_PATH)/src/resources/image/*.cpp) \
$(wildcard $(LOCAL_PATH)/src/resources/animation/*.cpp) \