From bf6cb3e4f611fed127e44b8c25643090a33b8486 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 16 Oct 2012 21:08:55 +0200 Subject: [PATCH] (Android) Fixed JNI Makefile (General libretro) Build fix --- libretro/jni/Android.mk | 8 ++++---- libretro/libretro.c | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libretro/jni/Android.mk b/libretro/jni/Android.mk index 16b8983..3eea5a6 100644 --- a/libretro/jni/Android.mk +++ b/libretro/jni/Android.mk @@ -35,21 +35,21 @@ LOCAL_SRC_FILES := $(GENPLUS_SRC_DIR)/genesis.c \ $(GENPLUS_SRC_DIR)/cart_hw/areplay.c \ $(GENPLUS_SRC_DIR)/cart_hw/md_cart.c \ $(GENPLUS_SRC_DIR)/cart_hw/sms_cart.c \ - $(GENPLUS_SRC_DIR)/cart_hw/gg_eeprom.c \ - $(GENPLUS_SRC_DIR)/cart_hw/md_eeprom.c \ + $(GENPLUS_SRC_DIR)/cart_hw/eeprom_93c.c \ + $(GENPLUS_SRC_DIR)/cart_hw/eeprom_i2c.c \ + $(GENPLUS_SRC_DIR)/cart_hw/eeprom_spi.c \ $(GENPLUS_SRC_DIR)/cart_hw/ggenie.c \ $(GENPLUS_SRC_DIR)/cart_hw/sram.c \ $(GENPLUS_SRC_DIR)/cart_hw/svp/ssp16.c \ $(GENPLUS_SRC_DIR)/cart_hw/svp/svp.c \ $(GENPLUS_SRC_DIR)/ntsc/md_ntsc.c \ $(GENPLUS_SRC_DIR)/ntsc/sms_ntsc.c \ - $(GENPLUS_SRC_DIR)/sound/Fir_Resampler.c \ $(GENPLUS_SRC_DIR)/sound/eq.c \ $(GENPLUS_SRC_DIR)/sound/sound.c \ $(GENPLUS_SRC_DIR)/sound/ym2612.c \ $(GENPLUS_SRC_DIR)/sound/ym2413.c \ $(GENPLUS_SRC_DIR)/sound/sn76489.c \ - $(GENPLUS_SRC_DIR)/sound/blip.c \ + $(GENPLUS_SRC_DIR)/sound/blip_buf.c \ $(GENPLUS_SRC_DIR)/z80/z80.c \ $(GENPLUS_SRC_DIR)/m68k/m68kcpu.c \ $(GENPLUS_SRC_DIR)/m68k/s68kcpu.c \ diff --git a/libretro/libretro.c b/libretro/libretro.c index c414fbd..a8c557a 100644 --- a/libretro/libretro.c +++ b/libretro/libretro.c @@ -272,6 +272,10 @@ static void config_default(void) config.hot_swap &= 1; } +/* these values are used for libretro reporting too */ +static const double pal_fps = 53203424.0 / (3420.0 * 313.0); +static const double ntsc_fps = 53693175.0 / (3420.0 * 262.0); + static void init_audio(void) { audio_init(44100, 0);