Initial Haiku support (#6568)

miqlas · nerzhul · commit a95e0d18762c · 2017-10-30T08:17:43.000+01:00
* Iitial Haiku support
diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake
@@ -42,12 +42,14 @@ else()
 		PATHS
 		/usr/local/include/irrlicht
 		/usr/include/irrlicht
+		/system/develop/headers/irrlicht #Haiku
 	)
 
 	find_library(IRRLICHT_LIBRARY NAMES libIrrlicht.so libIrrlicht.a Irrlicht
 		PATHS
 		/usr/local/lib
 		/usr/lib
+		/system/develop/lib # Haiku
 	)
 endif()
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -252,6 +252,12 @@ if(NOT MSVC)
 	set(USE_GPROF FALSE CACHE BOOL "Use -pg flag for g++")
 endif()
 
+# Haiku endian support
+if(HAIKU)
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_BSD_SOURCE")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_BSD_SOURCE")
+endif()
+
 # Use cmake_config.h
 add_definitions(-DUSE_CMAKE_CONFIG_H)
 
@@ -300,7 +306,9 @@ if(WIN32)
 else()
 	# Unix probably
 	if(BUILD_CLIENT)
-		find_package(X11 REQUIRED)
+		if(NOT HAIKU)
+			find_package(X11 REQUIRED)
+		endif(NOT HAIKU)
 		find_package(OpenGL REQUIRED)
 		find_package(JPEG REQUIRED)
 		find_package(BZip2 REQUIRED)
@@ -328,10 +336,12 @@ else()
 		endif(HAVE_LIBRT)
 	endif(APPLE)
 
+	if(NOT HAIKU)
 	# This way Xxf86vm is found on OpenBSD too
-	find_library(XXF86VM_LIBRARY Xxf86vm)
-	mark_as_advanced(XXF86VM_LIBRARY)
-	set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY})
+		find_library(XXF86VM_LIBRARY Xxf86vm)
+		mark_as_advanced(XXF86VM_LIBRARY)
+		set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY})
+	endif(NOT HAIKU)
 
 	# Prefer local iconv if installed
 	find_library(ICONV_LIBRARY iconv)
diff --git a/src/client/renderingengine.cpp b/src/client/renderingengine.cpp
@@ -34,7 +34,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "inputhandler.h"
 #include "gettext.h"
 
-#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__) && !defined(SERVER)
+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__) && \
+		!defined(SERVER) && !defined(__HAIKU__)
 #define XORG_USED
 #endif
 #ifdef XORG_USED
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
@@ -17,3 +17,7 @@ if (BUILD_CLIENT)
 	)
 endif()
 
+# Haiku networking support
+if(HAIKU)
+	set(PLATFORM_LIBS -lnetwork ${PLATFORM_LIBS})
+endif()
diff --git a/util/travis/clang-format-whitelist.txt b/util/travis/clang-format-whitelist.txt
@@ -16,6 +16,7 @@ src/clientiface.cpp
 src/clientiface.h
 src/client/joystick_controller.cpp
 src/client/joystick_controller.h
+src/client/renderingengine.cpp
 src/clientmap.cpp
 src/clientmap.h
 src/clientmedia.cpp

Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,14 @@ else()`
`42`	`42`	`PATHS`
`43`	`43`	`/usr/local/include/irrlicht`
`44`	`44`	`/usr/include/irrlicht`
	`45`	`+ /system/develop/headers/irrlicht #Haiku`
`45`	`46`	`)`
`46`	`47`
`47`	`48`	`find_library(IRRLICHT_LIBRARY NAMES libIrrlicht.so libIrrlicht.a Irrlicht`
`48`	`49`	`PATHS`
`49`	`50`	`/usr/local/lib`
`50`	`51`	`/usr/lib`
	`52`	`+ /system/develop/lib # Haiku`
`51`	`53`	`)`
`52`	`54`	`endif()`
`53`	`55`
Original file line number	Diff line number	Diff line change
`@@ -17,3 +17,7 @@ if (BUILD_CLIENT)`
`17`	`17`	`)`
`18`	`18`	`endif()`
`19`	`19`
	`20`	`+# Haiku networking support`
	`21`	`+if(HAIKU)`
	`22`	`+ set(PLATFORM_LIBS -lnetwork ${PLATFORM_LIBS})`
	`23`	`+endif()`