Skip to content

Commit 98cf7ab

Browse files
committed
refactor some ifdefs
1 parent 16cea44 commit 98cf7ab

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

src/discord/core.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace constants::discord {
2121
//TODO: this isn't correct for all platforms and needs to be tested
2222
#if defined(__ANDROID__)
2323
constexpr const char* platform_dependent_launch_arguments = "";
24-
#elif defined(__SWITCH__)
24+
#elif defined(__CONSOLE__)
2525
#error "Not supported"
2626
#elif defined(FLATPAK_BUILD)
2727
constexpr const char* platform_dependent_launch_arguments = "flatpak run com.github.mgerhold.OOPetris --discord";

src/helper/graphic_utils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ std::vector<std::string> utils::supported_features() {
3434
throw std::runtime_error{ "Failed in getting the Pref Path: " + std::string{ SDL_GetError() } };
3535
}
3636
return std::filesystem::path{ std::string{ pref_path } };
37-
#elif defined(__SWITCH__)
37+
#elif defined(__CONSOLE__)
3838
// this is in the sdcard of the switch, since internal storage is read-only for applications!
3939
return std::filesystem::path{ "." };
4040

@@ -55,7 +55,7 @@ std::vector<std::string> utils::supported_features() {
5555
[[nodiscard]] std::filesystem::path utils::get_assets_folder() {
5656
#if defined(__ANDROID__)
5757
return std::filesystem::path{ "" };
58-
#elif defined(__SWITCH__) or defined(__3DS__)
58+
#elif defined(__CONSOLE__)
5959
// this is in the internal storage of the nintendo switch, it ios mounted by libnx (runtime switch support library) and filled at compile time with assets (its called ROMFS there)
6060
return std::filesystem::path{ "romfs:/assets" };
6161
#elif defined(BUILD_INSTALLER)

src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ int main(int argc, char** argv) {
6262
std::unique_ptr<Window> window{ nullptr };
6363

6464
try {
65-
#if defined(__ANDROID__) or defined(__SWITCH__) or defined(__3DS__)
65+
#if defined(__ANDROID__) or defined(__CONSOLE__)
6666
window = std::make_unique<Window>(window_name, WindowPosition::Centered);
6767
#else
6868
static constexpr int width = 1280;

src/platform/capabilities.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ namespace utils {
8787
};
8888
#endif
8989

90-
90+
//TODO: refactor
9191
[[nodiscard]] constexpr Capabilities get_capabilities() {
9292
#if defined(__ANDROID__)
9393
return Capabilities{ false, true, Orientation::Portrait };

src/platform/platform.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace utils {
2424

2525
#if defined(__ANDROID__)
2626
return "android";
27-
#elif defined(__SWITCH__) or defined(__3DS__)
27+
#elif defined(__CONSOLE__)
2828
return "console";
2929
#else
3030
return "pc";

0 commit comments

Comments
 (0)