forked from cafeberry/cafeberry
Merge remote-tracking branch 'origin/main' into networking
This commit is contained in:
+10
-16
@@ -69,18 +69,15 @@ typedef unsigned __int64 __uint64;
|
||||
#endif
|
||||
|
||||
#ifdef _WINDOWS64
|
||||
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
|
||||
// Windows Header Files:
|
||||
#include <windows.h>
|
||||
#include <malloc.h>
|
||||
#include <tchar.h>
|
||||
// TODO: reference additional headers your program requires here
|
||||
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
|
||||
#include <d3d11.h>
|
||||
#include <DirectXMath.h>
|
||||
using namespace DirectX;
|
||||
|
||||
#include <windows.h>
|
||||
#include <malloc.h>
|
||||
#include <tchar.h>
|
||||
#include "Windows64Stubs.h"
|
||||
#define HRESULT_SUCCEEDED(hr) (((HRESULT)(hr)) >= 0)
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -176,7 +173,6 @@ typedef XUID GameSessionUID;
|
||||
#include "xbox\4JLibs\inc\4J_XTMS.h"
|
||||
#include "xbox\4JLibs\inc\4J_Storage.h"
|
||||
#elif defined (__PS3__)
|
||||
|
||||
#include "PS3\4JLibs\inc\4J_Input.h"
|
||||
#include "PS3\4JLibs\inc\4J_Profile.h"
|
||||
#include "PS3\4JLibs\inc\4J_Render.h"
|
||||
@@ -252,7 +248,6 @@ typedef XUID GameSessionUID;
|
||||
#include "Xbox\Social\SocialManager.h"
|
||||
#include "Xbox\Audio\SoundEngine.h"
|
||||
#include "Xbox\Xbox_UIController.h"
|
||||
|
||||
#elif defined (__PS3__)
|
||||
#include "extraX64client.h"
|
||||
#include "PS3\Sentient\MinecraftTelemetry.h"
|
||||
@@ -279,7 +274,7 @@ typedef XUID GameSessionUID;
|
||||
#include "DurangoMedia\4J_strings.h"
|
||||
#include "Durango\XML\ATGXmlParser.h"
|
||||
#include "Durango\Social\SocialManager.h"
|
||||
#include "Common\Audio\SoundEngine.h"
|
||||
#include "Common\Audio\SoundEngine.h"
|
||||
#include "Durango\Iggy\include\iggy.h"
|
||||
#include "Durango\Iggy\gdraw\gdraw_d3d11.h"
|
||||
#include "Durango\Durango_UIController.h"
|
||||
@@ -349,15 +344,13 @@ typedef XUID GameSessionUID;
|
||||
#include "Common\DLC\DLCPack.h"
|
||||
#include "Common\Telemetry\TelemetryManager.h"
|
||||
|
||||
#ifdef _XBOX
|
||||
//#include "Xbox\Xbox_App.h"
|
||||
#elif !defined(__PS3__)
|
||||
#if !(defined __PS3__ || _XBOX)
|
||||
#include "extraX64client.h"
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#if defined(_FINAL_BUILD) && !defined(_WINDOWS64)
|
||||
#if !defined(_WINDOWS64)
|
||||
#if defined(_FINAL_BUILD)
|
||||
#define printf BREAKTHECOMPILE
|
||||
#define wprintf BREAKTHECOMPILE
|
||||
#undef OutputDebugString
|
||||
@@ -365,5 +358,6 @@ typedef XUID GameSessionUID;
|
||||
#define OutputDebugStringA BREAKTHECOMPILE
|
||||
#define OutputDebugStringW BREAKTHECOMPILE
|
||||
#endif
|
||||
#endif
|
||||
|
||||
void MemSect(int sect);
|
||||
Reference in New Issue
Block a user