android fix

This commit is contained in:
R-type
2015-12-15 14:59:19 +01:00
parent 1db63d0830
commit 5132452264
4 changed files with 22 additions and 8 deletions
+3 -1
View File
@@ -207,7 +207,9 @@ int AFILE_OpenFile(const char *filename, int reboot, int diskno, int readonly)
return AFILE_ERROR;
#else /* BASIC */
/* r > 0 */
#ifndef ANDROID
//LIBRETRO HACK
//#ifndef ANDROID
#if !defined(ANDROID) || defined(__LIBRETRO__)
CARTRIDGE_SetTypeAutoReboot(&CARTRIDGE_main, UI_SelectCartType(r));
#else
return (r << 8) | AFILE_ROM;
+10 -2
View File
@@ -424,7 +424,9 @@ int Atari800_Initialise(int *argc, char *argv[])
}
*argc = j;
}
#ifndef ANDROID
//LIBRETRO HACK
//#ifndef ANDROID
#if !defined(ANDROID) || defined(__LIBRETRO__)
got_config = CFG_LoadConfig(rtconfig_filename);
#else
got_config = TRUE; /* pretend we got a config file -- not needed in Android */
@@ -432,7 +434,13 @@ int Atari800_Initialise(int *argc, char *argv[])
/* try to find ROM images if the configuration file is not found
or it does not specify some ROM paths (blank paths count as specified) */
#ifndef ANDROID
//LIBRETRO HACK
//#ifndef ANDROID
#if !defined(ANDROID) || defined(__LIBRETRO__)
#if defined(__LIBRETRO__) && defined(ANDROID)
//FIXME USE RETROSYSDIR
SYSROM_FindInDir("/mnt/sdcard/atari800", TRUE);
#endif
SYSROM_FindInDir(".", TRUE); /* current directory */
#if defined(unix) || defined(__unix__) || defined(__linux__)
SYSROM_FindInDir("/usr/share/atari800", TRUE);