2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-16 23:37:04 +00:00

Fix macOS compilation

This commit is contained in:
2022-02-04 23:25:35 -05:00
parent 509252a17f
commit 8e695dce74
6 changed files with 26 additions and 19 deletions

View File

@@ -13,8 +13,8 @@ void CFrontEndUITouchBar::SetFusionBonusPhase(bool fusionSuitActive) { m_phase =
void CFrontEndUITouchBar::SetStartOptionsPhase(bool normalBeat) { m_phase = EPhase::StartOptions; }
CFrontEndUITouchBar::EAction CFrontEndUITouchBar::PopAction() { return EAction::None; }
#ifndef __APPLE__
//#ifndef __APPLE__
std::unique_ptr<CFrontEndUITouchBar> NewFrontEndUITouchBar() { return std::make_unique<CFrontEndUITouchBar>(); }
#endif
//#endif
} // namespace metaforce

View File

@@ -1,10 +1,10 @@
add_subdirectory(World)
if (APPLE)
set(MP1_PLAT_SOURCES
CFrontEndUITouchBarMac.mm
CSaveGameScreenTouchBarMac.mm)
endif ()
#if (APPLE)
# set(MP1_PLAT_SOURCES
# CFrontEndUITouchBarMac.mm
# CSaveGameScreenTouchBarMac.mm)
#endif ()
set(MP1_SOURCES
CTweaks.hpp CTweaks.cpp

View File

@@ -5,8 +5,8 @@ namespace metaforce::MP1 {
int CSaveGameScreenTouchBar::PopOption() { return -1; }
void CSaveGameScreenTouchBar::SetUIOpts(std::u16string_view opt0, std::u16string_view opt1, std::u16string_view opt2) {}
#ifndef __APPLE__
//#ifndef __APPLE__
std::unique_ptr<CSaveGameScreenTouchBar> NewSaveUITouchBar() { return std::make_unique<CSaveGameScreenTouchBar>(); }
#endif
//#endif
} // namespace metaforce::MP1