Merged changes from branch build_system_redesign at revision 14573.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14574 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
@@ -1,4 +1,4 @@
|
||||
SubDir OBOS_TOP src add-ons media ;
|
||||
SubDir HAIKU_TOP src add-ons media ;
|
||||
|
||||
SubInclude OBOS_TOP src add-ons media media-add-ons ;
|
||||
SubInclude OBOS_TOP src add-ons media plugins ;
|
||||
SubInclude HAIKU_TOP src add-ons media media-add-ons ;
|
||||
SubInclude HAIKU_TOP src add-ons media plugins ;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
SubDir OBOS_TOP src add-ons media media-add-ons ;
|
||||
SubDir HAIKU_TOP src add-ons media media-add-ons ;
|
||||
|
||||
# SubInclude OBOS_TOP src add-ons media media-add-ons demultiplexer ;
|
||||
# SubInclude OBOS_TOP src add-ons media media-add-ons reader ;
|
||||
# SubInclude OBOS_TOP src add-ons media media-add-ons writer ;
|
||||
SubInclude OBOS_TOP src add-ons media media-add-ons legacy ;
|
||||
SubInclude OBOS_TOP src add-ons media media-add-ons mixer ;
|
||||
SubInclude OBOS_TOP src add-ons media media-add-ons multi_audio ;
|
||||
SubInclude OBOS_TOP src add-ons media media-add-ons radeon ;
|
||||
SubInclude OBOS_TOP src add-ons media media-add-ons tone_producer_demo ;
|
||||
SubInclude OBOS_TOP src add-ons media media-add-ons video_producer_demo ;
|
||||
# SubInclude HAIKU_TOP src add-ons media media-add-ons demultiplexer ;
|
||||
# SubInclude HAIKU_TOP src add-ons media media-add-ons reader ;
|
||||
# SubInclude HAIKU_TOP src add-ons media media-add-ons writer ;
|
||||
SubInclude HAIKU_TOP src add-ons media media-add-ons legacy ;
|
||||
SubInclude HAIKU_TOP src add-ons media media-add-ons mixer ;
|
||||
SubInclude HAIKU_TOP src add-ons media media-add-ons multi_audio ;
|
||||
SubInclude HAIKU_TOP src add-ons media media-add-ons radeon ;
|
||||
SubInclude HAIKU_TOP src add-ons media media-add-ons tone_producer_demo ;
|
||||
SubInclude HAIKU_TOP src add-ons media media-add-ons video_producer_demo ;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
SubDir OBOS_TOP src add-ons media media-add-ons demultiplexer ;
|
||||
SubDir HAIKU_TOP src add-ons media media-add-ons demultiplexer ;
|
||||
|
||||
UsePrivateHeaders demultiplexer ;
|
||||
|
||||
@@ -8,6 +8,5 @@ Addon demultiplexer.media_addon : media :
|
||||
MediaOutputInfo.cpp
|
||||
misc.cpp
|
||||
: true
|
||||
: be media
|
||||
;
|
||||
|
||||
LinkSharedOSLibs demultiplexer.media_addon : be media ;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
SubDir OBOS_TOP src add-ons media media-add-ons legacy ;
|
||||
SubDir HAIKU_TOP src add-ons media media-add-ons legacy ;
|
||||
|
||||
UsePrivateHeaders media ;
|
||||
|
||||
@@ -7,6 +7,6 @@ Addon legacy.media_addon : media :
|
||||
LegacyAudioDevice.cpp
|
||||
LegacyAudioProducer.cpp
|
||||
LegacyMediaAddOn.cpp
|
||||
: false
|
||||
: media
|
||||
;
|
||||
|
||||
LinkSharedOSLibs legacy.media_addon : media ;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
SubDir OBOS_TOP src add-ons media media-add-ons mixer ;
|
||||
SubDir HAIKU_TOP src add-ons media media-add-ons mixer ;
|
||||
|
||||
UsePrivateHeaders media ;
|
||||
|
||||
@@ -12,6 +12,6 @@ Addon mixer.media_addon : media :
|
||||
MixerSettings.cpp
|
||||
MixerUtils.cpp
|
||||
Resampler.cpp
|
||||
: false
|
||||
: be media
|
||||
;
|
||||
|
||||
LinkSharedOSLibs mixer.media_addon : be media ;
|
||||
|
||||
@@ -1,13 +1,15 @@
|
||||
SubDir OBOS_TOP src add-ons media media-add-ons multi_audio ;
|
||||
SubDir HAIKU_TOP src add-ons media media-add-ons multi_audio ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
Addon multi_audio.media_addon : media :
|
||||
MultiAudioAddOn.cpp
|
||||
MultiAudioDevice.cpp
|
||||
MultiAudioNode.cpp
|
||||
: false
|
||||
: be media
|
||||
;
|
||||
|
||||
LinkSharedOSLibs multi_audio.media_addon : be media ;
|
||||
|
||||
Package haiku-multi_audio-cvs
|
||||
: multi_audio.media_addon
|
||||
: boot home config add-ons media ;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
SubDir OBOS_TOP src add-ons media media-add-ons radeon ;
|
||||
SubDir HAIKU_TOP src add-ons media media-add-ons radeon ;
|
||||
|
||||
UsePrivateHeaders graphics ;
|
||||
UsePrivateHeaders [ FDirName graphics common ] ;
|
||||
@@ -18,4 +18,4 @@ Addon radeon.media_addon : media :
|
||||
VideoIn.cpp
|
||||
;
|
||||
|
||||
LinkSharedOSLibs radeon.media_addon : be media ;
|
||||
LinkAgainst radeon.media_addon : be media ;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
SubDir OBOS_TOP src add-ons media media-add-ons reader ;
|
||||
SubDir HAIKU_TOP src add-ons media media-add-ons reader ;
|
||||
|
||||
UsePrivateHeaders media ;
|
||||
|
||||
@@ -11,4 +11,4 @@ Addon reader.media_addon : media :
|
||||
: true
|
||||
;
|
||||
|
||||
LinkSharedOSLibs reader.media_addon : be media ;
|
||||
LinkAgainst reader.media_addon : be media ;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
SubDir OBOS_TOP src add-ons media media-add-ons tone_producer_demo ;
|
||||
SubDir HAIKU_TOP src add-ons media media-add-ons tone_producer_demo ;
|
||||
|
||||
Addon tone_producer_demo.media_addon : media :
|
||||
ToneProducerAddOn.cpp
|
||||
ToneProducer.cpp
|
||||
;
|
||||
|
||||
LinkSharedOSLibs tone_producer_demo.media_addon : be media ;
|
||||
LinkAgainst tone_producer_demo.media_addon : be media ;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
SubDir OBOS_TOP src add-ons media media-add-ons video_producer_demo ;
|
||||
SubDir HAIKU_TOP src add-ons media media-add-ons video_producer_demo ;
|
||||
|
||||
Addon video_producer_demo.media_addon : media :
|
||||
AddOn.cpp
|
||||
Producer.cpp
|
||||
;
|
||||
|
||||
LinkSharedOSLibs video_producer_demo.media_addon : be media ;
|
||||
LinkAgainst video_producer_demo.media_addon : be media ;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
SubDir OBOS_TOP src add-ons media media-add-ons writer ;
|
||||
SubDir HAIKU_TOP src add-ons media media-add-ons writer ;
|
||||
|
||||
UsePrivateHeaders media ;
|
||||
|
||||
@@ -11,4 +11,4 @@ Addon writer.media_addon : media :
|
||||
: true
|
||||
;
|
||||
|
||||
LinkSharedOSLibs writer.media_addon : be media ;
|
||||
LinkAgainst writer.media_addon : be media ;
|
||||
|
||||
@@ -1,26 +1,26 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins ;
|
||||
|
||||
SubInclude OBOS_TOP src add-ons media plugins aiff_reader ;
|
||||
SubInclude OBOS_TOP src add-ons media plugins au_reader ;
|
||||
SubInclude OBOS_TOP src add-ons media plugins avi_reader ;
|
||||
SubInclude OBOS_TOP src add-ons media plugins mp3_reader ;
|
||||
SubInclude OBOS_TOP src add-ons media plugins wav_reader ;
|
||||
SubInclude HAIKU_TOP src add-ons media plugins aiff_reader ;
|
||||
SubInclude HAIKU_TOP src add-ons media plugins au_reader ;
|
||||
SubInclude HAIKU_TOP src add-ons media plugins avi_reader ;
|
||||
SubInclude HAIKU_TOP src add-ons media plugins mp3_reader ;
|
||||
SubInclude HAIKU_TOP src add-ons media plugins wav_reader ;
|
||||
|
||||
SubInclude OBOS_TOP src add-ons media plugins matroska ;
|
||||
SubInclude OBOS_TOP src add-ons media plugins musepack ;
|
||||
SubInclude OBOS_TOP src add-ons media plugins ogg ;
|
||||
SubInclude HAIKU_TOP src add-ons media plugins matroska ;
|
||||
SubInclude HAIKU_TOP src add-ons media plugins musepack ;
|
||||
SubInclude HAIKU_TOP src add-ons media plugins ogg ;
|
||||
|
||||
SubInclude OBOS_TOP src add-ons media plugins mp3_decoder ;
|
||||
SubInclude OBOS_TOP src add-ons media plugins raw_decoder ;
|
||||
SubInclude HAIKU_TOP src add-ons media plugins mp3_decoder ;
|
||||
SubInclude HAIKU_TOP src add-ons media plugins raw_decoder ;
|
||||
|
||||
SubInclude OBOS_TOP src add-ons media plugins avcodec ;
|
||||
SubInclude OBOS_TOP src add-ons media plugins vorbis ;
|
||||
SubInclude OBOS_TOP src add-ons media plugins speex ;
|
||||
SubInclude OBOS_TOP src add-ons media plugins mov_reader ;
|
||||
SubInclude OBOS_TOP src add-ons media plugins mp4_reader ;
|
||||
SubInclude HAIKU_TOP src add-ons media plugins avcodec ;
|
||||
SubInclude HAIKU_TOP src add-ons media plugins vorbis ;
|
||||
SubInclude HAIKU_TOP src add-ons media plugins speex ;
|
||||
SubInclude HAIKU_TOP src add-ons media plugins mov_reader ;
|
||||
SubInclude HAIKU_TOP src add-ons media plugins mp4_reader ;
|
||||
|
||||
# The following add-ons are GPL licensed, and can only be used with
|
||||
# software whose license is GPL compatible. To include these GPL
|
||||
# licensed add-ons, you need to run configure with the --include-gpl-addons
|
||||
# parameter
|
||||
SubIncludeGPL OBOS_TOP src add-ons media plugins ac3_decoder ;
|
||||
SubIncludeGPL HAIKU_TOP src add-ons media plugins ac3_decoder ;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins ac3_decoder ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins ac3_decoder ;
|
||||
|
||||
UsePrivateHeaders media ;
|
||||
|
||||
@@ -10,6 +10,6 @@ Addon ac3_decoder : media plugins :
|
||||
liba52.a
|
||||
;
|
||||
|
||||
LinkSharedOSLibs ac3_decoder : be libmedia.so ;
|
||||
LinkAgainst ac3_decoder : be libmedia.so ;
|
||||
|
||||
SubIncludeGPL OBOS_TOP src add-ons media plugins ac3_decoder liba52 ;
|
||||
SubIncludeGPL HAIKU_TOP src add-ons media plugins ac3_decoder liba52 ;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins ac3_decoder liba52 ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins ac3_decoder liba52 ;
|
||||
|
||||
StaticLibrary a52 :
|
||||
StaticLibrary liba52.a :
|
||||
bit_allocate.c
|
||||
bitstream.c
|
||||
downmix.c
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins aiff_reader ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins aiff_reader ;
|
||||
|
||||
UsePrivateHeaders media ;
|
||||
|
||||
Addon aiff_reader : media plugins :
|
||||
aiff_reader.cpp
|
||||
;
|
||||
|
||||
LinkSharedOSLibs aiff_reader : be libmedia.so ;
|
||||
: false
|
||||
: be libmedia.so ;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins au_reader ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins au_reader ;
|
||||
|
||||
UsePrivateHeaders media ;
|
||||
|
||||
Addon au_reader : media plugins :
|
||||
au_reader.cpp
|
||||
: false
|
||||
: be libmedia.so
|
||||
;
|
||||
|
||||
LinkSharedOSLibs au_reader : be libmedia.so ;
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins avcodec ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins avcodec ;
|
||||
|
||||
UsePrivateHeaders media ;
|
||||
|
||||
SubDirHdrs [ FDirName $(SUBDIR) libavcodec ] ;
|
||||
|
||||
Addon avcodec : media plugins :
|
||||
avcodec.cpp
|
||||
codectbl.cpp
|
||||
@@ -13,8 +15,8 @@ Addon avcodec : media plugins :
|
||||
false
|
||||
:
|
||||
libavcodec.a
|
||||
be
|
||||
libmedia.so
|
||||
;
|
||||
|
||||
LinkSharedOSLibs avcodec : be libmedia.so ;
|
||||
|
||||
SubInclude OBOS_TOP src add-ons media plugins avcodec libavcodec ;
|
||||
SubInclude HAIKU_TOP src add-ons media plugins avcodec libavcodec ;
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins avcodec libavcodec ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins avcodec libavcodec ;
|
||||
|
||||
# filter warnings we don't want here
|
||||
local originalCCFlags = $(CCFLAGS) ;
|
||||
CCFLAGS = [ Filter $(CCFLAGS) : -Wall -Wmissing-prototypes -Wsign-compare -Wpointer-arith ] ;
|
||||
TARGET_WARNING_CCFLAGS = [ FFilter $(TARGET_WARNING_CCFLAGS)
|
||||
: -Wall -Wmissing-prototypes -Wsign-compare -Wpointer-arith ] ;
|
||||
|
||||
SubDirCcFlags -fomit-frame-pointer -DPIC ;
|
||||
SubDirCcFlags -DHAVE_AV_CONFIG_H=1 ;
|
||||
|
||||
StaticLibrary avcodec :
|
||||
StaticLibrary libavcodec.a :
|
||||
4xm.c
|
||||
8bps.c
|
||||
ac3enc.c
|
||||
@@ -82,6 +82,3 @@ StaticLibrary avcodec :
|
||||
xan.c
|
||||
xvmcvideo.c
|
||||
;
|
||||
|
||||
# restore CCFLAGS
|
||||
CCFLAGS = $(originalCCFlags) ;
|
||||
|
||||
@@ -1,15 +1,16 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins avi_reader ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins avi_reader ;
|
||||
|
||||
UsePrivateHeaders media ;
|
||||
|
||||
SubDirHdrs [ FDirName $(SUBDIR) libOpenDML ] ;
|
||||
|
||||
Addon avi_reader : media plugins :
|
||||
avi_reader.cpp
|
||||
:
|
||||
false
|
||||
:
|
||||
libopendml.a
|
||||
be libmedia.so
|
||||
;
|
||||
|
||||
LinkSharedOSLibs avi_reader : be libmedia.so ;
|
||||
|
||||
SubInclude OBOS_TOP src add-ons media plugins avi_reader libOpenDML ;
|
||||
SubInclude HAIKU_TOP src add-ons media plugins avi_reader libOpenDML ;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins avi_reader libOpenDML ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins avi_reader libOpenDML ;
|
||||
|
||||
StaticLibrary opendml :
|
||||
StaticLibrary libopendml.a :
|
||||
OpenDMLFile.cpp
|
||||
OpenDMLParser.cpp
|
||||
;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins matroska ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins matroska ;
|
||||
|
||||
UsePrivateHeaders media ;
|
||||
|
||||
# SubDirHdrs [ FDirName $(SUBDIR) libmatroska ] ;
|
||||
SubDirHdrs [ FDirName $(SUBDIR) libMatroskaParser ] ;
|
||||
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ogg libogg ] ;
|
||||
SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) ogg libogg ] ;
|
||||
|
||||
local r5_src = strlcpy.c ;
|
||||
|
||||
@@ -28,15 +28,15 @@ Addon matroska : media plugins :
|
||||
;
|
||||
|
||||
if $(HAIKU_COMPATIBLE) {
|
||||
LinkSharedOSLibs matroska : libbe.so libroot.so ;
|
||||
LinkAgainst matroska : libbe.so libroot.so ;
|
||||
} else {
|
||||
LinkSharedOSLibs matroska : be ;
|
||||
LinkAgainst matroska : be ;
|
||||
}
|
||||
|
||||
SEARCH on [ FGristFiles
|
||||
strlcpy.c
|
||||
] = [ FDirName $(OBOS_TOP) src system libroot posix string ] ;
|
||||
] = [ FDirName $(HAIKU_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 ;
|
||||
SubInclude OBOS_TOP src add-ons media plugins matroska libMatroskaParser ;
|
||||
# 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 libMatroskaParser ;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins matroska libMatroskaParser ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins matroska libMatroskaParser ;
|
||||
|
||||
UseLibraryHeaders zlib ;
|
||||
|
||||
StaticLibrary MatroskaParser :
|
||||
StaticLibrary libMatroskaParser.a :
|
||||
MatroskaParser.c
|
||||
StreamIO.cpp
|
||||
;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins matroska libebml ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins matroska libebml ;
|
||||
|
||||
StaticLibrary ebml :
|
||||
StaticLibrary libebml.a :
|
||||
Debug.cpp
|
||||
EbmlBinary.cpp
|
||||
EbmlContexts.cpp
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins matroska libmatroska ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins matroska libmatroska ;
|
||||
|
||||
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) libebml ] ;
|
||||
|
||||
StaticLibrary matroska :
|
||||
StaticLibrary libmatroska.a :
|
||||
FileKax.cpp
|
||||
KaxAttached.cpp
|
||||
KaxAttachments.cpp
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins mov_reader ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins mov_reader ;
|
||||
|
||||
UsePrivateHeaders media ;
|
||||
|
||||
SubDirHdrs [ FDirName $(SUBDIR) libMOV ] ;
|
||||
|
||||
Addon mov_reader : media plugins :
|
||||
mov_reader.cpp
|
||||
:
|
||||
@@ -9,8 +11,8 @@ Addon mov_reader : media plugins :
|
||||
:
|
||||
libmovreader.a
|
||||
libz.a
|
||||
be
|
||||
libmedia.so
|
||||
;
|
||||
|
||||
LinkSharedOSLibs mov_reader : be libmedia.so ;
|
||||
|
||||
SubInclude OBOS_TOP src add-ons media plugins mov_reader libMOV ;
|
||||
SubInclude HAIKU_TOP src add-ons media plugins mov_reader libMOV ;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins mov_reader libMOV ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins mov_reader libMOV ;
|
||||
|
||||
UseLibraryHeaders zlib ;
|
||||
|
||||
StaticLibrary movreader :
|
||||
StaticLibrary libmovreader.a :
|
||||
MOVParser.cpp
|
||||
MOVFileReader.cpp
|
||||
MOVAtom.cpp
|
||||
|
||||
@@ -1,15 +1,17 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins mp3_decoder ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins mp3_decoder ;
|
||||
|
||||
UsePrivateHeaders media ;
|
||||
|
||||
SubDirHdrs [ FDirName $(SUBDIR) mpglib ] ;
|
||||
|
||||
Addon mp3_decoder : media plugins :
|
||||
mp3DecoderPlugin.cpp
|
||||
:
|
||||
false
|
||||
:
|
||||
libmpglib.a
|
||||
be
|
||||
libmedia.so
|
||||
;
|
||||
|
||||
LinkSharedOSLibs mp3_decoder : be libmedia.so ;
|
||||
|
||||
SubInclude OBOS_TOP src add-ons media plugins mp3_decoder mpglib ;
|
||||
SubInclude HAIKU_TOP src add-ons media plugins mp3_decoder mpglib ;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins mp3_decoder mpglib ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins mp3_decoder mpglib ;
|
||||
|
||||
StaticLibrary mpglib :
|
||||
StaticLibrary libmpglib.a :
|
||||
common.c
|
||||
dct64_i386.c
|
||||
decode_i386.c
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins mp3_reader ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins mp3_reader ;
|
||||
|
||||
UsePrivateHeaders media ;
|
||||
|
||||
Addon mp3_reader : media plugins :
|
||||
MP3ReaderPlugin.cpp
|
||||
: false
|
||||
: be libmedia.so
|
||||
;
|
||||
|
||||
LinkSharedOSLibs mp3_reader : be libmedia.so ;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins mp4_reader ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins mp4_reader ;
|
||||
|
||||
UsePrivateHeaders media ;
|
||||
|
||||
@@ -11,6 +11,6 @@ Addon mp4_reader : media plugins :
|
||||
libz.a
|
||||
;
|
||||
|
||||
LinkSharedOSLibs mp4_reader : be libmedia.so ;
|
||||
LinkAgainst mp4_reader : be libmedia.so ;
|
||||
|
||||
SubInclude OBOS_TOP src add-ons media plugins mp4_reader libMP4 ;
|
||||
SubInclude HAIKU_TOP src add-ons media plugins mp4_reader libMP4 ;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins mp4_reader libMP4 ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins mp4_reader libMP4 ;
|
||||
|
||||
UseLibraryHeaders zlib ;
|
||||
|
||||
StaticLibrary mp4reader :
|
||||
StaticLibrary libmp4reader.a :
|
||||
MP4Parser.cpp
|
||||
MP4FileReader.cpp
|
||||
MP4Atom.cpp
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins musepack ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins musepack ;
|
||||
|
||||
UsePrivateHeaders media ;
|
||||
|
||||
SubDirHdrs [ FDirName $(SUBDIR) mpc ] ;
|
||||
|
||||
Addon musepack : media plugins :
|
||||
MusePack.cpp
|
||||
MusePackReader.cpp
|
||||
MusePackDecoder.cpp
|
||||
: false
|
||||
: libmusepack.a
|
||||
;
|
||||
: libmusepack.a be libmedia.so
|
||||
;
|
||||
|
||||
LinkSharedOSLibs musepack : be libmedia.so ;
|
||||
|
||||
SubInclude OBOS_TOP src add-ons media plugins musepack mpc ;
|
||||
SubInclude HAIKU_TOP src add-ons media plugins musepack mpc ;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins musepack mpc ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins musepack mpc ;
|
||||
|
||||
StaticLibrary musepack :
|
||||
StaticLibrary libmusepack.a :
|
||||
bitstream.cpp
|
||||
huffsv46.cpp
|
||||
huffsv7.cpp
|
||||
@@ -10,5 +10,3 @@ StaticLibrary musepack :
|
||||
requant.cpp
|
||||
synth_filter.cpp
|
||||
;
|
||||
|
||||
LinkSharedOSLibs musepack : be libmedia.so ;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins ogg ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins ogg ;
|
||||
|
||||
UsePrivateHeaders media ;
|
||||
|
||||
SubDirHdrs [ FDirName $(SUBDIR) libogg ] ;
|
||||
SubDirSysHdrs [ FDirName $(SUBDIR) libogg ] ;
|
||||
|
||||
Addon ogg : media plugins :
|
||||
OggReaderPlugin.cpp
|
||||
@@ -16,9 +16,8 @@ Addon ogg : media plugins :
|
||||
OggTobiasSeekable.cpp
|
||||
OggVorbisStream.cpp
|
||||
OggVorbisSeekable.cpp
|
||||
: false : libogg.a
|
||||
: false
|
||||
: libogg.a be libmedia.so
|
||||
;
|
||||
|
||||
LinkSharedOSLibs ogg : be libmedia.so ;
|
||||
|
||||
SubInclude OBOS_TOP src add-ons media plugins ogg libogg ;
|
||||
SubInclude HAIKU_TOP src add-ons media plugins ogg libogg ;
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <MediaFormats.h>
|
||||
#include <ogg/ogg.h>
|
||||
#include <string.h>
|
||||
#include <OggFormats.h>
|
||||
#include "OggFormats.h"
|
||||
|
||||
/*
|
||||
* speex descriptions/formats
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <MediaFormats.h>
|
||||
#include <ogg/ogg.h>
|
||||
#include <string.h>
|
||||
#include <OggFormats.h>
|
||||
#include "OggFormats.h"
|
||||
|
||||
/*
|
||||
* theora descriptions/formats
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins ogg libogg ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins ogg libogg ;
|
||||
|
||||
StaticLibrary ogg :
|
||||
SubDirSysHdrs $(SUBDIR) ;
|
||||
|
||||
StaticLibrary libogg.a :
|
||||
bitwise.c
|
||||
framing.c
|
||||
;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins ogg liboggz ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins ogg liboggz ;
|
||||
|
||||
SubDirHdrs [ FDirName $(SUBDIR) .. libogg ] ;
|
||||
SubDirCcFlags -Wno-missing-prototypes ;
|
||||
|
||||
StaticLibrary oggz :
|
||||
StaticLibrary liboggz.a :
|
||||
oggz.c
|
||||
oggz_auto.c
|
||||
oggz_io.c
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins raw_decoder ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins raw_decoder ;
|
||||
|
||||
UsePrivateHeaders media ;
|
||||
|
||||
Addon raw_decoder : media plugins :
|
||||
AudioConversion.cpp
|
||||
RawDecoderPlugin.cpp
|
||||
: false
|
||||
: be libmedia.so
|
||||
;
|
||||
|
||||
LinkSharedOSLibs raw_decoder : be libmedia.so ;
|
||||
|
||||
@@ -1,17 +1,16 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins speex ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins speex ;
|
||||
|
||||
UsePrivateHeaders media ;
|
||||
|
||||
SubDirHdrs $(SUBDIR) .. ogg ;
|
||||
SubDirHdrs $(SUBDIR) .. ogg libogg ;
|
||||
SubDirSysHdrs $(SUBDIR) .. ogg libogg ;
|
||||
SubDirHdrs $(SUBDIR) libspeex ;
|
||||
|
||||
Addon speex : media plugins :
|
||||
speexCodecPlugin.cpp
|
||||
speexCodecDefaults.cpp
|
||||
: false : libspeex.a
|
||||
: false
|
||||
: libspeex.a be libmedia.so
|
||||
;
|
||||
|
||||
LinkSharedOSLibs speex : be libmedia.so ;
|
||||
|
||||
SubInclude OBOS_TOP src add-ons media plugins speex libspeex ;
|
||||
SubInclude HAIKU_TOP src add-ons media plugins speex libspeex ;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins speex libspeex ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins speex libspeex ;
|
||||
|
||||
SubDirCcFlags -DVERSION=\\\"1.0.3\\\" ;
|
||||
|
||||
StaticLibrary speex :
|
||||
StaticLibrary libspeex.a :
|
||||
nb_celp.c
|
||||
sb_celp.c
|
||||
lpc.c
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins theora libtheora ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins theora libtheora ;
|
||||
|
||||
SubDirHdrs [ FDirName $(SUBDIR) .. .. ogg libogg ] ;
|
||||
|
||||
SubDirCcFlags -DPACKAGE=\\\"libtheora\\\" -DVERSION=\\\"0.0\\\" ;
|
||||
SubDirCcFlags -D_REENTRANT -DPIC -DTRUE=true ;
|
||||
|
||||
StaticLibrary theora :
|
||||
StaticLibrary libtheora.a :
|
||||
blockmap.c
|
||||
comment.c
|
||||
dct.c
|
||||
|
||||
@@ -1,16 +1,15 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins vorbis ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins vorbis ;
|
||||
|
||||
UsePrivateHeaders media ;
|
||||
|
||||
SubDirHdrs $(SUBDIR) .. ogg ;
|
||||
SubDirHdrs $(SUBDIR) .. ogg libogg ;
|
||||
SubDirSysHdrs $(SUBDIR) .. ogg libogg ;
|
||||
SubDirHdrs $(SUBDIR) libvorbis vorbis ;
|
||||
|
||||
Addon vorbis : media plugins :
|
||||
vorbisCodecPlugin.cpp
|
||||
: false : libvorbis.a libogg.a
|
||||
: false
|
||||
: libvorbis.a libogg.a be libmedia.so
|
||||
;
|
||||
|
||||
LinkSharedOSLibs vorbis : be libmedia.so ;
|
||||
|
||||
SubInclude OBOS_TOP src add-ons media plugins vorbis libvorbis ;
|
||||
SubInclude HAIKU_TOP src add-ons media plugins vorbis libvorbis ;
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins vorbis libvorbis ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins vorbis libvorbis ;
|
||||
|
||||
SubDirHdrs [ FDirName $(SUBDIR) .. .. ogg libogg ] ;
|
||||
SubDirSysHdrs [ FDirName $(SUBDIR) .. .. ogg libogg ] ;
|
||||
|
||||
SubDirCcFlags -DPACKAGE=\\\"libvorbis\\\" -DVERSION=\\\"1.0\\\" -DHAVE_ALLOCA_H=1 -DHAVE_ALLOCA=1 -DHAVE_SQRTF=1 -DHAVE_LOGF=1 -DHAVE_EXPF=1 -DHAVE_ACOSF=1 -DHAVE_ATANF=1 -DHAVE_FREXPF=1 -DHAVE_RINTF=1 -DHAVE_FLOORF=1 ;
|
||||
SubDirCcFlags -O20 -D__NO_MATH_INLINES -fsigned-char -DUSE_MEMORY_H -DPIC -w ;
|
||||
SubDirCcFlags -O20 -D__NO_MATH_INLINES -fsigned-char -DPIC -w ;
|
||||
|
||||
StaticLibrary vorbis :
|
||||
StaticLibrary libvorbis.a :
|
||||
analysis.c
|
||||
bitrate.c
|
||||
block.c
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
SubDir OBOS_TOP src add-ons media plugins wav_reader ;
|
||||
SubDir HAIKU_TOP src add-ons media plugins wav_reader ;
|
||||
|
||||
UsePrivateHeaders media ;
|
||||
|
||||
Addon wav_reader : media plugins :
|
||||
WavReaderPlugin.cpp
|
||||
: false
|
||||
: be libmedia.so
|
||||
;
|
||||
|
||||
LinkSharedOSLibs wav_reader : be libmedia.so ;
|
||||
|
||||
Reference in New Issue
Block a user