(MSVC 2005) MSVC 2005 and earlier cannot use nbio_windowsmmap.c -

so disable it
This commit is contained in:
twinaphex 2020-08-01 22:51:23 +02:00
parent 8441f60314
commit 97297f71af
3 changed files with 51 additions and 3 deletions

View File

@ -39,6 +39,22 @@
#endif
#endif
#if defined(_WIN32)
#if defined(_MSC_VER) && _MSC_VER >= 1500
#ifndef HAVE_MMAP_WIN32
#define HAVE_MMAP_WIN32
#endif
#elif !defined(_MSC_VER)
#ifndef HAVE_MMAP_WIN32
#define HAVE_MMAP_WIN32
#endif
#endif
#endif
#define JSON_STATIC 1 /* must come before runtime_file, netplay_room_parse and jsonsax_full */
#if _MSC_VER && !defined(__WINRT__)
@ -1057,7 +1073,7 @@ FILE
#if defined(HAVE_MMAP) && defined(BSD)
#include "../libretro-common/file/nbio/nbio_unixmmap.c"
#endif
#if defined(_WIN32) && !defined(_XBOX)
#if defined(HAVE_MMAP_WIN32)
#include "../libretro-common/file/nbio/nbio_windowsmmap.c"
#endif
#if defined(ORBIS)

View File

@ -37,11 +37,27 @@ extern nbio_intf_t nbio_orbis;
#endif
extern nbio_intf_t nbio_stdio;
#if defined(_WIN32)
#if defined(_MSC_VER) && _MSC_VER >= 1500
#ifndef HAVE_MMAP_WIN32
#define HAVE_MMAP_WIN32
#endif
#elif !defined(_MSC_VER)
#ifndef HAVE_MMAP_WIN32
#define HAVE_MMAP_WIN32
#endif
#endif
#endif
#if defined(_linux__)
static nbio_intf_t *internal_nbio = &nbio_linux;
#elif defined(HAVE_MMAP) && defined(BSD)
static nbio_intf_t *internal_nbio = &nbio_mmap_unix;
#elif defined(_WIN32) && !defined(_XBOX)
#elif defined(HAVE_MMAP_WIN32)
static nbio_intf_t *internal_nbio = &nbio_mmap_win32;
#elif defined(ORBIS)
static nbio_intf_t *internal_nbio = &nbio_orbis;

View File

@ -22,7 +22,23 @@
#include <file/nbio.h>
#if defined(_WIN32) && !defined(_XBOX)
#if defined(_WIN32)
#if defined(_MSC_VER) && _MSC_VER >= 1500
#ifndef HAVE_MMAP_WIN32
#define HAVE_MMAP_WIN32
#endif
#elif !defined(_MSC_VER)
#ifndef HAVE_MMAP_WIN32
#define HAVE_MMAP_WIN32
#endif
#endif
#endif
#if defined(HAVE_MMAP_WIN32)
#include <stdio.h>
#include <stdlib.h>