diff --git a/Core/Config.cpp b/Core/Config.cpp index 1f40ab67e7..c0ecd0f656 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -20,7 +20,9 @@ #include "ext/vjson/json.h" #include "file/ini_file.h" #include "i18n/i18n.h" +#ifndef _XBOX #include "gfx_es2/gpu_features.h" +#endif #include "net/http_client.h" #include "util/text/parsers.h" #include "net/url.h" diff --git a/Core/Core.cpp b/Core/Core.cpp index 2f11731fbd..1116300d78 100644 --- a/Core/Core.cpp +++ b/Core/Core.cpp @@ -31,7 +31,9 @@ #include "Core/MIPS/MIPS.h" #ifdef _WIN32 +#ifndef _XBOX #include "Windows/OpenGLBase.h" +#endif #include "Windows/InputDevice.h" #endif diff --git a/Core/Debugger/SymbolMap.cpp b/Core/Debugger/SymbolMap.cpp index e3a0b56dae..68c087f631 100644 --- a/Core/Debugger/SymbolMap.cpp +++ b/Core/Debugger/SymbolMap.cpp @@ -904,7 +904,7 @@ DataType SymbolMap::GetDataType(u32 startAddress) const { return it->second.type; } -#ifdef _WIN32 +#if defined(_WIN32) && !defined(_XBOX) struct DefaultSymbol { u32 address; diff --git a/Core/HLE/sceRtc.cpp b/Core/HLE/sceRtc.cpp index 9661b85826..c3fe52d814 100644 --- a/Core/HLE/sceRtc.cpp +++ b/Core/HLE/sceRtc.cpp @@ -17,7 +17,10 @@ #ifdef _WIN32 #include "Common/CommonWindows.h" +#ifndef _XBOX + // timeval already defined in xtl.h #include +#endif #else #include #endif diff --git a/Core/Reporting.cpp b/Core/Reporting.cpp index 34aa865814..960ef7a0c2 100644 --- a/Core/Reporting.cpp +++ b/Core/Reporting.cpp @@ -31,9 +31,11 @@ #include "GPU/GPUState.h" #include "GPU/GLES/Framebuffer.h" +#ifndef _XBOX #include "net/http_client.h" #include "net/resolve.h" #include "net/url.h" +#endif #include "base/buffer.h" #include "thread/thread.h" @@ -42,6 +44,13 @@ #include #include +#ifdef _XBOX +namespace Reporting +{ + bool IsEnabled() { return false;} + void ReportMessage(const char *message, ...) { } +} +#else namespace Reporting { const int DEFAULT_PORT = 80; @@ -381,3 +390,5 @@ namespace Reporting } } + +#endif diff --git a/Core/System.cpp b/Core/System.cpp index 12aebdf5cb..e4f18c3742 100644 --- a/Core/System.cpp +++ b/Core/System.cpp @@ -15,7 +15,7 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#ifdef _WIN32 +#if defined(_WIN32) && !defined(_XBOX) #include "Common/CommonWindows.h" #include #include