From 5abaa7ebb1d09e12d10db20cde5d47edac2cfb2a Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Thu, 3 Aug 2006 17:50:19 +0000
Subject: [PATCH] We do now include HaikuBuildCompatibility.h and link against
 libhaikucompat.a automatically for all BeOS compatible target platforms but
 Haiku. This should allow more Haiku code to build for BeOS.

Disclaimer: I couldn't really test it, since my BeOS working tree is switched
to my layout branch and under Linux I obviously can't test building for BeOS.
So, if you have complaints, keep them to yourself and just fix the problem.
;-)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18372 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build/jam/BuildSetup | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index bb554d156f..92d9538f8a 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -587,21 +587,29 @@ switch $(HOST_PLATFORM) {
 
 #pragma mark -
 
+# In case we build for a BeOS compatible platform, but not for Haiku, we
+# include the HaikuBuildCompatibility.h header and link against
+# libhaikucompat.a.
+
+if $(TARGET_PLATFORM) != haiku &&  $(TARGET_PLATFORM_BEOS_COMPATIBLE) {
+	# headers and flags
+	local compatibilityHeader = -include [ FDirName $(HAIKU_TOP) headers build
+		HaikuBuildCompatibility.h ] ;
+	TARGET_CCFLAGS += $(compatibilityHeader) ;
+	TARGET_C++FLAGS += $(compatibilityHeader) ;
+
+	# compatibility library
+	TARGET_HAIKU_COMPATIBILITY_LIBS = libhaikucompat.a ;
+}
+
 # special target libbe_test
 
 if $(TARGET_PLATFORM) = libbe_test {
 	# headers and flags
 	TARGET_HDRS += [ PublicHeaders app game interface storage support ]
 		[ PrivateHeaders $(DOT) ] ;
-	local compatibilityHeader = -include [ FDirName $(HAIKU_TOP) headers build
-		HaikuBuildCompatibility.h ] ;
-	TARGET_CCFLAGS += $(compatibilityHeader) ;
-	TARGET_C++FLAGS += $(compatibilityHeader) ;
 	TARGET_DEFINES += __HAIKU__ ;
 
-	# compatibility library
-	TARGET_HAIKU_COMPATIBILITY_LIBS = libhaikucompat.a ;
-
 	# directories
 	TARGET_OBJECT_BASE_DIR
 		= [ FDirName $(HAIKU_OBJECT_DIR) $(TARGET_PLATFORM) ] ;