Merge branch 'master' into mac

# Conflicts:
#	GpApp/Main.cpp
This commit is contained in:
Madthijs
2021-05-11 14:28:46 +02:00
76 changed files with 3895 additions and 1365 deletions

View File

@@ -70,8 +70,9 @@ void *GpSystemServices_X::CreateThread(ThreadFunc_t threadFunc, void *context)
return thread;
}
void GpSystemServices_X::Beep() const
bool GpSystemServices_X::Beep() const
{
return false;
}
bool GpSystemServices_X::IsTouchscreen() const
@@ -103,6 +104,21 @@ bool GpSystemServices_X::IsFullscreenOnStartup() const
return false;
}
bool GpSystemServices_X::HasNativeFileManager() const
{
return true;
}
GpOperatingSystem_t GpSystemServices_X::GetOperatingSystem() const
{
return GpOperatingSystems::kLinux;
}
GpOperatingSystemFlavor_t GpSystemServices_X::GetOperatingSystemFlavor() const
{
return GpOperatingSystemFlavors::kGeneric;
}
unsigned int GpSystemServices_X::GetCPUCount() const
{
return SDL_GetCPUCount();