redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-20 19:57:45 +00:00
Code Activity

Unify named constants for features too

Browse source
This commit is contained in:
Joshua Goins 2022-09-05 18:03:59 -04:00
parent 8fbe1b6514
commit b15473ddf0
5 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
launcher/core/CMakeLists.txt
View file

@ -77,9 +77,9 @@ if (ENABLE_WATCHDOG)
endif () endif ()
if(ENABLE_GAMEMODE) if(ENABLE_GAMEMODE)
target_compile_definitions(astra_core PUBLIC USE_GAMEMODE) target_compile_definitions(astra_core PUBLIC ENABLE_GAMEMODE)
endif() endif()
if(ENABLE_STEAM) if(ENABLE_STEAM)
target_compile_definitions(astra_core PUBLIC USE_STEAM) target_compile_definitions(astra_core PUBLIC ENABLE_STEAM)
endif() endif()

3
launcher/core/include/launchercore.h
View file

@ -27,7 +27,8 @@ enum class WineType {
System, System,
Custom, Custom,
Builtin, // macos only Builtin, // macos only
XIVOnMac // macos only XIVOnMac, // macos only
Proton // steam proton, only available when launched via Steam
}; };
enum class DalamudChannel { enum class DalamudChannel {

4
launcher/core/src/launchercore.cpp
View file

@ -15,7 +15,7 @@
#include <qt5keychain/keychain.h> #include <qt5keychain/keychain.h>
#include <cotp.h> #include <cotp.h>
#ifdef USE_GAMEMODE #ifdef ENABLE_GAMEMODE
#include <gamemode_client.h> #include <gamemode_client.h>
#endif #endif
@ -212,7 +212,7 @@ void LauncherCore::launchExecutable(
} }
#endif #endif
#if USE_GAMEMODE #if ENABLE_GAMEMODE
if(isGame && profile.useGamemode) { if(isGame && profile.useGamemode) {
gamemode_request_start(); gamemode_request_start();
} }

4
launcher/core/src/steamapi.cpp
View file

@ -1,11 +1,11 @@
#include "steamapi.h" #include "steamapi.h"
#ifdef USE_STEAM #ifdef ENABLE_STEAM
#include <steam/steam_api.h> #include <steam/steam_api.h>
#endif #endif
SteamAPI::SteamAPI() { SteamAPI::SteamAPI() {
#ifdef USE_STEAM #ifdef ENABLE_STEAM
SteamAPI_Init(); SteamAPI_Init();
#endif #endif
} }

2
launcher/desktop/src/settingswindow.cpp
View file

@ -234,7 +234,7 @@ void SettingsWindow::reloadControls() {
useGamescope->setChecked(profile.useGamescope); useGamescope->setChecked(profile.useGamescope);
useGamemode->setChecked(profile.useGamemode); useGamemode->setChecked(profile.useGamemode);
#ifndef USE_GAMEMODE #ifndef ENABLE_GAMEMODE
useGameMode->setEnabled(false); useGameMode->setEnabled(false);
#endif #endif