diff --git a/launcher/core/CMakeLists.txt b/launcher/core/CMakeLists.txt index 8901659..af4170e 100644 --- a/launcher/core/CMakeLists.txt +++ b/launcher/core/CMakeLists.txt @@ -77,9 +77,9 @@ if (ENABLE_WATCHDOG) endif () if(ENABLE_GAMEMODE) - target_compile_definitions(astra_core PUBLIC USE_GAMEMODE) + target_compile_definitions(astra_core PUBLIC ENABLE_GAMEMODE) endif() if(ENABLE_STEAM) - target_compile_definitions(astra_core PUBLIC USE_STEAM) + target_compile_definitions(astra_core PUBLIC ENABLE_STEAM) endif() \ No newline at end of file diff --git a/launcher/core/include/launchercore.h b/launcher/core/include/launchercore.h index 73ed117..1559ea8 100755 --- a/launcher/core/include/launchercore.h +++ b/launcher/core/include/launchercore.h @@ -27,7 +27,8 @@ enum class WineType { System, Custom, Builtin, // macos only - XIVOnMac // macos only + XIVOnMac, // macos only + Proton // steam proton, only available when launched via Steam }; enum class DalamudChannel { diff --git a/launcher/core/src/launchercore.cpp b/launcher/core/src/launchercore.cpp index bf8e968..a88a06a 100755 --- a/launcher/core/src/launchercore.cpp +++ b/launcher/core/src/launchercore.cpp @@ -15,7 +15,7 @@ #include #include -#ifdef USE_GAMEMODE +#ifdef ENABLE_GAMEMODE #include #endif @@ -212,7 +212,7 @@ void LauncherCore::launchExecutable( } #endif -#if USE_GAMEMODE +#if ENABLE_GAMEMODE if(isGame && profile.useGamemode) { gamemode_request_start(); } diff --git a/launcher/core/src/steamapi.cpp b/launcher/core/src/steamapi.cpp index 6c16792..430e7e5 100644 --- a/launcher/core/src/steamapi.cpp +++ b/launcher/core/src/steamapi.cpp @@ -1,11 +1,11 @@ #include "steamapi.h" -#ifdef USE_STEAM +#ifdef ENABLE_STEAM #include #endif SteamAPI::SteamAPI() { -#ifdef USE_STEAM +#ifdef ENABLE_STEAM SteamAPI_Init(); #endif } \ No newline at end of file diff --git a/launcher/desktop/src/settingswindow.cpp b/launcher/desktop/src/settingswindow.cpp index e0b82c5..0dd3e8f 100644 --- a/launcher/desktop/src/settingswindow.cpp +++ b/launcher/desktop/src/settingswindow.cpp @@ -234,7 +234,7 @@ void SettingsWindow::reloadControls() { useGamescope->setChecked(profile.useGamescope); useGamemode->setChecked(profile.useGamemode); -#ifndef USE_GAMEMODE +#ifndef ENABLE_GAMEMODE useGameMode->setEnabled(false); #endif