core, libretro vfs support

diff --git a/Makefile.libretro b/Makefile.libretro
index aa20d45..3c7c67a 100644 (file)
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -34,7 +34,8 @@ CFLAGS += -I platform/libretro/libretro-common/include/streams
 CFLAGS += -I platform/libretro/libretro-common/include/string
 CFLAGS += -I platform/libretro/libretro-common/include/vfs
 
-STATIC_LINKING:= 0
+USE_LIBRETRO_VFS := 1
+STATIC_LINKING := 0
 TARGET_NAME := picodrive
 LIBM := -lm
 GIT_VERSION ?= $(shell git rev-parse --short HEAD || echo unknown)
@@ -457,7 +458,6 @@ else ifneq (,$(findstring windows_msvc2017,$(platform)))
        ARCH = x86_64
        SHARED :=
        LIBM :=
-       USE_LIBRETRO_VFS = 1
        NO_ALIGN_FUNCTIONS = 1
 
        CFLAGS += -DHAVE_VSNPRINTF

diff --git a/pico/cart.c b/pico/cart.c
index 1b15a45..39d697c 100644 (file)
--- a/pico/cart.c
+++ b/pico/cart.c
@@ -10,10 +10,6 @@
 #include "pico_int.h"\r
 #include <cpu/debug.h>\r
 \r
-#ifdef USE_LIBRETRO_VFS\r
-#include "file_stream_transforms.h"\r
-#endif\r
-\r
 #if defined(USE_LIBCHDR)\r
 #include "libchdr/chd.h"\r
 #include "libchdr/cdrom.h"\r

diff --git a/pico/cd/cd_image.c b/pico/cd/cd_image.c
index 530071a..3f220f8 100644 (file)
--- a/pico/cd/cd_image.c
+++ b/pico/cd/cd_image.c
@@ -11,10 +11,6 @@
 #include "cdd.h"
 #include "cd_parse.h"
 
-#ifdef USE_LIBRETRO_VFS
-#include "file_stream_transforms.h"
-#endif
-
 #if defined(__GNUC__) && __GNUC__ >= 7
 #pragma GCC diagnostic ignored "-Wformat-truncation"
 #endif

diff --git a/pico/cd/cd_parse.c b/pico/cd/cd_parse.c
index 974e993..574070d 100644 (file)
--- a/pico/cd/cd_parse.c
+++ b/pico/cd/cd_parse.c
@@ -13,10 +13,6 @@
 #include "cd_parse.h"
 // #define elprintf(w,f,...) printf(f "\n",##__VA_ARGS__);
 
-#ifdef USE_LIBRETRO_VFS
-#include "file_stream_transforms.h"
-#endif
-
 #if defined(USE_LIBCHDR)
 #include "libchdr/chd.h"
 #include "libchdr/cdrom.h"

diff --git a/pico/patch.c b/pico/patch.c
index b4c2d89..cd4620d 100644 (file)
--- a/pico/patch.c
+++ b/pico/patch.c
@@ -25,10 +25,6 @@
 #include "memory.h"
 #include "patch.h"
 
-#ifdef USE_LIBRETRO_VFS
-#include "file_stream_transforms.h"
-#endif
-
 struct patch
 {
    unsigned int addr;

diff --git a/pico/pico_port.h b/pico/pico_port.h
index dc9cdff..41a4ce2 100644 (file)
--- a/pico/pico_port.h
+++ b/pico/pico_port.h
@@ -8,6 +8,10 @@
 #endif
 #include "pico_types.h"
 
+#ifdef USE_LIBRETRO_VFS
+#include "file_stream_transforms.h"
+#endif
+
 #if defined(__GNUC__) && defined(__i386__)
 #define REGPARM(x) __attribute__((regparm(x)))
 #else

diff --git a/pico/sek.c b/pico/sek.c
index b5649dc..9980837 100644 (file)
--- a/pico/sek.c
+++ b/pico/sek.c
@@ -10,10 +10,6 @@
 #include "pico_int.h"\r
 #include "memory.h"\r
 \r
-#ifdef USE_LIBRETRO_VFS\r
-#include "file_stream_transforms.h"\r
-#endif\r
-\r
 /* context */\r
 // Cyclone 68000\r
 #ifdef EMU_C68K\r

diff --git a/pico/state.c b/pico/state.c
index af2d4cc..123b1ac 100644 (file)
--- a/pico/state.c
+++ b/pico/state.c
@@ -14,10 +14,6 @@
 #include "sound/emu2413/emu2413.h"\r
 #include "state.h"\r
 \r
-#ifdef USE_LIBRETRO_VFS\r
-#include "file_stream_transforms.h"\r
-#endif\r
-\r
 // sn76496 & ym2413\r
 extern int *sn76496_regs;\r
 extern OPLL old_opll;\r

diff --git a/platform/common/config_file.c b/platform/common/config_file.c
index c4f611d..6f72f75 100644 (file)
--- a/platform/common/config_file.c
+++ b/platform/common/config_file.c
@@ -18,10 +18,6 @@
 #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

diff --git a/platform/common/emu.c b/platform/common/emu.c
index 5d4f8ff..2352bf5 100644 (file)
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -28,10 +28,6 @@
 #include <pico/pico_int.h>\r
 #include <pico/patch.h>\r
 \r
-#ifdef USE_LIBRETRO_VFS\r
-#include "file_stream_transforms.h"\r
-#endif\r
-\r
 #if defined(__GNUC__) && __GNUC__ >= 7\r
 #pragma GCC diagnostic ignored "-Wformat-truncation"\r
 #endif\r

diff --git a/platform/common/main.c b/platform/common/main.c
index a7a8312..3c1998c 100644 (file)
--- a/platform/common/main.c
+++ b/platform/common/main.c
@@ -21,10 +21,6 @@
 #include "version.h"\r
 #include <cpu/debug.h>\r
 \r
-#ifdef USE_LIBRETRO_VFS\r
-#include "file_stream_transforms.h"\r
-#endif\r
-\r
 static int load_state_slot = -1;\r
 char **g_argv;\r
 \r

diff --git a/platform/libretro/libretro.c b/platform/libretro/libretro.c
index 8646865..9a4e9c0 100644 (file)
--- a/platform/libretro/libretro.c
+++ b/platform/libretro/libretro.c
@@ -32,10 +32,6 @@
 #include <libkern/OSCacheControl.h>
 #endif
 
-#ifdef USE_LIBRETRO_VFS
-#include "file_stream_transforms.h"
-#endif
-
 #if defined(RENDER_GSKIT_PS2)
 #include <malloc.h>
 #include "libretro-common/include/libretro_gskit_ps2.h"

diff --git a/unzip/unzip.h b/unzip/unzip.h
index 8d15d05..f92b8a3 100644 (file)
--- a/unzip/unzip.h
+++ b/unzip/unzip.h
@@ -3,6 +3,10 @@
 \r
 #include <stdio.h>\r
 \r
+#ifdef USE_LIBRETRO_VFS\r
+#include "file_stream_transforms.h"\r
+#endif\r
+\r
 #ifdef __cplusplus\r
 extern "C" {\r
 #endif\r

diff --git a/zlib/gzio.c b/zlib/gzio.c
index 02a0a01..9f1e043 100644 (file)
--- a/zlib/gzio.c
+++ b/zlib/gzio.c
@@ -9,6 +9,10 @@
 
 #include <stdio.h>
 
+#ifdef USE_LIBRETRO_VFS
+#include "file_stream_transforms.h"
+#endif
+
 #include "zutil.h"
 
 #ifdef NO_DEFLATE       /* for compatibility with old definition */