From 32046d9bf86d230eeb9dbe971e144ed56295a7b7 Mon Sep 17 00:00:00 2001 From: William JCM Date: Fri, 25 Nov 2022 10:33:55 +0100 Subject: [PATCH] Update dependencies and adapt to changes. --- CMakeLists.txt | 8 +++++++- src/SaveTool/SaveTool_MainManager.cpp | 4 ++-- src/SaveTool/SaveTool_MassViewer_Armour.cpp | 4 ++-- src/SaveTool/SaveTool_MassViewer_Frame.cpp | 4 ++-- src/SaveTool/SaveTool_MassViewer_Weapons.cpp | 2 +- src/SaveTool/SaveTool_drawMainMenu.cpp | 2 +- third-party/SDL | 2 +- third-party/corrade | 2 +- third-party/curl | 2 +- third-party/efsw | 2 +- third-party/imgui | 2 +- third-party/libzip | 2 +- third-party/magnum | 2 +- third-party/magnum-integration | 2 +- 14 files changed, 23 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 027a564..5ae29bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,6 +33,7 @@ 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) +set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE) set(DIRECTX OFF CACHE BOOL "" FORCE) # We use OpenGL. set(SDL_ATOMIC OFF CACHE BOOL "" FORCE) set(SDL_CPUINFO OFF CACHE BOOL "" FORCE) @@ -61,6 +62,7 @@ set(MAGNUM_TARGET_VK OFF CACHE BOOL "" FORCE) set(MAGNUM_WITH_AUDIO OFF CACHE BOOL "" FORCE) set(MAGNUM_WITH_DEBUGTOOLS OFF CACHE BOOL "" FORCE) set(MAGNUM_WITH_GL ON CACHE BOOL "" FORCE) +set(MAGNUM_WITH_MATERIALTOOLS OFF CACHE BOOL "" FORCE) set(MAGNUM_WITH_MESHTOOLS OFF CACHE BOOL "" FORCE) set(MAGNUM_WITH_PRIMITIVES OFF CACHE BOOL "" FORCE) set(MAGNUM_WITH_SCENEGRAPH OFF CACHE BOOL "" FORCE) @@ -90,7 +92,6 @@ set(BUILD_TOOLS OFF CACHE BOOL "" FORCE) set(BUILD_REGRESS OFF CACHE BOOL "" FORCE) set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) set(BUILD_DOC OFF CACHE BOOL "" FORCE) -set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE) add_subdirectory(third-party/libzip EXCLUDE_FROM_ALL) set(VERBOSE OFF CACHE BOOL "" FORCE) @@ -102,9 +103,14 @@ set(BUILD_TESTING OFF CACHE BOOL "" FORCE) set(BUILD_CURL_EXE OFF CACHE BOOL "" FORCE) set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE) set(ENABLE_UNICODE ON CACHE BOOL "" FORCE) +set(ENABLE_INET_PTON OFF CACHE BOOL "" FORCE) set(ENABLE_DEBUG OFF CACHE BOOL "" FORCE) set(ENABLE_THREADED_RESOLVER OFF CACHE BOOL "" FORCE) set(HTTP_ONLY ON CACHE BOOL "" FORCE) +set(USE_LIBIDN2 OFF CACHE BOOL "" FORCE) +set(USE_WIN32_IDN ON CACHE BOOL "" FORCE) +set(CURL_USE_LIBPSL OFF CACHE BOOL "" FORCE) +set(CURL_STATIC_CRT OFF CACHE BOOL "" FORCE) set(CURL_USE_SCHANNEL ON CACHE BOOL "" FORCE) set(CURL_USE_LIBSSH2 OFF CACHE BOOL "" FORCE) # For some reason, even when HTTP_ONLY is set to ON, libcurl will try to link to libssh2. add_subdirectory(third-party/curl EXCLUDE_FROM_ALL) diff --git a/src/SaveTool/SaveTool_MainManager.cpp b/src/SaveTool/SaveTool_MainManager.cpp index 21a25a4..ad9d053 100644 --- a/src/SaveTool/SaveTool_MainManager.cpp +++ b/src/SaveTool/SaveTool_MainManager.cpp @@ -51,7 +51,7 @@ void SaveTool::drawManager() { } if(ImGui::BeginChild("##ProfileInfo", - {ImGui::GetContentRegionAvailWidth() * 0.60f, 0.0f}, + {ImGui::GetContentRegionAvail().x * 0.60f, 0.0f}, true, ImGuiWindowFlags_MenuBar)) { if(ImGui::BeginMenuBar()) { @@ -579,7 +579,7 @@ void SaveTool::drawMassManager() { ImGui::TableSetColumnIndex(0); Containers::String staged_formatted = Utility::format("{} ({})", pair.second, pair.first); ImGui::Selectable(staged_formatted.data()); - if((ImGui::CalcTextSize(staged_formatted.data()).x + ImGui::GetStyle().FramePadding.x) > ImGui::GetContentRegionAvailWidth()) { + if((ImGui::CalcTextSize(staged_formatted.data()).x + ImGui::GetStyle().FramePadding.x) > ImGui::GetContentRegionAvail().x) { drawTooltip(staged_formatted.data()); } if(ImGui::BeginDragDropSource(ImGuiDragDropFlags_SourceNoHoldToOpenOthers)) { diff --git a/src/SaveTool/SaveTool_MassViewer_Armour.cpp b/src/SaveTool/SaveTool_MassViewer_Armour.cpp index 8924c4e..6f5aeb4 100644 --- a/src/SaveTool/SaveTool_MassViewer_Armour.cpp +++ b/src/SaveTool/SaveTool_MassViewer_Armour.cpp @@ -61,7 +61,7 @@ void SaveTool::drawArmour() { if(ImGui::CollapsingHeader(header)) { ImGui::BeginGroup(); - ImGui::SetNextItemWidth(ImGui::GetContentRegionAvailWidth() * 0.491f); + ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x * 0.491f); if(ImGui::BeginListBox("##ChangePart")) { if(std::strncmp("Neck", slot_labels[UnsignedInt(part.slot)].data(), 4) != 0) { for(auto& set : armour_sets) { @@ -103,7 +103,7 @@ void SaveTool::drawArmour() { ImGui::PushID(j); - ImGui::SetNextItemWidth(ImGui::GetContentRegionAvailWidth() - 2.0f); + ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x - 2.0f); if(ImGui::BeginCombo("##Style", getStyleName(part.styles[j], _currentMass->armourCustomStyles()).data())) { for(const auto& style : style_names) { if(ImGui::Selectable(getStyleName(style.first, _currentMass->armourCustomStyles()).data(), part.styles[j] == style.first)) { diff --git a/src/SaveTool/SaveTool_MassViewer_Frame.cpp b/src/SaveTool/SaveTool_MassViewer_Frame.cpp index 1357f9b..a648c90 100644 --- a/src/SaveTool/SaveTool_MassViewer_Frame.cpp +++ b/src/SaveTool/SaveTool_MassViewer_Frame.cpp @@ -32,7 +32,7 @@ void SaveTool::drawFrameInfo() { ImGui::BeginGroup(); - if(ImGui::BeginChild("##JointSliders", {(ImGui::GetContentRegionAvailWidth() / 2.0f) - (ImGui::GetStyle().WindowPadding.x / 2.0f), 300.0f}, true, ImGuiWindowFlags_MenuBar)) { + if(ImGui::BeginChild("##JointSliders", {(ImGui::GetContentRegionAvail().x / 2.0f) - (ImGui::GetStyle().WindowPadding.x / 2.0f), 300.0f}, true, ImGuiWindowFlags_MenuBar)) { if(ImGui::BeginMenuBar()) { ImGui::TextUnformatted("Joint sliders"); @@ -43,7 +43,7 @@ void SaveTool::drawFrameInfo() { } ImGui::EndChild(); - if(ImGui::BeginChild("##FrameStyles", {(ImGui::GetContentRegionAvailWidth() / 2.0f) - (ImGui::GetStyle().WindowPadding.x / 2.0f), 0.0f}, true, ImGuiWindowFlags_MenuBar)) { + if(ImGui::BeginChild("##FrameStyles", {(ImGui::GetContentRegionAvail().x / 2.0f) - (ImGui::GetStyle().WindowPadding.x / 2.0f), 0.0f}, true, ImGuiWindowFlags_MenuBar)) { if(ImGui::BeginMenuBar()) { ImGui::TextUnformatted("Frame styles"); diff --git a/src/SaveTool/SaveTool_MassViewer_Weapons.cpp b/src/SaveTool/SaveTool_MassViewer_Weapons.cpp index 0a9de55..909712f 100644 --- a/src/SaveTool/SaveTool_MassViewer_Weapons.cpp +++ b/src/SaveTool/SaveTool_MassViewer_Weapons.cpp @@ -33,7 +33,7 @@ void SaveTool::drawWeapons() { if(!ImGui::BeginTable("##WeaponsList", 1, ImGuiTableFlags_ScrollY|ImGuiTableFlags_BordersOuter|ImGuiTableFlags_BordersInnerH, - {ImGui::GetContentRegionAvailWidth() * 0.2f, -footer_height_to_reserve})) + {ImGui::GetContentRegionAvail().x * 0.2f, -footer_height_to_reserve})) { ImGui::EndGroup(); return; diff --git a/src/SaveTool/SaveTool_drawMainMenu.cpp b/src/SaveTool/SaveTool_drawMainMenu.cpp index 8708f6d..b8a5218 100644 --- a/src/SaveTool/SaveTool_drawMainMenu.cpp +++ b/src/SaveTool/SaveTool_drawMainMenu.cpp @@ -64,7 +64,7 @@ void SaveTool::drawMainMenu() { "Half V-sync" }; - ImGui::SetNextItemWidth(ImGui::GetContentRegionAvailWidth()); + ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); if(ImGui::BeginCombo("##FrameLimit", framelimit_labels[selection])) { if(ImGui::Selectable(framelimit_labels[0], _framelimit == Framelimit::Vsync)) { selection = 0; diff --git a/third-party/SDL b/third-party/SDL index 857cc7c..0bfeed0 160000 --- a/third-party/SDL +++ b/third-party/SDL @@ -1 +1 @@ -Subproject commit 857cc7c0c93f003dbfc5fed7a87de907fffb2a1b +Subproject commit 0bfeed061b10ea7dd37c88d9bae1824bad760f3a diff --git a/third-party/corrade b/third-party/corrade index cbcadb5..41b2e25 160000 --- a/third-party/corrade +++ b/third-party/corrade @@ -1 +1 @@ -Subproject commit cbcadb5758da89762b6f661b2ed56cb94e62e33b +Subproject commit 41b2e250b7e1e09c2ed057f079617e3d77393c47 diff --git a/third-party/curl b/third-party/curl index 64db5c5..280cbee 160000 --- a/third-party/curl +++ b/third-party/curl @@ -1 +1 @@ -Subproject commit 64db5c575d9c5536bd273a890f50777ad1ca7c13 +Subproject commit 280cbeee2789749fa9b2267ce7a07813645897de diff --git a/third-party/efsw b/third-party/efsw index f5f42f4..f3914e4 160000 --- a/third-party/efsw +++ b/third-party/efsw @@ -1 +1 @@ -Subproject commit f5f42f4b9a1c34512b779b2c5544ae42fdf97afa +Subproject commit f3914e475cc8cec461ac05060470c6510ee81246 diff --git a/third-party/imgui b/third-party/imgui index ddddabd..a8df192 160000 --- a/third-party/imgui +++ b/third-party/imgui @@ -1 +1 @@ -Subproject commit ddddabdccfdafffd8664fb4e29230dc4f848137e +Subproject commit a8df192df022ed6ac447e7b7ada718c4c4824b41 diff --git a/third-party/libzip b/third-party/libzip index e7c81b6..bdc03ab 160000 --- a/third-party/libzip +++ b/third-party/libzip @@ -1 +1 @@ -Subproject commit e7c81b67ab91d5dc54c2238d9f7d9abab1a0a8c3 +Subproject commit bdc03ab23b703fcc516436d6ebcbfb6ac4484033 diff --git a/third-party/magnum b/third-party/magnum index 67d37c9..a496029 160000 --- a/third-party/magnum +++ b/third-party/magnum @@ -1 +1 @@ -Subproject commit 67d37c9ed54b1e44105536c2aa3e60c723e27f59 +Subproject commit a49602987499379e4a2d155472961d99ddfc75ba diff --git a/third-party/magnum-integration b/third-party/magnum-integration index 012d62b..883bd0c 160000 --- a/third-party/magnum-integration +++ b/third-party/magnum-integration @@ -1 +1 @@ -Subproject commit 012d62b7480ed67b692d90155f25260a59d12042 +Subproject commit 883bd0cb6e00172b6fca34ff8cc4bc70bc302637