diff options
| author | Mehmet Samet Duman <yongdohyun@projecttick.org> | 2026-04-02 21:24:01 +0300 |
|---|---|---|
| committer | Mehmet Samet Duman <yongdohyun@projecttick.org> | 2026-04-02 21:24:01 +0300 |
| commit | 070054ff55e3bf43559af6f342c306837197894a (patch) | |
| tree | 7f2424f8b20f1bdcbf9c34dfca4b1d7a5c64777b | |
| parent | 4aba669b66d9132d523207c18f94171fa580c5c7 (diff) | |
| download | Project-Tick-070054ff55e3bf43559af6f342c306837197894a.tar.gz Project-Tick-070054ff55e3bf43559af6f342c306837197894a.zip | |
NOISSUE Remove libnbtplusplus submodule and update references in CMake and Nix files
Signed-off-by: Mehmet Samet Duman <yongdohyun@projecttick.org>
| -rw-r--r-- | meshmc/.gitmodules | 4 | ||||
| -rw-r--r-- | meshmc/CMakeLists.txt | 2 | ||||
| m--------- | meshmc/libraries/libnbtplusplus | 15 | ||||
| -rw-r--r-- | meshmc/nix/unwrapped.nix | 4 |
4 files changed, 3 insertions, 22 deletions
diff --git a/meshmc/.gitmodules b/meshmc/.gitmodules deleted file mode 100644 index 468c1f4f84..0000000000 --- a/meshmc/.gitmodules +++ /dev/null @@ -1,4 +0,0 @@ -[submodule "depends/libnbtplusplus"] - path = libraries/libnbtplusplus - url = https://github.com/Project-Tick/libnbtplusplus.git - pushurl = git@github.com:Project-Tick/libnbtplusplus.git diff --git a/meshmc/CMakeLists.txt b/meshmc/CMakeLists.txt index 01f653b885..691706ed71 100644 --- a/meshmc/CMakeLists.txt +++ b/meshmc/CMakeLists.txt @@ -403,7 +403,7 @@ option(NBT_USE_ZLIB "Build NBT library with zlib support" OFF) option(NBT_BUILD_TESTS "Build NBT library tests" OFF) #FIXME: fix unit tests. set(NBT_NAME MeshMC_nbt++) set(NBT_DEST_DIR ${LIBRARY_DEST_DIR}) -add_subdirectory(libraries/libnbtplusplus) +add_subdirectory(${CMAKE_SOURCE_DIR}/../libnbtplusplus libnbtplusplus) add_subdirectory(libraries/ganalytics) # google analytics library add_subdirectory(libraries/systeminfo) # system information library diff --git a/meshmc/libraries/libnbtplusplus b/meshmc/libraries/libnbtplusplus deleted file mode 160000 -Subproject 1a0ffe372f4da8408c5d08a36013536a3396b9e diff --git a/meshmc/nix/unwrapped.nix b/meshmc/nix/unwrapped.nix index aa2baf2beb..71599a9c63 100644 --- a/meshmc/nix/unwrapped.nix +++ b/meshmc/nix/unwrapped.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { version = "7.0-unstable-${date}"; src = lib.fileset.toSource { - root = ../.; + root = ../../.; fileset = lib.fileset.unions [ ../bootstrap.sh ../branding @@ -61,10 +61,10 @@ stdenv.mkDerivation { ../.envrc ../flake.nix ../.gitattributes - ../.gitmodules ../launcher ../lefthook.yml ../libraries + ../../libnbtplusplus ../LICENSES ../.markdownlintignore ../.markdownlint.yaml |