pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow Android platforms to read from .apk files via the RWOPS interface.

Browse source 
Fixes Bugzilla #1261.

Thanks to Tim Angus for the patch!
This commit is contained in:
Ryan C. Gordon 2011-07-29 16:51:25 -04:00
parent 58faae483b
commit 247346d526
5 changed files with 276 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/file/SDL_rwops.c
View file

@ -31,6 +31,10 @@
#include "cocoa/SDL_rwopsbundlesupport.h"
#endif /* __APPLE__ */
#ifdef ANDROID
#include "../core/android/SDL_android.h"
#endif
#ifdef __NDS__
/* include libfat headers for fatInitDefault(). */
#include <fat.h>
@ -441,7 +445,20 @@ SDL_RWFromFile(const char *file, const char *mode)
SDL_SetError("SDL_RWFromFile(): No file or no mode specified");
return NULL;
}
#if defined(__WIN32__)
#if defined(ANDROID)
rwops = SDL_AllocRW();
if (!rwops)
return NULL; /* SDL_SetError already setup by SDL_AllocRW() */
if (Android_JNI_FileOpen(rwops, file, mode) < 0) {
SDL_FreeRW(rwops);
return NULL;
}
rwops->seek = Android_JNI_FileSeek;
rwops->read = Android_JNI_FileRead;
rwops->write = Android_JNI_FileWrite;
rwops->close = Android_JNI_FileClose;
#elif defined(__WIN32__)
rwops = SDL_AllocRW();
if (!rwops)
return NULL; /* SDL_SetError already setup by SDL_AllocRW() */