From 3b1cc137e1c2ac25f8534865a71c1a22a00d4986 Mon Sep 17 00:00:00 2001 From: Jari Vetoniemi Date: Sun, 5 Apr 2020 00:00:38 +0900 Subject: replace iconv with sjconv --- jni/Android.mk | 2 +- jni/sjconv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'jni') diff --git a/jni/Android.mk b/jni/Android.mk index 086b670..b0cbf4c 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -6,6 +6,7 @@ else ifeq ($(TARGET_ARCH_ABI), x86) GLOBAL_CFLAGS += -DARCH_32BIT endif LOCAL_PATH := . +include jni/sjconv.mk include jni/compat.mk include jni/SDL/Android.mk include jni/SDL_ttf/Android.mk @@ -16,7 +17,6 @@ include jni/SDL_mixer.vorbis.mk include jni/boost.mk include jni/OpenAL.mk include jni/SDL_sound.mk -include jni/iconv.mk include jni/physfs.mk include jni/libsigc++.mk include jni/proxy-libintl.mk diff --git a/jni/sjconv b/jni/sjconv index 2e427c2..5ad437e 160000 --- a/jni/sjconv +++ b/jni/sjconv @@ -1 +1 @@ -Subproject commit 2e427c2cef8812ee11db51efa963b14941762e7f +Subproject commit 5ad437e76e08bcec9ea1bcece017d08dc24d3603 -- cgit v1.2.3