mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-19 01:46:00 +01:00
85 lines
2.7 KiB
Plaintext
85 lines
2.7 KiB
Plaintext
From dde093a597490042e2a7148c180409114d37d5e6 Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Fri, 13 May 2022 14:53:30 +1000
|
|
Subject: Fixes for Haiku
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index a23a601..986a2e7 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -333,7 +333,7 @@ if(WITH_CORE)
|
|
#############################################################
|
|
# search for dependencies
|
|
|
|
- if(NOT WIN32 AND NOT ANDROID)
|
|
+ if(NOT WIN32 AND NOT ANDROID AND NOT HAIKU)
|
|
include(CheckFunctionExists)
|
|
CHECK_FUNCTION_EXISTS(openpty OPENPTY_IN_LIBC)
|
|
if(NOT OPENPTY_IN_LIBC)
|
|
diff --git a/external/laz-perf/portable_endian.hpp b/external/laz-perf/portable_endian.hpp
|
|
index af2598a..deca17a 100644
|
|
--- a/external/laz-perf/portable_endian.hpp
|
|
+++ b/external/laz-perf/portable_endian.hpp
|
|
@@ -12,7 +12,7 @@
|
|
|
|
// use standard posix style headers for apple emscripten builds as well since emscripten sdk now ships its own
|
|
// libc headers
|
|
-#if defined(__linux__) || defined(__CYGWIN__) || defined(__EMSCRIPTEN__)
|
|
+#if defined(__linux__) || defined(__HAIKU__) || defined(__CYGWIN__) || defined(__EMSCRIPTEN__)
|
|
|
|
# include <endian.h>
|
|
|
|
@@ -43,7 +43,7 @@
|
|
# define __PDP_ENDIAN PDP_ENDIAN
|
|
**/
|
|
|
|
-#elif defined(__OpenBSD__)|| defined(__FreeBSD__)
|
|
+#elif defined(__OpenBSD__)|| defined(__FreeBSD__)
|
|
|
|
# include <sys/endian.h>
|
|
|
|
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
|
|
index 0571d10..00193e5 100644
|
|
--- a/src/app/CMakeLists.txt
|
|
+++ b/src/app/CMakeLists.txt
|
|
@@ -622,6 +622,10 @@ if (WITH_PDAL)
|
|
target_link_libraries(qgis_app ${PDAL_LIBRARIES})
|
|
endif()
|
|
|
|
+if (HAIKU)
|
|
+ target_link_libraries(qgis_app network)
|
|
+endif()
|
|
+
|
|
if(MSVC)
|
|
install(FILES qgis.ico qgis-mime.ico qgis-qgs.ico qgis-qlr.ico qgis-qml.ico qgis-qpt.ico DESTINATION ${CMAKE_INSTALL_PREFIX}/icons)
|
|
endif()
|
|
diff --git a/src/app/main.cpp b/src/app/main.cpp
|
|
index 1faeae8..5cfb75a 100644
|
|
--- a/src/app/main.cpp
|
|
+++ b/src/app/main.cpp
|
|
@@ -887,7 +887,7 @@ int main( int argc, char *argv[] )
|
|
// Initialize the application and the translation stuff
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(ANDROID)
|
|
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(ANDROID) && !defined(Q_OS_HAIKU)
|
|
bool myUseGuiFlag = nullptr != getenv( "DISPLAY" );
|
|
#else
|
|
bool myUseGuiFlag = true;
|
|
diff --git a/src/process/CMakeLists.txt b/src/process/CMakeLists.txt
|
|
index c4691d8..cccccb2 100644
|
|
--- a/src/process/CMakeLists.txt
|
|
+++ b/src/process/CMakeLists.txt
|
|
@@ -45,6 +45,7 @@ target_link_libraries(qgis_process
|
|
${PROJ_LIBRARY}
|
|
${GEOS_LIBRARY}
|
|
${GDAL_LIBRARY}
|
|
+ network
|
|
)
|
|
|
|
if (WITH_3D)
|
|
--
|
|
2.30.2
|
|
|