Updated makefiles to work with newer CrystaX NDK

project/jni/Android.mk

@@ -27,7 +27,7 @@ NDK_R5_TOOLCHAIN := 1
 endif
 ifneq ($(findstring r5-crystax-1,$(NDK_VERSION)),)
 $(info Building with CrystaX r5 toolchain - wchar support enabled)
-CRYSTAX_R5B3_TOOLCHAIN := 1
+CRYSTAX_R5_TOOLCHAIN := 1
 endif
 
 NDK_PATH := $(shell dirname $(shell which ndk-build))

project/jni/application/Android.mk

@@ -25,8 +25,8 @@ LOCAL_C_INCLUDES :=
 ifeq ($(CRYSTAX_TOOLCHAIN)$(NDK_R5_TOOLCHAIN),)
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../stlport/stlport
 endif
-ifneq ($(CRYSTAX_R5B3_TOOLCHAIN),)
-LOCAL_C_INCLUDES += $(NDK_PATH)/sources/wchar-support/include
+ifneq ($(CRYSTAX_R5_TOOLCHAIN),)
+LOCAL_C_INCLUDES += $(NDK_PATH)/sources/crystax/include
 endif
 
 LOCAL_C_INCLUDES += $(foreach D, $(APP_SUBDIRS), $(LOCAL_PATH)/$(D)) \
@@ -54,8 +54,8 @@ LOCAL_LDFLAGS := -Lobj/local/armeabi
 
 LOCAL_LDFLAGS += $(APPLICATION_ADDITIONAL_LDFLAGS)
 
-ifneq ($(CRYSTAX_R5B3_TOOLCHAIN),)
-LOCAL_LDLIBS += -L$(NDK_PATH)/sources/wchar-support/libs/armeabi -lwchar_static
+ifneq ($(CRYSTAX_R5_TOOLCHAIN),)
+LOCAL_LDLIBS += -L$(NDK_PATH)/sources/crystax/libs/armeabi -lcrystax_static
 endif
 
 LIBS_WITH_LONG_SYMBOLS := $(strip $(shell \

project/jni/sdl-1.3/Android.mk

@@ -58,4 +58,8 @@ LOCAL_SRC_FILES := $(foreach F, $(SDL_SRCS), $(addprefix $(dir $(F)),$(notdir $(
 
 LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog
 
+ifneq ($(CRYSTAX_R5_TOOLCHAIN),)
+LOCAL_LDLIBS += -L$(NDK_PATH)/sources/crystax/libs/armeabi -lcrystax_static
+endif
+
 include $(BUILD_SHARED_LIBRARY)