From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Fri, 29 Oct 2021 18:38:01 +0000 (+0000)
Subject: Port to FreeBSD
X-Git-Tag: 0.2~7^2~4
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=78513bc95ac40ba104178bb96198adaea54447f3;p=dragonblocks_alpha.git

Port to FreeBSD
---

diff --git a/.gitmodules b/.gitmodules
index 9722994..bb962ba 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -12,7 +12,7 @@
 	url = https://github.com/dragonblocks/dragontype
 [submodule "deps/endian.h"]
 	path = deps/endian.h
-	url = https://github.com/mikepb/endian.h
+	url = https://github.com/dragonblocks/endian.h
 [submodule "deps/dragonport"]
 	path = deps/dragonport
 	url = https://github.com/dragonblocks/dragonport
diff --git a/deps/endian.h b/deps/endian.h
index 0f885cb..6c7eccf 160000
--- a/deps/endian.h
+++ b/deps/endian.h
@@ -1 +1 @@
-Subproject commit 0f885cbba627efe9b8f763e1c2872e904fe0c0b1
+Subproject commit 6c7eccf05405eacbb76281550cd69895089f9773
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 012b7a2..8098a78 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,6 +29,11 @@ include_directories(BEFORE
 	${CMAKE_SOURCE_DIR}
 )
 
+if ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
+	link_directories("/usr/local/lib")
+	include_directories("/usr/local/include")
+endif()
+
 add_compile_options(-Wall -Wextra -Wpedantic -Werror)
 
 set(SOURCES_COMMON
diff --git a/src/server/server_map.c b/src/server/server_map.c
index 83b81f7..4c40931 100644
--- a/src/server/server_map.c
+++ b/src/server/server_map.c
@@ -369,7 +369,7 @@ void server_map_prepare_spawn()
 	} else {
 		s32 spawn_height = -1;
 
-		while (map_get_node(server_map.map, (v3s32) {0, ++spawn_height, 0}).type != NODE_AIR);
+		while (map_get_node(server_map.map, (v3s32) {0, ++spawn_height, 0}).type != NODE_AIR)
 			;
 
 		server_map.spawn_height = spawn_height + 5;
diff --git a/src/util.c b/src/util.c
index c1c1c2d..7bdd1de 100644
--- a/src/util.c
+++ b/src/util.c
@@ -105,7 +105,7 @@ bool my_decompress(const char *compressed, size_t compressed_size, void *decompr
 bool within_simulation_distance(v3f64 player_pos, v3s32 block_pos, u32 simulation_distance)
 {
 	v3s32 player_block_pos = map_node_to_block_pos((v3s32) {player_pos.x, player_pos.y, player_pos.z}, NULL);
-	return abs(player_block_pos.x - block_pos.x) <= simulation_distance && abs(player_block_pos.y - block_pos.y) <= simulation_distance && abs(player_block_pos.z - block_pos.z) <= simulation_distance;
+	return abs(player_block_pos.x - block_pos.x) <= (s32) simulation_distance && abs(player_block_pos.y - block_pos.y) <= (s32) simulation_distance && abs(player_block_pos.z - block_pos.z) <= (s32) simulation_distance;
 }
 
 f64 clamp(f64 v, f64 min, f64 max)
diff --git a/src/util.h b/src/util.h
index ddcec81..b7d49d8 100644
--- a/src/util.h
+++ b/src/util.h
@@ -6,7 +6,10 @@
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #else
+#include <sys/types.h>
+#include <sys/socket.h>
 #include <arpa/inet.h>
+#include <netinet/in.h>
 #endif
 #include <dragontype/number.h>