Pecus/libretro-atari800
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

android fix

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.common
+2 -2
View File
@@ -1,7 +1,7 @@
INCFLAGS := -I$(CORE_DIR) \ INCFLAGS := -I$(CORE_DIR) \
-I$(CORE_DIR)/atari800/src \ -I$(CORE_DIR)/atari800/src \
-I$(CORE_DIR)/libretro -I$(CORE_DIR)/libretro \
-I$(CORE_DIR)/libretro/libco
SOURCES_C := \ SOURCES_C := \
$(CORE_DIR)/libretro/libco/libco.c $(CORE_DIR)/libretro/libco/libco.c
atari800/src/afile.c
+3 -1
View File
@@ -207,7 +207,9 @@ int AFILE_OpenFile(const char *filename, int reboot, int diskno, int readonly)
return AFILE_ERROR; return AFILE_ERROR;
#else /* BASIC */ #else /* BASIC */
/* r > 0 */ /* r > 0 */
#ifndef ANDROID //LIBRETRO HACK
//#ifndef ANDROID
#if !defined(ANDROID) || defined(__LIBRETRO__)
CARTRIDGE_SetTypeAutoReboot(&CARTRIDGE_main, UI_SelectCartType(r)); CARTRIDGE_SetTypeAutoReboot(&CARTRIDGE_main, UI_SelectCartType(r));
#else #else
return (r << 8) | AFILE_ROM; return (r << 8) | AFILE_ROM;
atari800/src/atari.c
+10 -2
View File
@@ -424,7 +424,9 @@ int Atari800_Initialise(int *argc, char *argv[])
} }
*argc = j; *argc = j;
} }
#ifndef ANDROID //LIBRETRO HACK
//#ifndef ANDROID
#if !defined(ANDROID) || defined(__LIBRETRO__)
got_config = CFG_LoadConfig(rtconfig_filename); got_config = CFG_LoadConfig(rtconfig_filename);
#else #else
got_config = TRUE; /* pretend we got a config file -- not needed in Android */ 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 /* 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) */ 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 */ SYSROM_FindInDir(".", TRUE); /* current directory */
#if defined(unix) || defined(__unix__) || defined(__linux__) #if defined(unix) || defined(__unix__) || defined(__linux__)
SYSROM_FindInDir("/usr/share/atari800", TRUE); SYSROM_FindInDir("/usr/share/atari800", TRUE);
libretro/core-mapper.c
+4
View File
@@ -192,16 +192,20 @@ extern unsigned short int bmp[400*300];
extern unsigned atari_devices[ 2 ]; extern unsigned atari_devices[ 2 ];
#include "pokeysnd.h" #include "pokeysnd.h"
extern int UI_is_active;
void retro_sound_update() void retro_sound_update()
{ {
int x,silent=POKEYSND_enable_new_pokey?24449:32768; int x,silent=POKEYSND_enable_new_pokey?24449:32768;
if (! UI_is_active) {
POKEYSND_Process(SNDBUF,snd_sampler_pal*2); POKEYSND_Process(SNDBUF,snd_sampler_pal*2);
for(x=0;x<snd_sampler_pal*2;x+=2) for(x=0;x<snd_sampler_pal*2;x+=2)
retro_audio_cb(SNDBUF[x]+silent,SNDBUF[x+1]+silent); retro_audio_cb(SNDBUF[x]+silent,SNDBUF[x+1]+silent);
} }
}
//FIXME in kdbauto.c //FIXME in kdbauto.c
extern void vkbd_key(int key,int pressed); extern void vkbd_key(int key,int pressed);