summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--jni/Android.mk2
m---------jni/sjconv0
2 files changed, 1 insertions, 1 deletions
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
-Subproject 2e427c2cef8812ee11db51efa963b14941762e7
+Subproject 5ad437e76e08bcec9ea1bcece017d08dc24d360