WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-24 15:16:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mac

Browse Source 
# Conflicts:
#	AerofoilX/GpMain_SDL_X.cpp
This commit is contained in:
Madthijs
2021-04-28 19:17:55 +02:00
parent 67b594fe68 a2d374f650
commit c5a1303b71
186 changed files with 6016 additions and 1563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
AerofoilX/GpMain_SDL_X.cpp
View File

@@ -32,13 +32,26 @@ int main(int argc, char *argv[])
SDLMAIN_DECLSPEC int SDL_main(int argc, char *argv[])
#endif
{
bool enableLogging = false;
for (int i = 1; i < argc; i++)
{
if (!strcmp(argv[i], "-diagnostics"))
enableLogging = true;
}
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMECONTROLLER) < 0)
return -1;
GpFileSystem_X::GetInstance()->Init();
GpLogDriver_X::Init();
IGpLogDriver *logger = GpLogDriver_X::GetInstance();
IGpLogDriver *logger = nullptr;
if (enableLogging)
{
GpLogDriver_X::Init();
logger = GpLogDriver_X::GetInstance();
}
GpDriverCollection *drivers = GpAppInterface_Get()->PL_GetDriverCollection();
drivers->SetDriver<GpDriverIDs::kFileSystem>(GpFileSystem_X::GetInstance());