game compiles

Minecraft.Client/Build/Common/Leaderboards/LeaderboardManager.cpp

@@ -9,6 +9,8 @@ const wstring LeaderboardManager::filterNames[eNumFilterModes] =
 		L"Friends", L"MyScore", L"TopRank"
 	};
 
+LeaderboardManager *LeaderboardManager::m_instance = NULL;
+
 void LeaderboardManager::DeleteInstance()
 {
 	delete m_instance;

Minecraft.Client/Build/Common/Telemetry/TelemetryManager.h

@@ -1,6 +1,13 @@
 #pragma once
 
+// On Linux, the Orbis TelemetryEnum.h is already pulled in via stdafx.h ->
+// SentientManager.h -> MinecraftTelemetry.h. Using the Windows64 path would
+// cause duplicate enum definitions.
+#if defined(__linux__)
+#include "../../../Platform/Orbis/Sentient/TelemetryEnum.h"
+#else
 #include "../../../Platform/Windows64/Sentient/TelemetryEnum.h"
+#endif
 #include "../UI/UIEnums.h"
 
 class CTelemetryManager

Minecraft.Client/Build/Extrax64Stubs.cpp

@@ -26,6 +26,12 @@
 #include "../Platform/PSVita/Social/SocialManager.h"
 #include "../Platform/PSVita/Sentient/DynamicConfigurations.h"
 #include <libperf.h>
+#elif defined __linux__
+// On Linux, stdafx.h already provides Orbis-compatible Sentient/Dynamic headers
+// via #pragma once. Pull in SentientManager for CSentientManager class declaration
+// and StatsCounter; CSocialManager is provided as inline stubs via Platform/Linux/Social/SocialManager.h.
+#include "../Platform/Orbis/Sentient/SentientManager.h"
+#include "../GameState/StatsCounter.h"
 #else
 #include "../Platform/Orbis/Sentient/SentientManager.h"
 #include "../GameState/StatsCounter.h"
@@ -42,13 +48,14 @@ C_4JProfile ProfileManager;
 CSentientManager SentientManager;
 CXuiStringTable StringTable;
 
-#ifndef _XBOX_ONE
+#if !defined(_XBOX_ONE) && !defined(__linux__)
 ATG::XMLParser::XMLParser() {}
 ATG::XMLParser::~XMLParser() {}
 HRESULT    ATG::XMLParser::ParseXMLBuffer( CONST CHAR* strBuffer, UINT uBufferSize ) { return S_OK; }   
 VOID ATG::XMLParser::RegisterSAXCallbackInterface( ISAXCallback *pISAXCallback ) {}
 #endif
 
+#ifndef __linux__
 bool	CSocialManager::IsTitleAllowedToPostAnything() { return false; }
 bool	CSocialManager::AreAllUsersAllowedToPostImages() { return false; }
 bool	CSocialManager::IsTitleAllowedToPostImages() { return false; }
@@ -57,6 +64,7 @@ bool	CSocialManager::PostLinkToSocialNetwork( ESocialNetwork eSocialNetwork, DWO
 bool	CSocialManager::PostImageToSocialNetwork( ESocialNetwork eSocialNetwork, DWORD dwUserIndex, bool bUsingKinect ) { return false; }
 CSocialManager *CSocialManager::Instance() { return NULL; }
 void CSocialManager::SetSocialPostText(LPCWSTR Title, LPCWSTR Caption, LPCWSTR Desc) {};
+#endif // !__linux__
 
 DWORD XShowPartyUI(DWORD dwUserIndex) { return 0; }
 DWORD XShowFriendsUI(DWORD dwUserIndex) { return 0; }
@@ -187,7 +195,9 @@ D3DXVECTOR3& D3DXVECTOR3::operator += ( CONST D3DXVECTOR3& add ) { x += add.x; y
 BYTE IQNetPlayer::GetSmallId() { return 0; }
 void IQNetPlayer::SendData(IQNetPlayer *player, const void *pvData, DWORD dwDataSize, DWORD dwFlags)
 {
+#ifndef __linux__
 	app.DebugPrintf("Sending from 0x%x to 0x%x %d bytes\n",this,player,dwDataSize);
+#endif
 }
 bool IQNetPlayer::IsSameSystem(IQNetPlayer *player) { return true; }
 DWORD IQNetPlayer::GetSendQueueSize( IQNetPlayer *player, DWORD dwFlags ) { return 0; }

Minecraft.Client/Build/stdafx.h

@@ -10,7 +10,7 @@
 
 #define __STR2__(x) #x
 #define __STR1__(x) __STR2__(x)
-#define __LOC__ __FILE__ "("__STR1__(__LINE__)") : 4J Warning Msg: "
+#define __LOC__ __FILE__ "(" __STR1__(__LINE__) ") : 4J Warning Msg: "
 
 // use  - #pragma message(__LOC__"Need to do something here")
 
@@ -295,14 +295,15 @@ typedef XUID GameSessionUID;
 	#include "../Platform/Windows64/Windows64_UIController.h"
 #elif defined __linux__
 	// Linux build: avoid pulling in Windows64 platform headers (they cause
-	// symbol/class redefinitions). Use Linux-specific stubs and controller.
-	// FIXME: Produce proper Linux equivalents for telemetry/sentient/etc.
-	#include "../Platform/OrbisMedia/strings.h" // temporary strings
-	#include "../Platform/Xbox/Sentient/SentientTelemetryCommon.h"
-	#include "../Platform/Xbox/Sentient/DynamicConfigurations.h"
-	#include "../Platform/Xbox/GameConfig/Minecraft.spa.h"
+	// symbol/class redefinitions). Use Orbis-compatible stubs and Linux controller.
+	#include "../Platform/Linux/Linux_App.h"
+	#include "../Platform/OrbisMedia/strings.h"
+	#include "../Platform/Orbis/Sentient/SentientTelemetryCommon.h"
+	#include "../Platform/Orbis/Sentient/DynamicConfigurations.h"
+	#include "../Platform/Orbis/GameConfig/Minecraft.spa.h"
 	#include "Common/Audio/SoundEngine.h"
 	#include "../Platform/Linux/Linux_UIController.h"
+	#include "../Platform/Linux/Social/SocialManager.h"
 #elif defined __PSVITA__
 	#include "../Platform/PSVita/PSVita_App.h"
 	#include "../Platform/PSVitaMedia/strings.h"		// TODO - create PSVita-specific version of this