fixes build on r5 and haiku
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13503 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -6,10 +6,17 @@ UsePrivateHeaders media ;
|
|||||||
SubDirHdrs [ FDirName $(SUBDIR) libMatroskaParser ] ;
|
SubDirHdrs [ FDirName $(SUBDIR) libMatroskaParser ] ;
|
||||||
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ogg libogg ] ;
|
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ogg libogg ] ;
|
||||||
|
|
||||||
|
local r5_src = strlcpy.c ;
|
||||||
|
|
||||||
|
if $(HAIKU_COMPATIBLE) {
|
||||||
|
r5_src = ;
|
||||||
|
}
|
||||||
|
|
||||||
Addon matroska : media plugins :
|
Addon matroska : media plugins :
|
||||||
matroska_codecs.cpp
|
matroska_codecs.cpp
|
||||||
matroska_reader.cpp
|
matroska_reader.cpp
|
||||||
matroska_util.cpp
|
matroska_util.cpp
|
||||||
|
$(r5_src)
|
||||||
:
|
:
|
||||||
false
|
false
|
||||||
:
|
:
|
||||||
@@ -17,9 +24,18 @@ Addon matroska : media plugins :
|
|||||||
# libmatroska.a
|
# libmatroska.a
|
||||||
libMatroskaParser.a
|
libMatroskaParser.a
|
||||||
libz.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 libebml ;
|
||||||
# SubInclude OBOS_TOP src add-ons media plugins matroska libmatroska ;
|
# SubInclude OBOS_TOP src add-ons media plugins matroska libmatroska ;
|
||||||
|
|||||||
Reference in New Issue
Block a user