mirror of
https://github.com/RaySollium99/picodrive.git
synced 2025-09-05 15:27:46 -04:00
Merge from libretro/master:46902e0 for repo synchronization
This commit is contained in:
parent
9d1ecde692
commit
61d76999d7
74 changed files with 14043 additions and 2094 deletions
|
@ -200,7 +200,7 @@ $(FR)cpu/cyclone/Cyclone.h:
|
|||
|
||||
$(FR)cpu/cyclone/Cyclone.s: $(FR)cpu/$(CYCLONE_CONFIG)
|
||||
@echo building Cyclone...
|
||||
@make -C $(R)cpu/cyclone/ CONFIG_FILE=../$(CYCLONE_CONFIG) HAVE_ARMv6=$(HAVE_ARMv6)
|
||||
@make CC=$(CYCLONE_CC) CXX=$(CYCLONE_CXX) -C $(R)cpu/cyclone/ CONFIG_FILE=../$(CYCLONE_CONFIG) HAVE_ARMv6=$(HAVE_ARMv6)
|
||||
|
||||
$(FR)cpu/cyclone/Cyclone.s: $(FR)cpu/cyclone/*.cpp $(FR)cpu/cyclone/*.h
|
||||
|
||||
|
|
|
@ -18,6 +18,10 @@
|
|||
#include "../libpicofe/lprintf.h"
|
||||
#include "config_file.h"
|
||||
|
||||
#ifdef USE_LIBRETRO_VFS
|
||||
#include "file_stream_transforms.h"
|
||||
#endif
|
||||
|
||||
static char *mystrip(char *str);
|
||||
|
||||
#ifndef _MSC_VER
|
||||
|
|
|
@ -28,6 +28,10 @@
|
|||
#include <pico/pico_int.h>
|
||||
#include <pico/patch.h>
|
||||
|
||||
#ifdef USE_LIBRETRO_VFS
|
||||
#include "file_stream_transforms.h"
|
||||
#endif
|
||||
|
||||
#if defined(__GNUC__) && __GNUC__ >= 7
|
||||
#pragma GCC diagnostic ignored "-Wformat-truncation"
|
||||
#endif
|
||||
|
|
|
@ -21,6 +21,9 @@
|
|||
#include "version.h"
|
||||
#include <cpu/debug.h>
|
||||
|
||||
#ifdef USE_LIBRETRO_VFS
|
||||
#include "file_stream_transforms.h"
|
||||
#endif
|
||||
|
||||
static int load_state_slot = -1;
|
||||
char **g_argv;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue