Merge branch 'master' into NDK

Conflicts:
	include/Nazara/Core/ConditionVariable.hpp

Former-commit-id: 84320f0a55ae9d8f80ff5211d30d99184c7b4213

src/Nazara/Core/Win32/HardwareInfoImpl.cpp

@@ -33,11 +33,20 @@ unsigned int NzHardwareInfoImpl::GetProcessorCount()
 {
 	// Plus simple (et plus portable) que de passer par le CPUID
 	SYSTEM_INFO infos;
-	GetSystemInfo(&infos);
+	GetNativeSystemInfo(&infos);
 
 	return infos.dwNumberOfProcessors;
 }
 
+nzUInt64 NzHardwareInfoImpl::GetTotalMemory()
+{
+	MEMORYSTATUSEX memStatus;
+	memStatus.dwLength = sizeof(memStatus);
+	GlobalMemoryStatusEx(&memStatus);
+
+	return memStatus.ullTotalPhys;
+}
+
 bool NzHardwareInfoImpl::IsCpuidSupported()
 {
 #ifdef NAZARA_PLATFORM_x64

src/Nazara/Core/Win32/HardwareInfoImpl.hpp

@@ -14,6 +14,7 @@ class NzHardwareInfoImpl
 	public:
 		static void Cpuid(nzUInt32 functionId, nzUInt32 subFunctionId, nzUInt32 registers[4]);
 		static unsigned int GetProcessorCount();
+		static nzUInt64 GetTotalMemory();
 		static bool IsCpuidSupported();
 };