Update Corrade, Magnum, and ImGui.

CMakeLists: bump version number.
And set a new codename, too.
2022-04-17 13:56:45 +02:00 · 2022-04-17 13:56:38 +02:00 · 2022-04-17 13:55:48 +02:00 · 2022-04-17 13:50:09 +02:00 · 2022-04-17 12:46:25 +02:00
7 changed files with 11 additions and 11 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -25,8 +25,8 @@ set(BUILD_STATIC ON CACHE BOOL "" FORCE)
 set(BUILD_STATIC_PIC ON CACHE BOOL "" FORCE)
 set(BUILD_STATIC_UNIQUE_GLOBALS OFF CACHE BOOL "" FORCE)

-set(WITH_INTERCONNECT ON CACHE BOOL "" FORCE)
-set(WITH_PLUGINMANAGER ON CACHE BOOL "" FORCE)
+set(WITH_INTERCONNECT OFF CACHE BOOL "" FORCE)
+set(WITH_PLUGINMANAGER OFF CACHE BOOL "" FORCE)
 set(WITH_TESTSUITE OFF CACHE BOOL "" FORCE)
 set(WITH_MAIN ON CACHE BOOL "" FORCE)
 add_subdirectory(third-party/corrade EXCLUDE_FROM_ALL)
@ -56,6 +56,7 @@ set(WITH_GL ON CACHE BOOL "" FORCE)
 set(WITH_MESHTOOLS OFF CACHE BOOL "" FORCE)
 set(WITH_PRIMITIVES OFF CACHE BOOL "" FORCE)
 set(WITH_SCENEGRAPH OFF CACHE BOOL "" FORCE)
+set(WITH_SCENETOOLS OFF CACHE BOOL "" FORCE)
 set(WITH_SHADERS ON CACHE BOOL "" FORCE)
 set(WITH_SHADERTOOLS OFF CACHE BOOL "" FORCE)
 set(WITH_TEXT OFF CACHE BOOL "" FORCE)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -18,9 +18,9 @@ set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)

-set(SAVETOOL_PROJECT_VERSION 1.3.2)
+set(SAVETOOL_PROJECT_VERSION 1.4.0-pre)

-find_package(Corrade REQUIRED Main Containers Utility Interconnect)
+find_package(Corrade REQUIRED Main Containers Utility)
 find_package(Magnum REQUIRED GL Sdl2Application)
 find_package(MagnumIntegration REQUIRED ImGui)

@ -170,7 +170,7 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug)
    add_compile_definitions(SAVETOOL_DEBUG_BUILD)
 endif()
 add_compile_definitions(SAVETOOL_VERSION="${SAVETOOL_PROJECT_VERSION}"
-                        SAVETOOL_CODENAME="Dickish Cyclops"
+                        SAVETOOL_CODENAME="Enigmatic Ellenier"
                        SUPPORTED_GAME_VERSION="0.8.6")

 if(CMAKE_BUILD_TYPE STREQUAL Release)
@ -186,7 +186,6 @@ endif()
 target_link_libraries(MassBuilderSaveTool PRIVATE
    Corrade::Containers
    Corrade::Utility
-    Corrade::Interconnect
    Corrade::Main
    Magnum::Magnum
    Magnum::GL
--- a/src/UESaveFile/UESaveFile.cpp
+++ b/src/UESaveFile/UESaveFile.cpp
@ -132,7 +132,7 @@ auto UESaveFile::saveToFile() -> bool {

    writer.closeFile();

-    if(!temp_file && !Utility::Path::copy(_filepath + ".tmp"_s, _filepath)) {
+    if(!Utility::Path::copy(_filepath + ".tmp"_s, _filepath)) {
        _lastError = "Couldn't save the file properly.";
        return false;
    }
--- a/third-party/corrade
+++ b/third-party/corrade
@ -1 +1 @@
-Subproject commit dc4f2eac6814b37b5257d295c2838bcde95272aa
+Subproject commit e3b5eb865f165f65024869cd1c77c1380e6ee8a7
--- a/third-party/imgui
+++ b/third-party/imgui
@ -1 +1 @@
-Subproject commit ddddabdccfdafffd8664fb4e29230dc4f848137e
+Subproject commit eda7792b151d138e15df951578253b821ceed5a3
--- a/third-party/magnum
+++ b/third-party/magnum
@ -1 +1 @@
-Subproject commit 3fc9028b5451aa95973f104d1ef2a1c0df589e64
+Subproject commit 7c2f758f2ea69e5a95a7a615c0e5ec9a4bfb213f
--- a/third-party/magnum-integration
+++ b/third-party/magnum-integration
@ -1 +1 @@
-Subproject commit 323c23f4e8e7cda9a7848c03401a3ba0a1de0bd4
+Subproject commit 5a6aa83561d4e411ddd968ed50c92aa9443e8191
Author	SHA1	Message	Date
Guillaume Jacquemin	2493cb5988	Update Corrade, Magnum, and ImGui.	2022-04-17 13:56:45 +02:00
Guillaume Jacquemin	c018bfc7f8	CMakeLists: bump version number. And set a new codename, too.	2022-04-17 13:56:38 +02:00
Guillaume Jacquemin	269bdebca7	CMakeLists: do some dependency cleanup. I guess I initially planned to make the Save Tool use Interconnect, and there was a Magnum module that prevented me from disabling PluginManager.	2022-04-17 13:55:48 +02:00
Guillaume Jacquemin	b6398f3373	CMakeLists: bump version number.	2022-04-17 13:50:09 +02:00
Guillaume Jacquemin	b598476809	UESaveFile: fix a bug when working with a temp file.	2022-04-17 12:46:25 +02:00