diff --git a/CMakeLists.txt b/CMakeLists.txt index 648cd78d..7b6f5605 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -158,7 +158,7 @@ if(NOT WIN32 AND RAWRBOX_USE_WAYLAND) CPMAddPackage("https://gitlab.freedesktop.org/wayland/weston@13.0.3") endif() -CPMAddPackage("gh:stephenberry/glaze@2.9.0") +CPMAddPackage("gh:stephenberry/glaze@2.9.2") # --- if(RAWRBOX_BUILD_RAWRBOX_NETWORK OR RAWRBOX_BUILD_RAWRBOX_ASSIMP) @@ -172,7 +172,7 @@ if(RAWRBOX_BUILD_RAWRBOX_NETWORK OR RAWRBOX_BUILD_RAWRBOX_ASSIMP) USE_CACHE OFF GIT_TAG - 2.1.6 + 2.1.7 OPTIONS #"ASM686 FALSE" #"AMD64 FALSE" diff --git a/package-lock.cmake b/package-lock.cmake deleted file mode 100644 index d3270c1c..00000000 --- a/package-lock.cmake +++ /dev/null @@ -1,231 +0,0 @@ -# CPM Package Lock -# This file should be committed to version control - -# fmt -CPMDeclarePackage(fmt - GIT_TAG 10.2.1 - GITHUB_REPOSITORY fmtlib/fmt - SYSTEM YES - EXCLUDE_FROM_ALL YES -) -# magic_enum -CPMDeclarePackage(magic_enum - VERSION 0.9.5 - GITHUB_REPOSITORY Neargye/magic_enum - SYSTEM YES - EXCLUDE_FROM_ALL YES -) -# glaze -CPMDeclarePackage(glaze - VERSION 2.9.0 - GITHUB_REPOSITORY stephenberry/glaze - SYSTEM YES - EXCLUDE_FROM_ALL YES -) -# zlib -CPMDeclarePackage(zlib - NAME zlib - GIT_TAG 2.1.6 - GITHUB_REPOSITORY zlib-ng/zlib-ng - OPTIONS - "ZLIB_COMPAT ON" - "ZLIB_BUILD_EXAMPLES OFF" - "ZLIB_ENABLE_TESTS OFF" - "POSITION_INDEPENDENT_CODE ON" - "WITH_GTEST OFF" - USE_CACHE OFF -) -# Catch2 -CPMDeclarePackage(Catch2 - NAME Catch2 - VERSION 3.6.0 - GITHUB_REPOSITORY catchorg/Catch2 - OPTIONS - "CATCH_INSTALL_DOCS OFF" - "CATCH_INSTALL_EXTRAS ON" -) -# qhull -CPMDeclarePackage(qhull - NAME qhull - GIT_TAG 2020.2 - DOWNLOAD_ONLY ON - GITHUB_REPOSITORY qhull/qhull -) -# thread-pool -CPMDeclarePackage(thread-pool - VERSION 4.1.0 - GITHUB_REPOSITORY bshoshany/thread-pool - SYSTEM YES - EXCLUDE_FROM_ALL YES -) -# cpptrace -CPMDeclarePackage(cpptrace - VERSION 0.6.1 - GITHUB_REPOSITORY jeremy-rifkin/cpptrace - SYSTEM YES - EXCLUDE_FROM_ALL YES -) -# LuaBridge3 (unversioned) -# CPMDeclarePackage(LuaBridge3 -# NAME LuaBridge3 -# GIT_TAG master -# GITHUB_REPOSITORY kunitoki/LuaBridge3 -# OPTIONS -# "LUABRIDGE_TESTING OFF" -# "LUABRIDGE_COVERAGE OFF" -#) -# luau -CPMDeclarePackage(luau - NAME luau - GIT_TAG 0.630 - GITHUB_REPOSITORY luau-lang/luau - OPTIONS - "LUAU_BUILD_CLI OFF" - "LUAU_BUILD_TESTS OFF" - "LUAU_BUILD_BENCHMARKS OFF" - "LUAU_BUILD_WEB OFF" -) -# libcpr -CPMDeclarePackage(libcpr - NAME libcpr - GIT_TAG 1.10.5 - GITHUB_REPOSITORY libcpr/cpr - OPTIONS - "BUILD_SHARED_LIBS OFF" - "CPR_ENABLE_CURL_HTTP_ONLY ON" - "CPR_ENABLE_SSL ON" - "CURL_ZLIB ON" - PATCH_COMMAND git apply --reject --whitespace=fix D:/rawrbox/rawrbox.network/patch/libcpr.patch -) -# glfw -CPMDeclarePackage(glfw - NAME glfw - GIT_TAG 3.4 - GITHUB_REPOSITORY glfw/glfw - OPTIONS - "GLFW_BUILD_DOCS OFF" - "GLFW_BUILD_EXAMPLES OFF" - "GLFW_BUILD_TESTS OFF" - "GLFW_INSTALL OFF" - "GLFW_USE_OSMESA OFF" - "GLFW_VULKAN_STATIC OFF" - "USE_MSVC_RUNTIME_LIBRARY_DLL OFF" -) -# DiligentCore (unversioned) -# CPMDeclarePackage(DiligentCore -# NAME DiligentCore -# GIT_TAG master -# GITHUB_REPOSITORY DiligentGraphics/DiligentCore -# OPTIONS -# "DILIGENT_NO_RENDER_STATE_PACKAGER ON" -# "DILIGENT_NO_FORMAT_VALIDATION ON" -# "DILIGENT_NO_OPENGL ON" -# "DILIGENT_NO_VULKAN OFF" -# "DILIGENT_NO_DIRECT3D11 ON" -# "DILIGENT_NO_DIRECT3D12 OFF" -# "DILIGENT_BUILD_TESTS OFF" -# PATCH_COMMAND git restore Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp COMMAND git restore Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanInstance.cpp -#) -# utfcpp -CPMDeclarePackage(utfcpp - VERSION 4.0.5 - GITHUB_REPOSITORY nemtrif/utfcpp - SYSTEM YES - EXCLUDE_FROM_ALL YES -) -# lunasvg -CPMDeclarePackage(lunasvg - VERSION 2.3.9 - GITHUB_REPOSITORY sammycage/lunasvg - SYSTEM YES - EXCLUDE_FROM_ALL YES -) -# libwebp -CPMDeclarePackage(libwebp - NAME libwebp - VERSION 1.4.0 - GITHUB_REPOSITORY webmproject/libwebp - OPTIONS - "BUILD_SHARED_LIBS OFF" - "WEBP_BUILD_ANIM_UTILS OFF" - "WEBP_BUILD_CWEBP OFF" - "WEBP_BUILD_DWEBP OFF" - "WEBP_BUILD_GIF2WEBP OFF" - "WEBP_BUILD_IMG2WEBP OFF" - "WEBP_BUILD_VWEBP OFF" - "WEBP_BUILD_WEBPINFO OFF" - "WEBP_BUILD_WEBPMUX OFF" - "WEBP_BUILD_EXTRAS OFF" -) -# libwebm (unversioned) -# CPMDeclarePackage(libwebm -# NAME libwebm -# GIT_TAG libwebm-1.0.0.31 -# GITHUB_REPOSITORY webmproject/libwebm -# OPTIONS -# "BUILD_SHARED_LIBS OFF" -# "ENABLE_WEBMTS OFF" -# "ENABLE_WEBMINFO OFF" -# "ENABLE_WEBM_PARSER OFF" -# "ENABLE_TESTS OFF" -# "ENABLE_SAMPLE_PROGRAMS OFF" -#) -# assimp (unversioned) -# CPMDeclarePackage(assimp -# NAME assimp -# GIT_TAG master -# GITHUB_REPOSITORY edunad/assimp -# OPTIONS -# "BUILD_SHARED_LIBS OFF" -# "ASSIMP_NO_EXPORT ON" -# "ASSIMP_BUILD_ZLIB OFF" -# "ASSIMP_BUILD_ASSIMP_TOOLS OFF" -# "ASSIMP_BUILD_TESTS OFF" -# "ASSIMP_BUILD_SAMPLES OFF" -# "ASSIMP_BUILD_DOCS OFF" -# "ASSIMP_BUILD_ASSIMP_VIEW OFF" -# "USE_STATIC_CRT ON" -# "ASSIMP_WARNINGS_AS_ERRORS OFF" -# "ASSIMP_INSTALL OFF" -# "ASSIMP_INSTALL_PDB OFF" -# "ASSIMP_BUILD_DRACO ON" -# "ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT OFF" -# "ASSIMP_BUILD_ALL_EXPORTERS_BY_DEFAULT OFF" -# "ASSIMP_BUILD_OBJ_IMPORTER ON" -# "ASSIMP_BUILD_FBX_IMPORTER ON" -# "ASSIMP_BUILD_DAE_IMPORTER ON" -# "ASSIMP_BUILD_STL_IMPORTER ON" -# "ASSIMP_BUILD_GLTF_IMPORTER ON" -# "ASSIMP_BUILD_3DS_IMPORTER ON" -# "ASSIMP_BUILD_MD5_IMPORTER ON" -#) -# clip -CPMDeclarePackage(clip - NAME clip - VERSION 1.9 - GITHUB_REPOSITORY dacap/clip - OPTIONS - "CLIP_EXAMPLES OFF" - "CLIP_ENABLE_IMAGE OFF" - "CLIP_TESTS OFF" -) -# Jolt -CPMDeclarePackage(Jolt - NAME Jolt - VERSION 5.0.0 - GITHUB_REPOSITORY jrouwe/JoltPhysics - SOURCE_SUBDIR Build - OPTIONS - "COMPILE_AS_SHARED_LIBRARY OFF" - "INTERPROCEDURAL_OPTIMIZATION ON" - "USE_STATIC_MSVC_RUNTIME_LIBRARY ON" - "ENABLE_ALL_WARNINGS OFF" -) -# muli (unversioned) -# CPMDeclarePackage(muli -# NAME muli -# GIT_TAG master -# GITHUB_REPOSITORY Sopiro/Muli -# OPTIONS -# "MULI_BUILD_DEMO OFF" -#) diff --git a/rawrbox.scripting/CMakeLists.txt b/rawrbox.scripting/CMakeLists.txt index 86206e82..69e6f245 100644 --- a/rawrbox.scripting/CMakeLists.txt +++ b/rawrbox.scripting/CMakeLists.txt @@ -26,7 +26,7 @@ CPMAddPackage( GITHUB_REPOSITORY luau-lang/luau GIT_TAG - 0.630 + 0.631 OPTIONS "LUAU_BUILD_CLI OFF" "LUAU_BUILD_TESTS OFF" diff --git a/rawrbox.utils/CMakeLists.txt b/rawrbox.utils/CMakeLists.txt index 1c5f3ae1..126c0a7e 100644 --- a/rawrbox.utils/CMakeLists.txt +++ b/rawrbox.utils/CMakeLists.txt @@ -77,7 +77,7 @@ if(thread-pool_ADDED) endif() # DEPS ---- -CPMAddPackage("gh:jeremy-rifkin/cpptrace@0.6.1") +CPMAddPackage("gh:jeremy-rifkin/cpptrace@0.6.2") if(cpptrace_ADDED) set_lib_runtime_mt(cpptrace-lib) endif() diff --git a/rawrbox.utils/include/rawrbox/utils/logger.hpp b/rawrbox.utils/include/rawrbox/utils/logger.hpp index d0c7a0ab..3c58d161 100644 --- a/rawrbox.utils/include/rawrbox/utils/logger.hpp +++ b/rawrbox.utils/include/rawrbox/utils/logger.hpp @@ -44,6 +44,13 @@ namespace rawrbox { if (this->_autoNewLine) fmt::print("\n"); } + template + void success(fmt::format_string fmt, T&&... args) { + auto str = fmt::format(fmt, std::forward(args)...); + fmt::print("[{} ▒ {}]: {}", fmt::format(fmt::fg(fmt::color::lime_green), "SUCCESS"), fmt::format(fmt::fg(fmt::color::gold), this->_title), str); + if (this->_autoNewLine) fmt::print("\n"); + } + template static cpptrace::runtime_error err(const std::string& title, fmt::format_string fmt, T&&... args) { auto str = fmt::format(fmt, std::forward(args)...); diff --git a/rawrbox.utils/src/settings.cpp b/rawrbox.utils/src/settings.cpp index 94cad549..5a32a438 100644 --- a/rawrbox.utils/src/settings.cpp +++ b/rawrbox.utils/src/settings.cpp @@ -22,10 +22,8 @@ namespace rawrbox { void Settings::save() { auto fileName = this->getFileName(); - auto ec = glz::write_file_json(this->_settings, fileName, std::string{}); - if (ec) { - throw this->_logger->error("Failed to save settings '{}'", fileName); - } + auto ec = glz::write_file_json(this->_settings, fileName, std::string{}); + if (ec) throw this->_logger->error("Failed to save settings '{}'", fileName); } void Settings::load(std::string data) {