williamjcm/MassBuilderSaveTool
williamjcm/MassBuilderSaveTool
1
0
Fork 0
Code Issues 16 Pull requests Releases 18 Wiki Activity

Adapt to Corrade/Magnum changes.

Browse source
This commit is contained in:
Guillaume Jacquemin 2022-07-06 17:22:40 +02:00
parent 38532d8c35
commit e61d4bba85
4 changed files with 39 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
CMakeLists.txt
View file

@ -21,14 +21,16 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/modules/" ${CMAKE_MODULE_PATH})
SET(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) SET(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
set(BUILD_STATIC ON CACHE BOOL "" FORCE) set(CORRADE_BUILD_DEPRECATED OFF CACHE BOOL "" FORCE)
set(BUILD_STATIC_PIC ON CACHE BOOL "" FORCE) set(CORRADE_BUILD_STATIC ON CACHE BOOL "" FORCE)
set(BUILD_STATIC_UNIQUE_GLOBALS OFF CACHE BOOL "" FORCE) set(CORRADE_BUILD_STATIC_PIC ON CACHE BOOL "" FORCE)
set(CORRADE_BUILD_STATIC_UNIQUE_GLOBALS OFF CACHE BOOL "" FORCE)
set(WITH_INTERCONNECT ON CACHE BOOL "" FORCE) set(CORRADE_BUILD_TESTS OFF CACHE BOOL "" FORCE)
set(WITH_PLUGINMANAGER ON CACHE BOOL "" FORCE) set(CORRADE_WITH_INTERCONNECT ON CACHE BOOL "" FORCE)
set(WITH_TESTSUITE OFF CACHE BOOL "" FORCE) set(CORRADE_WITH_PLUGINMANAGER OFF CACHE BOOL "" FORCE)
set(WITH_MAIN ON CACHE BOOL "" FORCE) set(CORRADE_WITH_TESTSUITE OFF CACHE BOOL "" FORCE)
set(CORRADE_WITH_MAIN ON CACHE BOOL "" FORCE)
set(CORRADE_UTILITY_USE_ANSI_COLORS ON CACHE BOOL "" FORCE)
add_subdirectory(third-party/corrade EXCLUDE_FROM_ALL) add_subdirectory(third-party/corrade EXCLUDE_FROM_ALL)
set(DIRECTX OFF CACHE BOOL "" FORCE) # We use OpenGL. set(DIRECTX OFF CACHE BOOL "" FORCE) # We use OpenGL.
@ -47,26 +49,33 @@ set(SDL_TIMERS ON CACHE BOOL "" FORCE)
set(SDL_SHARED OFF CACHE BOOL "" FORCE) set(SDL_SHARED OFF CACHE BOOL "" FORCE)
add_subdirectory(third-party/SDL EXCLUDE_FROM_ALL) add_subdirectory(third-party/SDL EXCLUDE_FROM_ALL)
set(TARGET_GL ON CACHE BOOL "" FORCE) set(MAGNUM_BUILD_STATIC ON CACHE BOOL "" FORCE)
set(TARGET_GLES OFF CACHE BOOL "" FORCE) set(MAGNUM_BUILD_STATIC_PIC ON CACHE BOOL "" FORCE)
set(TARGET_VK OFF CACHE BOOL "" FORCE) set(MAGNUM_BUILD_STATIC_UNIQUE_GLOBALS OFF CACHE BOOL "" FORCE)
set(WITH_AUDIO OFF CACHE BOOL "" FORCE) set(MAGNUM_BUILD_DEPRECATED OFF CACHE BOOL "" FORCE)
set(WITH_DEBUGTOOLS OFF CACHE BOOL "" FORCE) set(MAGNUM_BUILD_TESTS OFF CACHE BOOL "" FORCE)
set(WITH_GL ON CACHE BOOL "" FORCE)
set(WITH_MESHTOOLS OFF CACHE BOOL "" FORCE) set(MAGNUM_TARGET_GL ON CACHE BOOL "" FORCE)
set(WITH_PRIMITIVES OFF CACHE BOOL "" FORCE) set(MAGNUM_TARGET_GLES OFF CACHE BOOL "" FORCE)
set(WITH_SCENEGRAPH OFF CACHE BOOL "" FORCE) set(MAGNUM_TARGET_VK OFF CACHE BOOL "" FORCE)
set(WITH_SHADERS ON CACHE BOOL "" FORCE) set(MAGNUM_WITH_AUDIO OFF CACHE BOOL "" FORCE)
set(WITH_SHADERTOOLS OFF CACHE BOOL "" FORCE) set(MAGNUM_WITH_DEBUGTOOLS OFF CACHE BOOL "" FORCE)
set(WITH_TEXT OFF CACHE BOOL "" FORCE) set(MAGNUM_WITH_GL ON CACHE BOOL "" FORCE)
set(WITH_TEXTURETOOLS OFF CACHE BOOL "" FORCE) set(MAGNUM_WITH_MESHTOOLS OFF CACHE BOOL "" FORCE)
set(WITH_TRADE OFF CACHE BOOL "" FORCE) set(MAGNUM_WITH_PRIMITIVES OFF CACHE BOOL "" FORCE)
set(WITH_VK OFF CACHE BOOL "" FORCE) set(MAGNUM_WITH_SCENEGRAPH OFF CACHE BOOL "" FORCE)
set(WITH_SDL2APPLICATION ON CACHE BOOL "" FORCE) set(MAGNUM_WITH_SCENETOOLS OFF CACHE BOOL "" FORCE)
set(MAGNUM_WITH_SHADERS ON CACHE BOOL "" FORCE)
set(MAGNUM_WITH_SHADERTOOLS OFF CACHE BOOL "" FORCE)
set(MAGNUM_WITH_TEXT OFF CACHE BOOL "" FORCE)
set(MAGNUM_WITH_TEXTURETOOLS OFF CACHE BOOL "" FORCE)
set(MAGNUM_WITH_TRADE OFF CACHE BOOL "" FORCE)
set(MAGNUM_WITH_VK OFF CACHE BOOL "" FORCE)
set(MAGNUM_WITH_SDL2APPLICATION ON CACHE BOOL "" FORCE)
add_subdirectory(third-party/magnum EXCLUDE_FROM_ALL) add_subdirectory(third-party/magnum EXCLUDE_FROM_ALL)
set(IMGUI_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third-party/imgui) set(IMGUI_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third-party/imgui)
set(WITH_IMGUI ON CACHE BOOL "" FORCE) set(MAGNUM_WITH_IMGUI ON CACHE BOOL "" FORCE)
add_subdirectory(third-party/magnum-integration EXCLUDE_FROM_ALL) add_subdirectory(third-party/magnum-integration EXCLUDE_FROM_ALL)
set(ENABLE_COMMONCRYPTO OFF CACHE BOOL "" FORCE) set(ENABLE_COMMONCRYPTO OFF CACHE BOOL "" FORCE)

2
src/MassManager/MassManager.cpp
View file

@ -184,7 +184,7 @@ void MassManager::refreshStagedMasses() {
return !file.hasSuffix(".sav"_s); return !file.hasSuffix(".sav"_s);
}); });
auto list_view = file_list->except(file_list->end() - iter); auto list_view = file_list->exceptSuffix(file_list->end() - iter);
Utility::Debug{} << "Scanning for staged M.A.S.S.es..."; Utility::Debug{} << "Scanning for staged M.A.S.S.es...";
for(Containers::StringView file : list_view) { for(Containers::StringView file : list_view) {

6
src/ProfileManager/ProfileManager.cpp
View file

@ -71,7 +71,7 @@ auto ProfileManager::refreshProfiles() -> bool {
return !std::regex_match(file.data(), m, legacy_regex) && !std::regex_match(file.data(), m, new_regex); return !std::regex_match(file.data(), m, legacy_regex) && !std::regex_match(file.data(), m, new_regex);
}; };
auto files_view = files->except(files->end() - std::remove_if(files->begin(), files->end(), predicate)); auto files_view = files->exceptSuffix(files->end() - std::remove_if(files->begin(), files->end(), predicate));
for(const auto& file : files_view) { for(const auto& file : files_view) {
Profile profile{Utility::Path::join(_saveDirectory, file)}; Profile profile{Utility::Path::join(_saveDirectory, file)};
@ -84,7 +84,7 @@ auto ProfileManager::refreshProfiles() -> bool {
arrayAppend(_profiles, std::move(profile)); arrayAppend(_profiles, std::move(profile));
} }
if(_profiles.empty()) { if(_profiles.isEmpty()) {
_lastError = "No valid profiles were found."_s; _lastError = "No valid profiles were found."_s;
return false; return false;
} }
@ -217,7 +217,7 @@ void ProfileManager::refreshBackups() {
return !file.hasSuffix(".mbprofbackup"_s); return !file.hasSuffix(".mbprofbackup"_s);
}; };
auto files_view = files->except(files->end() - std::remove_if(files->begin(), files->end(), predicate)); auto files_view = files->exceptSuffix(files->end() - std::remove_if(files->begin(), files->end(), predicate));
int error_code = 0; int error_code = 0;
zip_t* zip = nullptr; zip_t* zip = nullptr;

2
src/SaveTool/SaveTool_ProfileManager.cpp
View file

@ -230,7 +230,7 @@ auto SaveTool::drawBackupListPopup() -> ImGuiID {
ImGui::EndTable(); ImGui::EndTable();
} }
if(_profileManager->backups().empty()) { if(_profileManager->backups().isEmpty()) {
ImGui::TextDisabled("No backups were found."); ImGui::TextDisabled("No backups were found.");
} }
else if(ImGui::BeginTable("##Backups", 4, else if(ImGui::BeginTable("##Backups", 4,