wip

proller · Aug 19, 2024 · 0a95945 · 0a95945
1 parent c7e68bf
commit 0a95945
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/build_tools/build.sh b/build_tools/build.sh
@@ -16,7 +16,7 @@ DIST=${DIST=`cat /etc/issue /etc/issue.net | head -n1 | cut -d " " -f1`}
 if [ -z "$NO_DEPS" ]; then
   if [ "$DIST" = "Debian" ] || [ "$DIST" = "Ubuntu" ]; then
     sudo apt install -y git subversion build-essential cmake ninja-build ccache libbz2-dev libzstd-dev  libjpeg-dev libfreetype6-dev libxxf86vm-dev libxi-dev libsqlite3-dev libhiredis-dev libvorbis-dev libopenal-dev libcurl4-openssl-dev libssl-dev libluajit-5.1-dev libgettextpo0 libmsgpack-dev libboost-system-dev  clang lld llvm libc++-dev libc++abi-dev
-    for PACKAGE in libpng12-dev libpng-dev libgles1-mesa-dev libgles2-mesa-dev libgl1-mesa-dev libunwind-dev ; do
+    for PACKAGE in libpng12-dev libpng-dev libgles1-mesa-dev libgles2-mesa-dev libgl1-mesa-dev ; do
         sudo apt install -y $PACKAGE ||:
     done
   elif [ -e /etc/arch-release ]; then

diff --git a/src/fm_map.cpp b/src/fm_map.cpp
@@ -427,7 +427,11 @@ u32 Map::timerUpdate(float uptime, float unload_timeout, s32 max_loaded_blocks,
 			}
 			*/
 
-			if (!block->isGenerated() && !block->getLodMesh(0, true)) {
+			if (!block->isGenerated())
+#if BUILD_CLIENT
+			if (!block->getLodMesh(0, true))
+#endif
+			{
 				blocks_delete.emplace_back(block);
 				continue;
 			}

diff --git a/src/map.h b/src/map.h
@@ -287,7 +287,7 @@ class Map : public NodeContainer
 	virtual s16 getHumidity(const v3pos_t &p, bool no_random = 0);
 
 	// from old mapsector:
-	typedef concurrent_shared_unordered_map<v3bpos_t, MapBlockP, v3posHash, v3posEqual>
+	typedef concurrent_unordered_map<v3bpos_t, MapBlockP, v3posHash, v3posEqual>
 			m_blocks_type;
 	m_blocks_type m_blocks;
 	typedef concurrent_shared_unordered_map<v3bpos_t, std::shared_ptr<MapBlock>, v3posHash,

diff --git a/util/autotest/auto.pl b/util/autotest/auto.pl
@@ -565,6 +565,7 @@ ()
         {'---cmake_debug' => 1,}
     ],
     build_client => ['set_client',   'build',],
+    build_server => ['set_server',   'build',],
     bot          => ['build_client', 'run_bot'],
     clang        => {
         '---cmake_clang'  => 1,
@@ -673,7 +674,7 @@ ()
         0;
     },
 
-    server => [{-options_add => 'no_exit'}, 'set_server', 'build', 'run_server'],
+    server => [{-options_add => 'no_exit'}, 'build_server', 'run_server'],
 
     vtune => sub {
         sy 'echo 0|sudo tee /proc/sys/kernel/yama/ptrace_scope';