mirror of
https://github.com/elasota/Aerofoil.git
synced 2025-09-23 06:53:43 +00:00
Merge branch 'master' into mac
# Conflicts: # GpApp/Main.cpp
This commit is contained in:
@@ -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();
|
||||
|
Reference in New Issue
Block a user