From 8e695dce74cfc018a73a3ec8fbb21177dab71adc Mon Sep 17 00:00:00 2001 From: Luke Street Date: Fri, 4 Feb 2022 23:25:35 -0500 Subject: [PATCH] Fix macOS compilation --- Graphics/build.rs | 7 +++++++ Runtime/CGameOptionsTouchBar.cpp | 4 ++-- Runtime/CMakeLists.txt | 16 ++++++++-------- Runtime/MP1/CFrontEndUITouchBar.cpp | 4 ++-- Runtime/MP1/CMakeLists.txt | 10 +++++----- Runtime/MP1/CSaveGameScreenTouchBar.cpp | 4 ++-- 6 files changed, 26 insertions(+), 19 deletions(-) diff --git a/Graphics/build.rs b/Graphics/build.rs index da5fb6eb3..28d380c5c 100644 --- a/Graphics/build.rs +++ b/Graphics/build.rs @@ -27,14 +27,20 @@ fn main() { // let out_path = std::path::PathBuf::from(std::env::var("OUT_DIR").unwrap()); // bindings.write_to_file(out_path.join("zeus.rs")).expect("Couldn't write bindings!"); + #[cfg(any(not(unix), target_os = "macos", target_os = "ios"))] + let cxx_flag = "-std=c++17"; + #[cfg(all(unix, not(any(target_os = "macos", target_os = "ios"))))] + let cxx_flag = "-std=gnu++17"; cxx_build::bridge("src/lib.rs") .include("include") .include(zeus_include.clone()) + .flag(cxx_flag) .compile("aurora"); println!("cargo:rerun-if-changed=src/lib.rs"); cxx_build::bridge("src/shaders/mod.rs") .include("include") .include(zeus_include.clone()) + .flag(cxx_flag) .compile("aurora_shaders"); println!("cargo:rerun-if-changed=src/shaders/mod.rs"); cxx_build::bridge("src/imgui.rs") @@ -42,6 +48,7 @@ fn main() { .include(zeus_include.clone()) .include(imgui_include.clone()) .include(imgui_engine_include.clone()) + .flag(cxx_flag) .compile("aurora_imgui"); println!("cargo:rerun-if-changed=src/imgui.rs"); } diff --git a/Runtime/CGameOptionsTouchBar.cpp b/Runtime/CGameOptionsTouchBar.cpp index fc89bb8a5..5faeb43a1 100644 --- a/Runtime/CGameOptionsTouchBar.cpp +++ b/Runtime/CGameOptionsTouchBar.cpp @@ -13,8 +13,8 @@ void CGameOptionsTouchBar::GetSelection(int& left, int& right, int& value) { void CGameOptionsTouchBar::SetSelection([[maybe_unused]] int left, [[maybe_unused]] int right, [[maybe_unused]] int value) {} -#ifndef __APPLE__ +//#ifndef __APPLE__ std::unique_ptr NewGameOptionsTouchBar() { return std::make_unique(); } -#endif +//#endif } // namespace metaforce diff --git a/Runtime/CMakeLists.txt b/Runtime/CMakeLists.txt index 18f308a6b..eb91ccb15 100644 --- a/Runtime/CMakeLists.txt +++ b/Runtime/CMakeLists.txt @@ -39,14 +39,14 @@ add_subdirectory(MP1) add_subdirectory(MP2) add_subdirectory(MP3) -if (APPLE) - set_source_files_properties(MP1/CFrontEndUITouchBarMac.mm - MP1/CSaveGameScreenTouchBarMac.mm - CGameOptionsTouchBarMac.mm - PROPERTIES COMPILE_FLAGS -fobjc-arc) - bintoc(startButton.cpp Resources/startButton@2x.png START_BUTTON_2X) - list(APPEND PLAT_SRCS startButton.cpp CGameOptionsTouchBarMac.mm) -endif () +#if (APPLE) +# set_source_files_properties(MP1/CFrontEndUITouchBarMac.mm +# MP1/CSaveGameScreenTouchBarMac.mm +# CGameOptionsTouchBarMac.mm +# PROPERTIES COMPILE_FLAGS -fobjc-arc) +# bintoc(startButton.cpp Resources/startButton@2x.png START_BUTTON_2X) +# list(APPEND PLAT_SRCS startButton.cpp CGameOptionsTouchBarMac.mm) +#endif () set(CAST_TO_SOURCES MkCastTo.py diff --git a/Runtime/MP1/CFrontEndUITouchBar.cpp b/Runtime/MP1/CFrontEndUITouchBar.cpp index b37d5f96d..41510d87b 100644 --- a/Runtime/MP1/CFrontEndUITouchBar.cpp +++ b/Runtime/MP1/CFrontEndUITouchBar.cpp @@ -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 NewFrontEndUITouchBar() { return std::make_unique(); } -#endif +//#endif } // namespace metaforce diff --git a/Runtime/MP1/CMakeLists.txt b/Runtime/MP1/CMakeLists.txt index b8a546dfd..910dd755f 100644 --- a/Runtime/MP1/CMakeLists.txt +++ b/Runtime/MP1/CMakeLists.txt @@ -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 diff --git a/Runtime/MP1/CSaveGameScreenTouchBar.cpp b/Runtime/MP1/CSaveGameScreenTouchBar.cpp index 583b62db0..4fdc85806 100644 --- a/Runtime/MP1/CSaveGameScreenTouchBar.cpp +++ b/Runtime/MP1/CSaveGameScreenTouchBar.cpp @@ -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 NewSaveUITouchBar() { return std::make_unique(); } -#endif +//#endif } // namespace metaforce::MP1