From 23575576cacfe27f0dcd4440cf1ec507fc24b7c7 Mon Sep 17 00:00:00 2001 From: pelya Date: Tue, 19 Oct 2010 17:14:30 +0300 Subject: [PATCH] xerces does not depend on SDL, so not rebuilt when libSDL version changes --- project/jni/xerces/Android.mk | 2 +- project/jni/xerces/iconv/iconv.h | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/project/jni/xerces/Android.mk b/project/jni/xerces/Android.mk index f2e72b303..179ff7ae4 100644 --- a/project/jni/xerces/Android.mk +++ b/project/jni/xerces/Android.mk @@ -6,7 +6,7 @@ XERCES_SUBDIRS := $(patsubst $(LOCAL_PATH)/%, %, $(shell find $(LOCAL_PATH)/src/ LOCAL_MODULE := xerces -LOCAL_CFLAGS := -DHAVE_CONFIG_H -I$(LOCAL_PATH) -I$(LOCAL_PATH)/src -I$(LOCAL_PATH)/.. -I$(LOCAL_PATH)/../sdl-$(SDL_VERSION)/include +LOCAL_CFLAGS := -DHAVE_CONFIG_H -I$(LOCAL_PATH) -I$(LOCAL_PATH)/src -I$(LOCAL_PATH)/.. LOCAL_CPP_EXTENSION := .cpp diff --git a/project/jni/xerces/iconv/iconv.h b/project/jni/xerces/iconv/iconv.h index ffbe8eda2..cae44285f 100644 --- a/project/jni/xerces/iconv/iconv.h +++ b/project/jni/xerces/iconv/iconv.h @@ -7,7 +7,15 @@ extern "C" { #endif -#include +// #include // We'll have to rebuild xerces if we'll include this file and change SDL version, so just provide declarations here + +typedef struct _SDL_iconv_t *SDL_iconv_t; + +extern SDL_iconv_t SDL_iconv_open(const char *tocode, const char *fromcode); +extern int SDL_iconv_close(SDL_iconv_t cd); +extern size_t SDL_iconv(SDL_iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft); +extern char * SDL_iconv_string(const char *tocode, const char *fromcode, const char *inbuf, size_t inbytesleft); + #define iconv_t SDL_iconv_t #define iconv SDL_iconv #define iconv_open SDL_iconv_open