(MSVC Xbox) Build fix

mednafen/mednafen-types.h

@@ -1,57 +1,21 @@
 #ifndef __MDFN_TYPES
 #define __MDFN_TYPES
 
-#ifndef __LIBRETRO__
-// Make sure this file is included BEFORE a few common standard C header files(stdio.h, errno.h, math.h, AND OTHERS, but this is not an exhaustive check, nor
-// should it be), so that any defines in config.h that change header file behavior will work properly.
-#if defined(EOF) || defined(EACCES) || defined(F_LOCK) || defined(NULL) || defined(O_APPEND) || defined(M_LOG2E)
- #error "Wrong include order for types.h"
-#endif
-#endif
-
-// Yes, yes, I know:  There's a better place for including config.h than here, but I'm tired, and this should work fine. :b
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <assert.h>
-#include <inttypes.h>
-
-#if HAVE_MKDIR
- #if MKDIR_TAKES_ONE_ARG
-  #define MDFN_mkdir(a, b) mkdir(a)
- #else
-  #define MDFN_mkdir(a, b) mkdir(a, b)
- #endif
-#else
- #if HAVE__MKDIR
-  /* Plain Win32 */
-  #define MDFN_mkdir(a, b) _mkdir(a)
- #else
-  #error "Don't know how to create a directory on this system."
- #endif
-#endif
+#include <stdint.h>
 
 typedef int8_t int8;
 typedef int16_t int16;
-typedef int32_t int32;
+typedef int32_t int32; 
 typedef int64_t int64;
 
-typedef uint8_t uint8;
+typedef uint8_t uint8;  
 typedef uint16_t uint16;
 typedef uint32_t uint32;
 typedef uint64_t uint64;
 
-
-#if !defined(HAVE_NATIVE64BIT) && SIZEOF_VOID_P >= 8
-#define HAVE_NATIVE64BIT 1
-#endif
-
 #ifdef __GNUC__
 
-  #define MDFN_MAKE_GCCV(maj,min,pl) (((maj)*100*100) + ((min) * 100) + (pl))
-  #define MDFN_GCC_VERSION	MDFN_MAKE_GCCV(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
-
   #define INLINE inline __attribute__((always_inline))
   #define NO_INLINE __attribute__((noinline))
 
@@ -64,26 +28,13 @@ typedef uint64_t uint64;
   #define MDFN_ALIGN(n)	__attribute__ ((aligned (n)))
   #define MDFN_FORMATSTR(a,b,c) __attribute__ ((format (a, b, c)));
   #define MDFN_WARN_UNUSED_RESULT __attribute__ ((warn_unused_result))
-  #define MDFN_NOWARN_UNUSED __attribute__((unused))
 
- #define MDFN_UNLIKELY(n) __builtin_expect((n) != 0, 0)
- #define MDFN_LIKELY(n) __builtin_expect((n) != 0, 1)
-
- #if MDFN_GCC_VERSION >= MDFN_MAKE_GCCV(4,3,0)
-  #define MDFN_COLD __attribute__((cold))
- #else
-  #define MDFN_COLD
- #endif
-
- #undef MDFN_MAKE_GCCV
- #undef MDFN_GCC_VERSION
 #elif defined(_MSC_VER)
+#define roundf(in) (in >= 0.0f ? floorf(in + 0.5f) : ceilf(in - 0.5f))
+  #define INLINE inline
+  #define NO_INLINE
 
-  #warning "Compiling with MSVC, untested"
-  #define INLINE __forceinline
-  #define NO_INLINE __declspec(noinline)
-
-  #define MDFN_FASTCALL __fastcall
+  #define MDFN_FASTCALL
 
   #define MDFN_ALIGN(n) __declspec(align(n))
 
@@ -91,12 +42,6 @@ typedef uint64_t uint64;
 
   #define MDFN_WARN_UNUSED_RESULT
 
-  #define MDFN_NOWARN_UNUSED
-
-  #define MDFN_UNLIKELY(n) ((n) != 0)
-  #define MDFN_LIKELY(n) ((n) != 0)
-
-  #define MDFN_COLD
 #else
   #error "Not compiling with GCC nor MSVC"
   #define INLINE inline
@@ -110,12 +55,6 @@ typedef uint64_t uint64;
 
   #define MDFN_WARN_UNUSED_RESULT
 
-  #define MDFN_NOWARN_UNUSED
-
-  #define MDFN_UNLIKELY(n) ((n) != 0)
-  #define MDFN_LIKELY(n) ((n) != 0)
-
-  #define MDFN_COLD
 #endif
 
 
@@ -155,29 +94,6 @@ typedef struct
  };
 } Uuint32;
 
-
-#if PSS_STYLE==2
-
-#define PSS "\\"
-#define MDFN_PS '\\'
-
-#elif PSS_STYLE==1
-
-#define PSS "/"
-#define MDFN_PS '/'
-
-#elif PSS_STYLE==3
-
-#define PSS "\\"
-#define MDFN_PS '\\'
-
-#elif PSS_STYLE==4
-
-#define PSS ":" 
-#define MDFN_PS ':'
-
-#endif
-
 typedef uint32   UTF32;  /* at least 32 bits */
 typedef uint16  UTF16;  /* at least 16 bits */
 typedef uint8   UTF8;   /* typically 8 bits */
@@ -191,6 +107,8 @@ typedef unsigned char   Boolean; /* 0 or 1 */
 #define TRUE 1
 #endif
 
+#define MDFN_COLD
+
 #undef require
 #define require( expr ) assert( expr )
 

stubs.cpp

@@ -12,7 +12,11 @@
 
 #ifdef _WIN32
 #include <io.h>
+#ifdef _XBOX
+#include <xtl.h>
+#else
 #include <windows.h>
+#endif
 #else
 #include <unistd.h>
 #endif