fix build with gcc4 because of libstdc++
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18901 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -8,17 +8,10 @@ UsePrivateHeaders media ;
|
|||||||
SubDirHdrs [ FDirName $(SUBDIR) libMatroskaParser ] ;
|
SubDirHdrs [ FDirName $(SUBDIR) libMatroskaParser ] ;
|
||||||
SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) ogg libogg ] ;
|
SubDirSysHdrs [ 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
|
||||||
:
|
:
|
||||||
@@ -26,19 +19,9 @@ Addon matroska : media plugins :
|
|||||||
# libmatroska.a
|
# libmatroska.a
|
||||||
libMatroskaParser.a
|
libMatroskaParser.a
|
||||||
libz.a
|
libz.a
|
||||||
libmedia.so
|
libmedia.so be $(TARGET_LIBSTDC++)
|
||||||
;
|
;
|
||||||
|
|
||||||
if $(HAIKU_COMPATIBLE) {
|
|
||||||
LinkAgainst matroska : libbe.so libroot.so ;
|
|
||||||
} else {
|
|
||||||
LinkAgainst matroska : be ;
|
|
||||||
}
|
|
||||||
|
|
||||||
SEARCH on [ FGristFiles
|
|
||||||
strlcpy.c
|
|
||||||
] = [ FDirName $(HAIKU_TOP) src system libroot posix string ] ;
|
|
||||||
|
|
||||||
# SubInclude HAIKU_TOP src add-ons media plugins matroska libebml ;
|
# SubInclude HAIKU_TOP src add-ons media plugins matroska libebml ;
|
||||||
# SubInclude HAIKU_TOP src add-ons media plugins matroska libmatroska ;
|
# SubInclude HAIKU_TOP src add-ons media plugins matroska libmatroska ;
|
||||||
SubInclude HAIKU_TOP src add-ons media plugins matroska libMatroskaParser ;
|
SubInclude HAIKU_TOP src add-ons media plugins matroska libMatroskaParser ;
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ Application MediaPlayer :
|
|||||||
VideoNode.cpp
|
VideoNode.cpp
|
||||||
VideoView.cpp
|
VideoView.cpp
|
||||||
VolumeSlider.cpp
|
VolumeSlider.cpp
|
||||||
: be media tracker
|
: be media tracker $(TARGET_LIBSTDC++)
|
||||||
: MediaPlayer.rdef
|
: MediaPlayer.rdef
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ Application SoundRecorder :
|
|||||||
UpDownButton.cpp
|
UpDownButton.cpp
|
||||||
VUView.cpp
|
VUView.cpp
|
||||||
VolumeSlider.cpp
|
VolumeSlider.cpp
|
||||||
: be media tracker
|
: be media tracker $(TARGET_LIBSTDC++)
|
||||||
: SoundRecorder.rdef
|
: SoundRecorder.rdef
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user