diff --git a/CMakeLists.txt b/CMakeLists.txt index 818f9680..73978167 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -335,9 +335,11 @@ endif() option(USE_STANDALONE "Build as a standalone executable" OFF) option(BUILD_STORMLIB "Build with StormLib support" OFF) -option(BUILD_SF64 "Build with Star Fox 64 support" OFF) +option(BUILD_SM64 "Build with Super Mario 64 support" ON) option(BUILD_MK64 "Build with Mario Kart 64 support" OFF) +option(BUILD_SF64 "Build with Star Fox 64 support" OFF) option(BUILD_FZERO "Build with F-Zero X support" OFF) +option(BUILD_MARIO_ARTIST "Build with Mario Artist support" OFF) add_subdirectory(Torch) target_link_libraries(${PROJECT_NAME} PRIVATE torch "${ADDITIONAL_LIBRARY_DEPENDENCIES}") diff --git a/src/port/GameExtractor.cpp b/src/port/GameExtractor.cpp index 922433de..9c1cd5da 100644 --- a/src/port/GameExtractor.cpp +++ b/src/port/GameExtractor.cpp @@ -191,11 +191,11 @@ bool GameExtractor::GenerateOTR() const { const std::string game_path = Ship::Context::GetAppDirectoryPath(); Companion::Instance = new Companion(this->mGameData, ArchiveType::O2R, false, assets_path, game_path); - Companion::Instance->SetAdditionalFiles({ "meta/mods.toml" }); try { Companion::Instance->Init(ExportType::Binary); } catch (const std::exception& e) { + SPDLOG_INFO("Failed to process O2R {}", e.what()); return false; }