From 5e0bdd887f76859c0e26226690bfae550883f643 Mon Sep 17 00:00:00 2001 From: orbea Date: Wed, 29 Aug 2018 07:18:39 -0700 Subject: [PATCH 1/2] (libretro) Don't define FASTCALL if it has been defined already. --- sdl2/libretro/compiler.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdl2/libretro/compiler.h b/sdl2/libretro/compiler.h index e0459e8..8ef28c3 100644 --- a/sdl2/libretro/compiler.h +++ b/sdl2/libretro/compiler.h @@ -240,7 +240,9 @@ typedef SINT32 FILELEN; //#define UINT32_TO_PTR(v) GUINT_TO_POINTER((UINT32)(v)) //outdated things to ignore +#if !defined(FASTCALL) #define FASTCALL +#endif #define CPUCALL #define MEMCALL #define DMACCALL From ada53ca8f4bd052235ba0e055b098cd3ef5c0275 Mon Sep 17 00:00:00 2001 From: orbea Date: Wed, 29 Aug 2018 09:13:20 -0700 Subject: [PATCH 2/2] (libretro) Attempt to further fix windows builds. --- sdl2/dosio.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sdl2/dosio.c b/sdl2/dosio.c index b515e40..9d437da 100755 --- a/sdl2/dosio.c +++ b/sdl2/dosio.c @@ -187,7 +187,7 @@ short file_rename(const char *existpath, const char *newpath) { short file_dircreate(const char *path) { #if !(defined(__LIBRETRO__) && defined(VITA)) -#if defined(WIN32) && (!defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)) +#if (defined(__LIBRETRO__) && defined(_WIN32)) || (defined(WIN32) && (!defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR))) return((short)mkdir(path)); #else return((short)mkdir(path, 0777)); @@ -200,7 +200,6 @@ short file_dirdelete(const char *path) { return((short)rmdir(path)); } - /* カレントファイル操作 */ void file_setcd(const char *exepath) {