r21780 by jghali - #14622: Fix 1.5.x build on Haiku

scribus-commit scribus-commit at lists.scribus.net
Mon Feb 13 21:56:26 UTC 2017


Author: jghali
Date: Mon Feb 13 21:56:26 2017
New Revision: 21780

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21780
Log:
#14622: Fix 1.5.x build on Haiku

Modified:
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/third_party/pgf/PGFplatform.h

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21780&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/CMakeLists.txt	Mon Feb 13 21:56:26 2017
@@ -1270,6 +1270,10 @@
 	target_link_libraries(${EXE_NAME} util execinfo)
 endif()
 
+if(HAIKU)
+	target_link_libraries(${EXE_NAME} execinfo)
+endif(HAIKU)
+
 if(WIN32)
 	target_link_libraries(${EXE_NAME} ${QT_QTMAIN_LIBRARY})
 endif()

Modified: trunk/Scribus/scribus/third_party/pgf/PGFplatform.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21780&path=/trunk/Scribus/scribus/third_party/pgf/PGFplatform.h
==============================================================================
--- trunk/Scribus/scribus/third_party/pgf/PGFplatform.h	(original)
+++ trunk/Scribus/scribus/third_party/pgf/PGFplatform.h	Mon Feb 13 21:56:26 2017
@@ -340,9 +340,9 @@
 
 
 //-------------------------------------------------------------------------------
-// *BSD
-//-------------------------------------------------------------------------------
-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+// *BSD and Haiku
+//-------------------------------------------------------------------------------
+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__HAIKU__)
 #ifndef __POSIX__ 
 #define __POSIX__ 
 #endif 
@@ -355,7 +355,7 @@
 #define lseek64 lseek 
 #endif 
 
-#endif // __NetBSD__ or __OpenBSD__ or __FreeBSD__
+#endif // __NetBSD__ or __OpenBSD__ or __FreeBSD__ or __HAIKU__
 
 
 //-------------------------------------------------------------------------------




More information about the scribus-commit mailing list