diff options
| -rw-r--r-- | anim-crop-tool/main.cpp | 2 | ||||
| -rw-r--r-- | compat/prelude.hpp | 3 | ||||
| -rw-r--r-- | external/CMakeLists.txt | 242 | ||||
| -rw-r--r-- | loader/loader-impl.cpp | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
5 files changed, 143 insertions, 108 deletions
diff --git a/anim-crop-tool/main.cpp b/anim-crop-tool/main.cpp index ae3c2af3..15335d84 100644 --- a/anim-crop-tool/main.cpp +++ b/anim-crop-tool/main.cpp @@ -229,8 +229,6 @@ static std::tuple<options, Arguments, bool> parse_cmdline(int argc, const char* [[nodiscard]] static bool check_atlas_name(StringView str) noexcept { - constexpr auto npos = std::string::npos; - if (str.isEmpty()) return false; if (str[0] == '.' || str[0] == '\\' || str[0] == '/') diff --git a/compat/prelude.hpp b/compat/prelude.hpp index 97ec3c6c..ccc71f06 100644 --- a/compat/prelude.hpp +++ b/compat/prelude.hpp @@ -3,10 +3,13 @@ namespace Corrade::Containers::Literals {} namespace Corrade::Containers {} namespace Corrade::Utility::Path {} +namespace Corrade::Utility { class Debug; class Error; } namespace Magnum {} namespace floormat { using namespace ::Magnum; using namespace ::Corrade::Containers; using namespace ::Corrade::Containers::Literals; + using Debug [[maybe_unused]] = ::Corrade::Utility::Debug; + using Error [[maybe_unused]] = ::Corrade::Utility::Error; namespace Path = Corrade::Utility::Path; // NOLINT(misc-unused-alias-decls) } // namespace floormat diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 70667e2b..43e806b4 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -43,106 +43,143 @@ if(FLOORMAT_SUBMODULE-DEPENDENCIES) ) sets(BOOL - FMT_SYSTEM_HEADERS ON - - JSON_Diagnostics ON - JSON_Install ON - JSON_MultipleHeaders ON - JSON_SystemInclude ON - - CORRADE_BUILD_STATIC OFF - CORRADE_BUILD_TESTS OFF - CORRADE_BUILD_DEPRECATED OFF - CORRADE_MSVC_COMPATIBILITY OFF - CORRADE_UTILITY_USE_ANSI_COLORS ON - CORRADE_WITH_TESTSUITE ON - - MAGNUM_BUILD_STATIC OFF - MAGNUM_BUILD_TESTS OFF - MAGNUM_BUILD_DEPRECATED ON - - MAGNUM_WITH_WINDOWLESSWGLAPPLICATION OFF - MAGNUM_WITH_WINDOWLESSGLXAPPLICATION OFF - MAGNUM_WITH_WINDOWLESSCGLAPPLICATION OFF - - MAGNUM_WITH_ANYIMAGECONVERTER ON - MAGNUM_WITH_ANYIMAGEIMPORTER ON - MAGNUM_WITH_DISTANCEFIELDCONVERTER ON - MAGNUM_WITH_FONTCONVERTER ON - MAGNUM_WITH_GL_INFO ON - MAGNUM_WITH_IMAGECONVERTER ON - MAGNUM_WITH_MAGNUMFONT ON - MAGNUM_WITH_MAGNUMFONTCONVERTER ON - MAGNUM_WITH_OBJIMPORTER ON - MAGNUM_WITH_OPENGLTESTER ON - MAGNUM_WITH_PNGIMPORTER OFF - MAGNUM_WITH_SDL2APPLICATION ON - MAGNUM_WITH_SHADERCONVERTER ON - MAGNUM_WITH_SHADERS ON - MAGNUM_WITH_SHADERTOOLS ON - MAGNUM_WITH_TGAIMAGECONVERTER ON - MAGNUM_WITH_TGAIMPORTER ON - MAGNUM_WITH_WEBPIMPORTER OFF - - MAGNUM_WITH_DDSIMPORTER ON - MAGNUM_WITH_GLTFIMPORTER ON - MAGNUM_WITH_ICOIMPORTER ON - MAGNUM_WITH_PRIMITIVEIMPORTER ON - MAGNUM_WITH_STBIMAGECONVERTER ON - MAGNUM_WITH_STBIMAGEIMPORTER ON - MAGNUM_WITH_STBTRUETYPEFONT ON - MAGNUM_WITH_TINYGLTFIMPORTER OFF - - MAGNUM_WITH_BULLET OFF - MAGNUM_WITH_DART OFF - MAGNUM_WITH_EIGEN OFF - MAGNUM_WITH_GLM OFF - MAGNUM_WITH_IMGUI ON + FMT_SYSTEM_HEADERS ON + + JSON_Diagnostics ON + JSON_Install ON + JSON_MultipleHeaders ON + JSON_SystemInclude ON + + CORRADE_BUILD_STATIC OFF + CORRADE_BUILD_TESTS OFF + CORRADE_BUILD_DEPRECATED OFF + CORRADE_MSVC_COMPATIBILITY OFF + CORRADE_UTILITY_USE_ANSI_COLORS ON + CORRADE_WITH_TESTSUITE ON + + MAGNUM_BUILD_STATIC OFF + MAGNUM_BUILD_TESTS OFF + MAGNUM_BUILD_DEPRECATED ON + + MAGNUM_WITH_SDL2APPLICATION ON + MAGNUM_WITH_WINDOWLESSWGLAPPLICATION OFF + MAGNUM_WITH_WINDOWLESSGLXAPPLICATION OFF + MAGNUM_WITH_WINDOWLESSCGLAPPLICATION OFF + + MAGNUM_WITH_ANYAUDIOIMPORTER OFF + MAGNUM_WITH_ANYIMAGEIMPORTER OFF + MAGNUM_WITH_ANYSCENEIMPORTER OFF + MAGNUM_WITH_ASSIMPIMPORTER OFF + MAGNUM_WITH_ASTCIMPORTER OFF + MAGNUM_WITH_BASISIMPORTER OFF + MAGNUM_WITH_CGLTFIMPORTER OFF + MAGNUM_WITH_DEVILIMAGEIMPORTER OFF + MAGNUM_WITH_DRFLACAUDIOIMPORTER OFF + MAGNUM_WITH_DRMP3AUDIOIMPORTER OFF + MAGNUM_WITH_DRWAVAUDIOIMPORTER OFF + MAGNUM_WITH_FAAD2AUDIOIMPORTER OFF + MAGNUM_WITH_GLTFIMPORTER OFF + MAGNUM_WITH_ICOIMPORTER OFF + MAGNUM_WITH_JPEGIMPORTER OFF + MAGNUM_WITH_KTXIMPORTER OFF + MAGNUM_WITH_OBJIMPORTER OFF + MAGNUM_WITH_OPENEXRIMPORTER OFF + MAGNUM_WITH_OPENGEXIMPORTER OFF + MAGNUM_WITH_PNGIMPORTER OFF + MAGNUM_WITH_PRIMITIVEIMPORTER OFF + MAGNUM_WITH_STANFORDIMPORTER OFF + MAGNUM_WITH_STBVORBISAUDIOIMPORTER OFF + MAGNUM_WITH_STLIMPORTER OFF + MAGNUM_WITH_TINYGLTFIMPORTER OFF + MAGNUM_WITH_WAVAUDIOIMPORTER OFF + MAGNUM_WITH_WEBPIMPORTER OFF + + MAGNUM_WITH_DDSIMPORTER ON + MAGNUM_WITH_STBIMAGEIMPORTER ON + MAGNUM_WITH_STBTRUETYPEFONT ON + MAGNUM_WITH_TGAIMPORTER ON + + MAGNUM_WITH_GL_INFO ON + MAGNUM_WITH_MAGNUMFONT ON + MAGNUM_WITH_OPENGLTESTER ON + MAGNUM_WITH_SHADERS ON + MAGNUM_WITH_SHADERTOOLS ON + + MAGNUM_WITH_ANYIMAGECONVERTER OFF + MAGNUM_WITH_ANYSCENECONVERTER OFF + MAGNUM_WITH_ANYSHADERCONVERTER OFF + MAGNUM_WITH_BASISIMAGECONVERTER OFF + MAGNUM_WITH_DISTANCEFIELDCONVERTER OFF + MAGNUM_WITH_GLSLANGSHADERCONVERTER OFF + MAGNUM_WITH_GLTFSCENECONVERTER OFF + MAGNUM_WITH_IMAGECONVERTER OFF + MAGNUM_WITH_JPEGIMAGECONVERTER OFF + MAGNUM_WITH_KTXIMAGECONVERTER OFF + MAGNUM_WITH_MESHOPTIMIZERSCENECONVERTER OFF + MAGNUM_WITH_MINIEXRIMAGECONVERTER OFF + MAGNUM_WITH_OPENEXRIMAGECONVERTER OFF + MAGNUM_WITH_PNGIMAGECONVERTER OFF + MAGNUM_WITH_SCENECONVERTER OFF + MAGNUM_WITH_SPIRVTOOLSSHADERCONVERTER OFF + MAGNUM_WITH_STANFORDSCENECONVERTER OFF + MAGNUM_WITH_STBRESIZEIMAGECONVERTER OFF + MAGNUM_WITH_TGAIMAGECONVERTER OFF + + MAGNUM_WITH_MAGNUMFONTCONVERTER ON + MAGNUM_WITH_SHADERCONVERTER ON + MAGNUM_WITH_STBDXTIMAGECONVERTER ON + MAGNUM_WITH_STBIMAGECONVERTER ON + + MAGNUM_WITH_BULLET OFF + MAGNUM_WITH_DART OFF + MAGNUM_WITH_EIGEN OFF + MAGNUM_WITH_GLM OFF + MAGNUM_WITH_IMGUI ON ) sets(BOOL - SDL2_DISABLE_INSTALL OFF - SDL2_DISABLE_SDL2MAIN ON - - SDL_3DNOW OFF - SDL_ALTIVEC OFF - #SDL_ASSEMBLY OFF - SDL_ATOMIC OFF - SDL_AUDIO OFF - SDL_CPUINFO OFF - SDL_DIRECTX OFF - SDL_DISKAUDIO OFF - SDL_DUMMYAUDIO OFF - SDL_DUMMYVIDEO OFF - SDL_FILE OFF - SDL_FILESYSTEM OFF - SDL_HAPTIC OFF - SDL_HIDAPI OFF - SDL_HIDAPI_JOYSTICK OFF - SDL_JOYSTICK OFF - SDL_LIBC ON - SDL_LOADSO ON - SDL_LOCALE OFF - SDL_MISC OFF - #SDL_MMX OFF - SDL_OPENGL ON - SDL_OPENGLES OFF - SDL_POWER OFF - SDL_RENDER OFF - SDL_RENDER_D3D OFF - SDL_SENSOR OFF - #SDL_SSE OFF - #SDL_SSE2 OFF - #SDL_SSE3 OFF - #SDL_SSEMATH OFF - SDL_SYSTEM_ICONV OFF - SDL_TEST OFF - SDL_THREADS ON - SDL_TIMERS OFF - SDL_VIDEO ON - SDL_VIRTUAL_JOYSTICK OFF - SDL_VULKAN OFF - SDL_WASAPI OFF - SDL_XINPUT OFF + SDL2_DISABLE_INSTALL OFF + SDL2_DISABLE_SDL2MAIN ON + + SDL_3DNOW OFF + SDL_ALTIVEC OFF + #SDL_ASSEMBLY OFF + SDL_ATOMIC OFF + SDL_AUDIO OFF + SDL_CPUINFO OFF + SDL_DIRECTX OFF + SDL_DISKAUDIO OFF + SDL_DUMMYAUDIO OFF + SDL_DUMMYVIDEO OFF + SDL_FILE OFF + SDL_FILESYSTEM OFF + SDL_HAPTIC OFF + SDL_HIDAPI OFF + SDL_HIDAPI_JOYSTICK OFF + SDL_JOYSTICK OFF + SDL_LIBC ON + SDL_LOADSO ON + SDL_LOCALE OFF + SDL_MISC OFF + #SDL_MMX OFF + SDL_OPENGL ON + SDL_OPENGLES OFF + SDL_POWER OFF + SDL_RENDER OFF + SDL_RENDER_D3D OFF + SDL_SENSOR OFF + #SDL_SSE OFF + #SDL_SSE2 OFF + #SDL_SSE3 OFF + #SDL_SSEMATH OFF + SDL_SYSTEM_ICONV OFF + SDL_TEST OFF + SDL_THREADS ON + SDL_TIMERS OFF + SDL_VIDEO ON + SDL_VIRTUAL_JOYSTICK OFF + SDL_VULKAN OFF + SDL_WASAPI OFF + SDL_XINPUT OFF ) if(WIN32) sets(BOOL MAGNUM_WITH_WINDOWLESSWGLAPPLICATION ON) @@ -159,13 +196,10 @@ set(fm-quiet-message 0) function(message) if(fm-quiet-message) - list(GET ARGV 0 MessageType) - if(MessageType STREQUAL FATAL_ERROR OR - MessageType STREQUAL SEND_ERROR OR - MessageType STREQUAL WARNING OR - MessageType STREQUAL AUTHOR_WARNING) + list(GET ARGV 0 m) + if(m STREQUAL FATAL_ERROR OR m STREQUAL SEND_ERROR OR m STREQUAL WARNING OR m STREQUAL AUTHOR_WARNING) list(REMOVE_AT ARGV 0) - _message(${MessageType} "${ARGV}") + _message(${m} "${ARGV}") endif() else() _message("${ARGV}") diff --git a/loader/loader-impl.cpp b/loader/loader-impl.cpp index 5798efcc..23dc4253 100644 --- a/loader/loader-impl.cpp +++ b/loader/loader-impl.cpp @@ -31,7 +31,7 @@ struct loader_impl final : loader_ std::optional<Utility::Resource> shader_res; PluginManager::Manager<Trade::AbstractImporter> importer_plugins; Containers::Pointer<Trade::AbstractImporter> image_importer = - importer_plugins.loadAndInstantiate("AnyImageImporter"); + importer_plugins.loadAndInstantiate("StbImageImporter"); Containers::Pointer<Trade::AbstractImporter> tga_importer = importer_plugins.loadAndInstantiate("TgaImporter"); diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 257a327c..ae5bfd02 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,7 +14,7 @@ endif() if(WIN32 OR MAGNUM_BUILD_PLUGINS_STATIC) target_link_libraries(${self} PUBLIC - Magnum::AnyImageImporter + MagnumPlugins::StbImageImporter Magnum::TgaImporter ) endif() |