From a2fe0330ebc01561d050d0806300c390c345b5cf Mon Sep 17 00:00:00 2001 From: TwinAphex51224 Date: Sun, 4 Mar 2012 23:15:25 +0100 Subject: [PATCH] (360) 360 compiles again --- console/rom_ext.c | 4 ++++ general.h | 6 ++++-- msvc-360/SSNES-360/SSNES-360.vcxproj | 4 +++- ssnes.c | 6 ++++-- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/console/rom_ext.c b/console/rom_ext.c index adaac3a70d..6224a0940b 100644 --- a/console/rom_ext.c +++ b/console/rom_ext.c @@ -23,6 +23,10 @@ #include #include +#ifdef _WIN32 +#include "../posix_string.h" +#endif + const char *ssnes_console_get_rom_ext(void) { const char *id = snes_library_id(); diff --git a/general.h b/general.h index 3e6cf1324f..15966eeed9 100644 --- a/general.h +++ b/general.h @@ -62,10 +62,12 @@ #if defined(_WIN32) && !defined(_XBOX) #define WIN32_LEAN_AND_MEAN #include -#include "msvc/msvc_compat.h" #elif defined(_XBOX) #include -#include "360/msvc_compat.h" +#endif + +#if defined(_WIN32) +#include "msvc/msvc_compat.h" #endif #define MAX_PLAYERS 8 diff --git a/msvc-360/SSNES-360/SSNES-360.vcxproj b/msvc-360/SSNES-360/SSNES-360.vcxproj index d78cfd81a6..09bcfe0760 100644 --- a/msvc-360/SSNES-360/SSNES-360.vcxproj +++ b/msvc-360/SSNES-360/SSNES-360.vcxproj @@ -292,7 +292,9 @@ - + + true + true diff --git a/ssnes.c b/ssnes.c index 84f029ed28..2512cb0f69 100644 --- a/ssnes.c +++ b/ssnes.c @@ -38,10 +38,12 @@ #if defined(_WIN32) && !defined(_XBOX) #define WIN32_LEAN_AND_MEAN #include -#include "msvc/msvc_compat.h" #elif defined(_XBOX) #include -#include "360/msvc_compat.h" +#endif + +#ifdef _WIN32 +#include "msvc/msvc_compat.h" #endif #ifdef __APPLE__