From fa65b351ea72224c95ace22a5e6ef95a38f012ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Wed, 6 Jul 2005 17:33:12 +0000 Subject: [PATCH] fixes build on r5 and haiku git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13503 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/media/plugins/matroska/Jamfile | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/add-ons/media/plugins/matroska/Jamfile b/src/add-ons/media/plugins/matroska/Jamfile index fd2bcef034..e98fe78bbd 100644 --- a/src/add-ons/media/plugins/matroska/Jamfile +++ b/src/add-ons/media/plugins/matroska/Jamfile @@ -6,10 +6,17 @@ UsePrivateHeaders media ; SubDirHdrs [ FDirName $(SUBDIR) libMatroskaParser ] ; SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ogg libogg ] ; +local r5_src = strlcpy.c ; + +if $(HAIKU_COMPATIBLE) { + r5_src = ; +} + Addon matroska : media plugins : matroska_codecs.cpp matroska_reader.cpp matroska_util.cpp + $(r5_src) : false : @@ -17,9 +24,18 @@ Addon matroska : media plugins : # libmatroska.a libMatroskaParser.a libz.a + libmedia.so ; -LinkSharedOSLibs matroska : be libmedia.so ; +if $(HAIKU_COMPATIBLE) { + LinkSharedOSLibs matroska : libbe.so libroot.so ; +} else { + LinkSharedOSLibs matroska : be ; +} + +SEARCH on [ FGristFiles + strlcpy.c + ] = [ FDirName $(OBOS_TOP) src system libroot posix string ] ; # SubInclude OBOS_TOP src add-ons media plugins matroska libebml ; # SubInclude OBOS_TOP src add-ons media plugins matroska libmatroska ;