RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge from libretro/master:7ff457f for repo synchronization

Browse source
This commit is contained in:
kub 2022-04-19 23:58:59 +02:00
parent 45d0add214
commit a5085db3ea
19 changed files with 1015 additions and 311 deletions
Download patch file Download diff file Expand all files Collapse all files

2
platform/common/emu.c
View file

@ -451,7 +451,7 @@ int emu_reload_rom(const char *rom_fname_in)
emu_make_path(carthw_path, "carthw.cfg", sizeof(carthw_path));
media_type = PicoLoadMedia(rom_fname, carthw_path,
media_type = PicoLoadMedia(rom_fname, NULL, 0, carthw_path,
find_bios, do_region_override);
switch (media_type) {

4
platform/common/mp3_drmp3.c
View file

@ -9,6 +9,10 @@
#include <stdio.h>
#include <pico/pico_int.h>
// Ugh, drmp3 tries to use wfopen on windows, which breaks libretro VFS...
#define __acrt_iob_func __acrt_iob_func2
#define _wfopen_s(p,m) NULL
#define _wfopen(p,m) NULL
#define DR_MP3_IMPLEMENTATION
#include "dr_libs/dr_mp3.h"
#include "mp3.h"