From b6dbc7fc28a4d41a0b91e3edfe1bb8dcfe2d37ca Mon Sep 17 00:00:00 2001 From: Dave Corley Date: Tue, 3 Oct 2023 14:36:07 -0500 Subject: [PATCH] Feat(git): Add raknet as a submodule --- .gitmodules | 3 +++ CMakeLists.txt | 5 ++--- extern/raknet | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) create mode 160000 extern/raknet diff --git a/.gitmodules b/.gitmodules index 9ad6c4012..f8c417df3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "extern/breakpad"] path = extern/breakpad url = https://chromium.googlesource.com/breakpad/breakpad +[submodule "extern/raknet"] + path = extern/raknet + url = https://github.com/DreamWeave-MP/CrabNet.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ebc94937..9e8aefb6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -512,12 +512,11 @@ endif (APPLE) # Other files -configure_resource_file(${OpenMW_SOURCE_DIR}/files/dreamweave/dreamweave-client-default.cfg +configure_resource_file(${OpenMW_SOURCE_DIR}/files/tes3mp/tes3mp-client-default.cfg "${OpenMW_BINARY_DIR}/build" "tes3mp-client-default.cfg") -configure_resource_file(${OpenMW_SOURCE_DIR}/files/dreamweave/dreamweave-server-default.cfg +configure_resource_file(${OpenMW_SOURCE_DIR}/files/tes3mp/tes3mp-server-default.cfg "${OpenMW_BINARY_DIR}/build" "tes3mp-server-default.cfg") ->>>>>>> Stashed changes pack_resource_file(${OpenMW_SOURCE_DIR}/files/settings-default.cfg "${OpenMW_BINARY_DIR}/build" "defaults.bin") diff --git a/extern/raknet b/extern/raknet new file mode 160000 index 000000000..af1a20b48 --- /dev/null +++ b/extern/raknet @@ -0,0 +1 @@ +Subproject commit af1a20b48e50ef2d19f0699133140bb15847b370