SaveTool: remove licences for third-party deps.

This should thin the exe up a bit.
src/CMakeLists: change how deps are linked to.
2023-08-28 13:32:06 +02:00 · 2023-08-28 13:17:54 +02:00 · 2023-08-28 13:14:00 +02:00 · 2023-08-28 13:10:41 +02:00 · 2023-08-27 22:31:54 +02:00 · 2023-08-27 21:58:14 +02:00
4 changed files with 99 additions and 174 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -14,104 +14,110 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.

-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.24)
 project(MassBuilderSaveTool)

 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/modules/" ${CMAKE_MODULE_PATH})

-SET(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
+set(ZLIB_USE_STATIC_LIBS ON CACHE BOOL "" FORCE) # Required on setups where zlib is available as both dynamic and static libs. Which is pretty much everywhere, actually.

-set(CORRADE_BUILD_DEPRECATED OFF CACHE BOOL "" FORCE)
-set(CORRADE_BUILD_STATIC ON CACHE BOOL "" FORCE)
-set(CORRADE_BUILD_STATIC_PIC ON CACHE BOOL "" FORCE)
-set(CORRADE_BUILD_STATIC_UNIQUE_GLOBALS OFF CACHE BOOL "" FORCE)
-set(CORRADE_BUILD_TESTS OFF CACHE BOOL "" FORCE)
-set(CORRADE_WITH_INTERCONNECT OFF CACHE BOOL "" FORCE)
-set(CORRADE_WITH_PLUGINMANAGER OFF 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)
+option(SAVETOOL_USE_SYSTEM_LIBS "Use system-wide versions of the dependencies instead of the versions provided by submodules." OFF)

-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)
-set(SDL_EVENTS ON CACHE BOOL "" FORCE)
-set(SDL_FILE OFF CACHE BOOL "" FORCE)
-set(SDL_FILESYSTEM OFF CACHE BOOL "" FORCE)
-set(SDL_HAPTIC OFF CACHE BOOL "" FORCE)
-set(SDL_LOCALE OFF CACHE BOOL "" FORCE)
-set(SDL_POWER OFF CACHE BOOL "" FORCE)
-set(SDL_RENDER OFF CACHE BOOL "" FORCE)
-set(SDL_SENSOR OFF CACHE BOOL "" FORCE)
-set(SDL_THREADS ON CACHE BOOL "" FORCE)
-set(SDL_TIMERS ON CACHE BOOL "" FORCE)
-set(SDL_SHARED OFF CACHE BOOL "" FORCE)
-add_subdirectory(third-party/SDL EXCLUDE_FROM_ALL)
+if(NOT SAVETOOL_USE_SYSTEM_LIBS)
+    # Generic variables shared by multiple libs that don't provide their own.
+    set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
+    set(BUILD_TESTING OFF CACHE BOOL "" FORCE)

-set(MAGNUM_BUILD_STATIC ON CACHE BOOL "" FORCE)
-set(MAGNUM_BUILD_STATIC_PIC ON CACHE BOOL "" FORCE)
-set(MAGNUM_BUILD_STATIC_UNIQUE_GLOBALS OFF CACHE BOOL "" FORCE)
-set(MAGNUM_BUILD_DEPRECATED OFF CACHE BOOL "" FORCE)
-set(MAGNUM_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+    set(CORRADE_BUILD_DEPRECATED OFF CACHE BOOL "" FORCE)
+    set(CORRADE_BUILD_STATIC ON CACHE BOOL "" FORCE)
+    set(CORRADE_BUILD_STATIC_PIC ON CACHE BOOL "" FORCE)
+    set(CORRADE_BUILD_STATIC_UNIQUE_GLOBALS OFF CACHE BOOL "" FORCE)
+    set(CORRADE_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+    set(CORRADE_WITH_INTERCONNECT OFF CACHE BOOL "" FORCE)
+    set(CORRADE_WITH_PLUGINMANAGER OFF 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)

-set(MAGNUM_TARGET_GL ON CACHE BOOL "" FORCE)
-set(MAGNUM_TARGET_GLES OFF CACHE BOOL "" FORCE)
-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)
-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)
+    set(DIRECTX OFF CACHE BOOL "" FORCE) # We use OpenGL.
+    set(SDL_ATOMIC OFF CACHE BOOL "" FORCE)
+    set(SDL_CPUINFO OFF CACHE BOOL "" FORCE)
+    set(SDL_EVENTS ON CACHE BOOL "" FORCE)
+    set(SDL_FILE OFF CACHE BOOL "" FORCE)
+    set(SDL_FILESYSTEM OFF CACHE BOOL "" FORCE)
+    set(SDL_HAPTIC OFF CACHE BOOL "" FORCE)
+    set(SDL_LOCALE OFF CACHE BOOL "" FORCE)
+    set(SDL_POWER OFF CACHE BOOL "" FORCE)
+    set(SDL_RENDER OFF CACHE BOOL "" FORCE)
+    set(SDL_SENSOR OFF CACHE BOOL "" FORCE)
+    set(SDL_THREADS ON CACHE BOOL "" FORCE)
+    set(SDL_TIMERS ON CACHE BOOL "" FORCE)
+    set(SDL_SHARED OFF CACHE BOOL "" FORCE)
+    add_subdirectory(third-party/SDL EXCLUDE_FROM_ALL)

-set(IMGUI_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third-party/imgui)
-set(MAGNUM_WITH_IMGUI ON CACHE BOOL "" FORCE)
-add_subdirectory(third-party/magnum-integration EXCLUDE_FROM_ALL)
+    set(MAGNUM_BUILD_STATIC ON CACHE BOOL "" FORCE)
+    set(MAGNUM_BUILD_STATIC_PIC ON CACHE BOOL "" FORCE)
+    set(MAGNUM_BUILD_STATIC_UNIQUE_GLOBALS OFF CACHE BOOL "" FORCE)
+    set(MAGNUM_BUILD_DEPRECATED OFF CACHE BOOL "" FORCE)
+    set(MAGNUM_BUILD_TESTS OFF CACHE BOOL "" FORCE)

-set(ENABLE_COMMONCRYPTO OFF CACHE BOOL "" FORCE)
-set(ENABLE_GNUTLS OFF CACHE BOOL "" FORCE)
-set(ENABLE_MBEDTLS OFF CACHE BOOL "" FORCE)
-set(ENABLE_OPENSSL OFF CACHE BOOL "" FORCE)
-set(ENABLE_WINDOWS_CRYPTO OFF CACHE BOOL "" FORCE)
-set(ENABLE_BZIP2 OFF CACHE BOOL "" FORCE)
-set(ENABLE_LZMA OFF CACHE BOOL "" FORCE)
-set(ENABLE_ZSTD OFF CACHE BOOL "" FORCE)
-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)
-add_subdirectory(third-party/libzip EXCLUDE_FROM_ALL)
+    set(MAGNUM_TARGET_GL ON CACHE BOOL "" FORCE)
+    set(MAGNUM_TARGET_GLES OFF CACHE BOOL "" FORCE)
+    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)
+    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)

-set(VERBOSE OFF CACHE BOOL "" FORCE)
-set(BUILD_TEST_APP OFF CACHE BOOL "" FORCE)
-set(EFSW_INSTALL OFF CACHE BOOL "" FORCE)
-add_subdirectory(third-party/efsw EXCLUDE_FROM_ALL)
+    set(IMGUI_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third-party/imgui)
+    set(MAGNUM_WITH_IMGUI ON CACHE BOOL "" FORCE)
+    add_subdirectory(third-party/magnum-integration EXCLUDE_FROM_ALL)

-set(BUILD_TESTING OFF CACHE BOOL "" FORCE)
-set(BUILD_CURL_EXE 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)
+    set(ENABLE_COMMONCRYPTO OFF CACHE BOOL "" FORCE)
+    set(ENABLE_GNUTLS OFF CACHE BOOL "" FORCE)
+    set(ENABLE_MBEDTLS OFF CACHE BOOL "" FORCE)
+    set(ENABLE_OPENSSL OFF CACHE BOOL "" FORCE)
+    set(ENABLE_WINDOWS_CRYPTO OFF CACHE BOOL "" FORCE)
+    set(ENABLE_BZIP2 OFF CACHE BOOL "" FORCE)
+    set(ENABLE_LZMA OFF CACHE BOOL "" FORCE)
+    set(ENABLE_ZSTD OFF CACHE BOOL "" FORCE)
+    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)
+    add_subdirectory(third-party/libzip EXCLUDE_FROM_ALL)
+
+    set(VERBOSE OFF CACHE BOOL "" FORCE)
+    set(BUILD_TEST_APP OFF CACHE BOOL "" FORCE)
+    set(EFSW_INSTALL OFF CACHE BOOL "" FORCE)
+    add_subdirectory(third-party/efsw EXCLUDE_FROM_ALL)
+
+    set(BUILD_CURL_EXE 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)
+endif(NOT SAVETOOL_USE_SYSTEM_LIBS)

 add_subdirectory(src)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -23,6 +23,9 @@ set(SAVETOOL_PROJECT_VERSION 1.5.0-pre)
 find_package(Corrade REQUIRED Main Containers Utility)
 find_package(Magnum REQUIRED GL Sdl2Application)
 find_package(MagnumIntegration REQUIRED ImGui)
+find_package(CURL REQUIRED HTTPS)
+find_package(libzip REQUIRED)
+find_package(efsw REQUIRED)

 set_directory_properties(PROPERTIES CORRADE_USE_PEDANTIC_FLAGS ON)

@ -124,9 +127,9 @@ target_link_libraries(MassBuilderSaveTool PRIVATE
    MagnumIntegration::ImGui
    Logger
    UESaveFile
-    efsw
-    zip
-    libcurl
+    efsw::efsw
+    libzip::zip
+    CURL::libcurl_static
    imm32
    wtsapi32
 )
--- a/src/SaveTool/SaveTool_drawAbout.cpp
+++ b/src/SaveTool/SaveTool_drawAbout.cpp
@ -115,14 +115,6 @@ SaveTool::drawAbout() {

            ImGui::TextUnformatted("Licence: MIT");

-            static auto corrade_licence = _rs.getRaw("COPYING.Corrade");
-            if(ImGui::BeginChild("##CorradeLicence", {0.0f, float(windowSize().y()) * 0.3f}, true)) {
-                ImGui::PushFont(ImGui::GetIO().Fonts->Fonts[1]);
-                ImGui::TextUnformatted(corrade_licence.begin(), corrade_licence.end());
-                ImGui::PopFont();
-            }
-            ImGui::EndChild();
-
            ImGui::TreePop();
        }

@ -143,14 +135,6 @@ SaveTool::drawAbout() {

            ImGui::TextUnformatted("Licence: MIT");

-            static auto magnum_licence = _rs.getRaw("COPYING.Magnum");
-            if(ImGui::BeginChild("##MagnumLicence", {0.0f, float(windowSize().y()) * 0.3f}, true)) {
-                ImGui::PushFont(ImGui::GetIO().Fonts->Fonts[1]);
-                ImGui::TextUnformatted(magnum_licence.begin(), magnum_licence.end());
-                ImGui::PopFont();
-            }
-            ImGui::EndChild();
-
            ImGui::TreePop();
        }

@ -169,14 +153,6 @@ SaveTool::drawAbout() {

            ImGui::TextUnformatted("Licence: MIT");

-            static auto imgui_licence = _rs.getRaw("LICENSE.ImGui");
-            if(ImGui::BeginChild("##ImGuiLicence", {0.0f, float(windowSize().y()) * 0.3f}, true)) {
-                ImGui::PushFont(ImGui::GetIO().Fonts->Fonts[1]);
-                ImGui::TextUnformatted(imgui_licence.begin(), imgui_licence.end());
-                ImGui::PopFont();
-            }
-            ImGui::EndChild();
-
            ImGui::TreePop();
        }

@ -195,14 +171,6 @@ SaveTool::drawAbout() {

            ImGui::TextUnformatted("Licence: zlib");

-            static auto sdl_licence = _rs.getRaw("LICENSE.SDL");
-            if(ImGui::BeginChild("##SDLLicence", {0.0f, float(windowSize().y()) * 0.3f}, true)) {
-                ImGui::PushFont(ImGui::GetIO().Fonts->Fonts[1]);
-                ImGui::TextUnformatted(sdl_licence.begin(), sdl_licence.end());
-                ImGui::PopFont();
-            }
-            ImGui::EndChild();
-
            ImGui::TreePop();
        }

@ -221,14 +189,6 @@ SaveTool::drawAbout() {

            ImGui::TextUnformatted("Licence: 3-clause BSD");

-            static auto libzip_licence = _rs.getRaw("LICENSE.libzip");
-            if(ImGui::BeginChild("##libzipLicence", {0.0f, float(windowSize().y()) * 0.3f}, true)) {
-                ImGui::PushFont(ImGui::GetIO().Fonts->Fonts[1]);
-                ImGui::TextUnformatted(libzip_licence.begin(), libzip_licence.end());
-                ImGui::PopFont();
-            }
-            ImGui::EndChild();
-
            ImGui::TreePop();
        }

@ -246,14 +206,6 @@ SaveTool::drawAbout() {

            ImGui::TextUnformatted("Licence: MIT");

-            static auto efsw_licence = _rs.getRaw("LICENSE.efsw");
-            if(ImGui::BeginChild("##efswLicence", {0.0f, float(windowSize().y()) * 0.3f}, true)) {
-                ImGui::PushFont(ImGui::GetIO().Fonts->Fonts[1]);
-                ImGui::TextUnformatted(efsw_licence.begin(), efsw_licence.end());
-                ImGui::PopFont();
-            }
-            ImGui::EndChild();
-
            ImGui::TreePop();
        }

@ -272,14 +224,6 @@ SaveTool::drawAbout() {

            ImGui::TextUnformatted("Licence: MIT/X derivative");

-            static auto curl_licence = _rs.getRaw("LICENSE.curl");
-            if(ImGui::BeginChild("##libcurlLicence", {0.0f, float(windowSize().y()) * 0.3f}, true)) {
-                ImGui::PushFont(ImGui::GetIO().Fonts->Fonts[1]);
-                ImGui::TextUnformatted(curl_licence.begin(), curl_licence.end());
-                ImGui::PopFont();
-            }
-            ImGui::EndChild();
-
            ImGui::TreePop();
        }

--- a/src/assets.conf
+++ b/src/assets.conf
@ -19,31 +19,3 @@ alias=fa-brands-400.ttf
 [file]
 filename=../COPYING
 alias=COPYING
-
-[file]
-filename=../third-party/corrade/COPYING
-alias=COPYING.Corrade
-
-[file]
-filename=../third-party/magnum/COPYING
-alias=COPYING.Magnum
-
-[file]
-filename=../third-party/imgui/LICENSE.txt
-alias=LICENSE.ImGui
-
-[file]
-filename=../third-party/SDL/LICENSE.txt
-alias=LICENSE.SDL
-
-[file]
-filename=../third-party/libzip/LICENSE
-alias=LICENSE.libzip
-
-[file]
-filename=../third-party/efsw/LICENSE
-alias=LICENSE.efsw
-
-[file]
-filename=../third-party/curl/COPYING
-alias=LICENSE.curl
Author	SHA1	Message	Date
Guillaume Jacquemin	39d71a7a09	SaveTool: remove licences for third-party deps. This should thin the exe up a bit.	2023-08-28 13:32:06 +02:00
Guillaume Jacquemin	4b3912f6ef	src/CMakeLists: change how deps are linked to. This might break submodule builds on MSYS2. Not like I care anyway, as they were already broken on my Arch rig.	2023-08-28 13:17:54 +02:00
Guillaume Jacquemin	4e98a89b9d	CMakeLists: add a better way to force static zlib. This requires a minimum CMake version bump, but most systems should have access to 3.24 by now, as it was released last year.	2023-08-28 13:14:00 +02:00
Guillaume Jacquemin	9f8c8191ca	CMakeLists: fix a condition. Submodules should _not_ be used when using system libs, after all. Derp.	2023-08-28 13:10:41 +02:00
Guillaume Jacquemin	e9ce919fd0	CMakeLists: allow using system libs. This should be useful for some setups, like my current one (see #31's opening message).	2023-08-27 22:31:54 +02:00
Guillaume Jacquemin	1af948fe03	CMakeLists: add potential support for MSVC. I won't provide actual support for it because MSVC sucks, but if someone wants to use it or Clang-cl, now they can.	2023-08-27 21:58:14 +02:00
Guillaume Jacquemin	abac0570a4	CMakeLists: WHY IS THIS COMMAND SCREAMING ?	2023-08-27 21:56:06 +02:00