diff --git a/CMakeLists.txt b/CMakeLists.txt index c53a6f4b49c02f63e096b2b50c39a740a86fd904..a96f0f446a7f7a7adacfe7606cadf7d2cb75764c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,16 +73,16 @@ endif() add_library(lava::core ALIAS lava.core) -message(">> lava::utils") - -add_library(lava.utils STATIC - ${LIBLAVA_DIR}/utils/file.cpp - ${LIBLAVA_DIR}/utils/file.hpp - ${LIBLAVA_DIR}/utils/log.hpp - ${LIBLAVA_DIR}/utils/random.hpp - ${LIBLAVA_DIR}/utils/telegram.hpp - ${LIBLAVA_DIR}/utils/thread.hpp - ${LIBLAVA_DIR}/utils/utility.hpp +message(">> lava::util") + +add_library(lava.util STATIC + ${LIBLAVA_DIR}/util/file.cpp + ${LIBLAVA_DIR}/util/file.hpp + ${LIBLAVA_DIR}/util/log.hpp + ${LIBLAVA_DIR}/util/random.hpp + ${LIBLAVA_DIR}/util/telegram.hpp + ${LIBLAVA_DIR}/util/thread.hpp + ${LIBLAVA_DIR}/util/utility.hpp ${LIBLAVA_EXT_DIR}/tinyfiledialogs/tinyfiledialogs.c ) @@ -90,7 +90,7 @@ if(WIN32) set_source_files_properties(${LIBLAVA_EXT_DIR}/tinyfiledialogs/tinyfiledialogs.c PROPERTIES COMPILE_FLAGS " /W0 ") endif() -target_include_directories(lava.utils PUBLIC +target_include_directories(lava.util PUBLIC ${LIBLAVA_EXT_DIR}/spdlog/include ${LIBLAVA_EXT_DIR}/physfs/src ${LIBLAVA_EXT_DIR}/tinyfiledialogs @@ -116,12 +116,12 @@ add_subdirectory(${LIBLAVA_EXT_DIR}/physfs physfs EXCLUDE_FROM_ALL) message("<<< physfs") -target_link_libraries(lava.utils +target_link_libraries(lava.util lava::core physfs-static ) -add_library(lava::utils ALIAS lava.utils) +add_library(lava::util ALIAS lava.util) message(">> lava::base") @@ -147,7 +147,7 @@ target_include_directories(lava.base PUBLIC ) target_link_libraries(lava.base - lava::utils + lava::util ${CMAKE_DL_LIBS} ) diff --git a/README.md b/README.md index 946d9a10f7f65d04419591666570dcac074fbfa8..23ff0155495e28030b97ae64a7b074a2dba89629 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Download latest **<a href="https://github.com/liblava/liblava/releases">preview ## modules -[](https://github.com/liblava/liblava/tree/master/liblava/core) [](https://github.com/liblava/liblava/tree/master/liblava/utils) [](https://github.com/liblava/liblava/tree/master/liblava/base) [](https://github.com/liblava/liblava/tree/master/liblava/resource) [](https://github.com/liblava/liblava/tree/master/liblava/frame) [](https://github.com/liblava/liblava/tree/master/liblava/block) [](https://github.com/liblava/liblava/tree/master/liblava/tool) +[](https://github.com/liblava/liblava/tree/master/liblava/core) [](https://github.com/liblava/liblava/tree/master/liblava/util) [](https://github.com/liblava/liblava/tree/master/liblava/base) [](https://github.com/liblava/liblava/tree/master/liblava/resource) [](https://github.com/liblava/liblava/tree/master/liblava/frame) [](https://github.com/liblava/liblava/tree/master/liblava/block) [](https://github.com/liblava/liblava/tree/master/liblava/tool) ## hello frame diff --git a/liblava/base/base.hpp b/liblava/base/base.hpp index 05209e0f3ad418e720fefa9fb4d0328c7be322c1..bfa4e8f731593ae7e03ef78b78d0aba001f7179f 100644 --- a/liblava/base/base.hpp +++ b/liblava/base/base.hpp @@ -4,7 +4,7 @@ #pragma once -#include <liblava/utils.hpp> +#include <liblava/util.hpp> #include <liblava/core/math.hpp> #define VK_NO_PROTOTYPES diff --git a/liblava/frame/input.hpp b/liblava/frame/input.hpp index 77dc6fc08422ebaf2b8b6c530187c9935815f0b3..4192521b427e3115645055bf785fb2913339d3eb 100644 --- a/liblava/frame/input.hpp +++ b/liblava/frame/input.hpp @@ -4,7 +4,7 @@ #pragma once -#include <liblava/utils/utility.hpp> +#include <liblava/util/utility.hpp> #include <liblava/core/id.hpp> namespace lava { diff --git a/liblava/lava.hpp b/liblava/lava.hpp index cce446629fe64bab8569a9d3a4834b9143445930..0c9d7f2cc063dd59df9c7151ddeda616f318b726 100644 --- a/liblava/lava.hpp +++ b/liblava/lava.hpp @@ -5,7 +5,7 @@ #pragma once #include <liblava/core.hpp> -#include <liblava/utils.hpp> +#include <liblava/util.hpp> #include <liblava/base.hpp> #include <liblava/block.hpp> #include <liblava/resource.hpp> diff --git a/liblava/util.hpp b/liblava/util.hpp new file mode 100644 index 0000000000000000000000000000000000000000..5b4305c379467b706fc63b0091595b8b33529d3d --- /dev/null +++ b/liblava/util.hpp @@ -0,0 +1,12 @@ +// file : liblava/util.hpp +// copyright : Copyright (c) 2018-present, Lava Block OÜ +// license : MIT; see accompanying LICENSE file + +#pragma once + +#include <liblava/util/file.hpp> +#include <liblava/util/log.hpp> +#include <liblava/util/random.hpp> +#include <liblava/util/telegram.hpp> +#include <liblava/util/thread.hpp> +#include <liblava/util/utility.hpp> diff --git a/liblava/utils/file.cpp b/liblava/util/file.cpp similarity index 98% rename from liblava/utils/file.cpp rename to liblava/util/file.cpp index cca1b198704c19f6b6639524627ea50e51a42dde..f27ecd1bbd117f41cee7e9784be547011ef5101c 100644 --- a/liblava/utils/file.cpp +++ b/liblava/util/file.cpp @@ -1,9 +1,9 @@ -// file : liblava/utils/file.cpp +// file : liblava/util/file.cpp // copyright : Copyright (c) 2018-present, Lava Block OÜ // license : MIT; see accompanying LICENSE file -#include <liblava/utils/file.hpp> -#include <liblava/utils/utility.hpp> +#include <liblava/util/file.hpp> +#include <liblava/util/utility.hpp> #include <physfs.h> #include <tinyfiledialogs.h> diff --git a/liblava/utils/file.hpp b/liblava/util/file.hpp similarity index 98% rename from liblava/utils/file.hpp rename to liblava/util/file.hpp index 4d5c75fbf0b3817c582e7f2b6e05d1cefed64a6f..b7573b19165c8a33f6185ce4c77db4efef74c7bd 100644 --- a/liblava/utils/file.hpp +++ b/liblava/util/file.hpp @@ -1,11 +1,11 @@ -// file : liblava/file.hpp +// file : liblava/util/file.hpp // copyright : Copyright (c) 2018-present, Lava Block OÜ // license : MIT; see accompanying LICENSE file #pragma once #include <liblava/core/data.hpp> -#include <liblava/utils/log.hpp> +#include <liblava/util/log.hpp> #include <fstream> #include <filesystem> diff --git a/liblava/utils/log.hpp b/liblava/util/log.hpp similarity index 98% rename from liblava/utils/log.hpp rename to liblava/util/log.hpp index 530a0375faeaef9bf69572f6930ecaeddd6df4c2..f163d7d908de2925f34f6cc0c3dc37e907fe5d93 100644 --- a/liblava/utils/log.hpp +++ b/liblava/util/log.hpp @@ -1,4 +1,4 @@ -// file : liblava/log.hpp +// file : liblava/util/log.hpp // copyright : Copyright (c) 2018-present, Lava Block OÜ // license : MIT; see accompanying LICENSE file diff --git a/liblava/utils/random.hpp b/liblava/util/random.hpp similarity index 96% rename from liblava/utils/random.hpp rename to liblava/util/random.hpp index 756cbd37fc73c70a4b94c4da2d8215224d8c5181..c9577196cdfe96f4acb28f298b742965f90a720d 100644 --- a/liblava/utils/random.hpp +++ b/liblava/util/random.hpp @@ -1,4 +1,4 @@ -// file : liblava/random.hpp +// file : liblava/util/random.hpp // copyright : Copyright (c) 2018-present, Lava Block OÜ // license : MIT; see accompanying LICENSE file diff --git a/liblava/utils/telegram.hpp b/liblava/util/telegram.hpp similarity index 96% rename from liblava/utils/telegram.hpp rename to liblava/util/telegram.hpp index 805ab1f7a5de345cd76950174f6ce7f80cd497ad..a93b2686eb1f2e77017bd0e8a01bad2affec0073 100644 --- a/liblava/utils/telegram.hpp +++ b/liblava/util/telegram.hpp @@ -1,10 +1,10 @@ -// file : liblava/telegram.hpp +// file : liblava/util/telegram.hpp // copyright : Copyright (c) 2018-present, Lava Block OÜ // license : MIT; see accompanying LICENSE file #pragma once -#include <liblava/utils/thread.hpp> +#include <liblava/util/thread.hpp> #include <any> #include <cmath> diff --git a/liblava/utils/thread.hpp b/liblava/util/thread.hpp similarity index 98% rename from liblava/utils/thread.hpp rename to liblava/util/thread.hpp index 225f14f417502d20afe9d28643bc270402275603..a63a58cbb621de30a60a8795a6872727cbec8512 100644 --- a/liblava/utils/thread.hpp +++ b/liblava/util/thread.hpp @@ -1,4 +1,4 @@ -// file : liblava/thread.hpp +// file : liblava/util/thread.hpp // copyright : Copyright (c) 2018-present, Lava Block OÜ // license : MIT; see accompanying LICENSE file diff --git a/liblava/utils/utility.hpp b/liblava/util/utility.hpp similarity index 96% rename from liblava/utils/utility.hpp rename to liblava/util/utility.hpp index fdd74709e69e0325c12426895f0d6d7f0083a63d..b6747f43719691241e8e804da9fcab0268a6c9bc 100644 --- a/liblava/utils/utility.hpp +++ b/liblava/util/utility.hpp @@ -1,4 +1,4 @@ -// file : liblava/utility.hpp +// file : liblava/util/utility.hpp // copyright : Copyright (c) 2018-present, Lava Block OÜ // license : MIT; see accompanying LICENSE file diff --git a/liblava/utils.hpp b/liblava/utils.hpp deleted file mode 100644 index 8c7cf6a85a1233c00f4d8ae04c6bac7d4231191a..0000000000000000000000000000000000000000 --- a/liblava/utils.hpp +++ /dev/null @@ -1,12 +0,0 @@ -// file : liblava/utils.hpp -// copyright : Copyright (c) 2018-present, Lava Block OÜ -// license : MIT; see accompanying LICENSE file - -#pragma once - -#include <liblava/utils/file.hpp> -#include <liblava/utils/log.hpp> -#include <liblava/utils/random.hpp> -#include <liblava/utils/telegram.hpp> -#include <liblava/utils/thread.hpp> -#include <liblava/utils/utility.hpp>