ape_reader: setup for hybrid build.

I forgot that media add-ons are hybrid by default. Fixes the build.
This commit is contained in:
Adrien Destugues
2014-12-10 11:00:49 +01:00
parent 1148ea734e
commit d18ae0336e
3 changed files with 51 additions and 36 deletions
+11 -6
View File
@@ -1,16 +1,21 @@
SubDir HAIKU_TOP src add-ons media plugins ape_reader ; SubDir HAIKU_TOP src add-ons media plugins ape_reader ;
SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders media ; UsePrivateHeaders media ;
SubDirHdrs [ FDirName $(SUBDIR) ../LibMonkeysAudio ] ;
SubDirHdrs [ FDirName $(SUBDIR) LibMonkeysAudio ] ; SubDirHdrs [ FDirName $(SUBDIR) LibMonkeysAudio ] ;
SubDirHdrs [ FDirName $(SUBDIR) MAClib ] ; SubDirHdrs [ FDirName $(SUBDIR) MAClib ] ;
Addon ape_reader : local architectureObject ;
APEReader.cpp for architectureObject in [ MultiArchSubDirSetup ] {
: libMonkeysAudio.a MAClib.a be libmedia.so [ TargetLibsupc++ ] on $(architectureObject) {
; Addon [ MultiArchDefaultGristFiles ape_reader ] :
APEReader.cpp
: [ MultiArchDefaultGristFiles libMonkeysAudio.a MAClib.a ]
be media [ TargetLibsupc++ ]
;
}
}
SubInclude HAIKU_TOP src add-ons media plugins ape_reader LibMonkeysAudio ; SubInclude HAIKU_TOP src add-ons media plugins ape_reader LibMonkeysAudio ;
SubInclude HAIKU_TOP src add-ons media plugins ape_reader MAClib ; SubInclude HAIKU_TOP src add-ons media plugins ape_reader MAClib ;
@@ -2,7 +2,12 @@ SubDir HAIKU_TOP src add-ons media plugins ape_reader LibMonkeysAudio ;
SubDirHdrs [ FDirName $(SUBDIR) ../MAClib ] ; SubDirHdrs [ FDirName $(SUBDIR) ../MAClib ] ;
StaticLibrary libMonkeysAudio.a : local architectureObject ;
PositionBridgeIO.cpp for architectureObject in [ MultiArchSubDirSetup ] {
LibMonkeysAudio.cpp on $(architectureObject) {
; StaticLibrary [ MultiArchDefaultGristFiles libMonkeysAudio.a ] :
PositionBridgeIO.cpp
LibMonkeysAudio.cpp
;
}
}
@@ -2,29 +2,34 @@ SubDir HAIKU_TOP src add-ons media plugins ape_reader MAClib ;
SubDirHdrs [ FDirName $(SUBDIR) ../LibMonkeysAudio ] ; SubDirHdrs [ FDirName $(SUBDIR) ../LibMonkeysAudio ] ;
StaticLibrary MAClib.a : local architectureObject ;
APECompress.cpp for architectureObject in [ MultiArchSubDirSetup ] {
APECompressCore.cpp on $(architectureObject) {
APECompressCreate.cpp StaticLibrary [ MultiArchDefaultGristFiles MAClib.a ] :
APEDecompress.cpp APECompress.cpp
APEHeader.cpp APECompressCore.cpp
APEInfo.cpp APECompressCreate.cpp
APELink.cpp APEDecompress.cpp
APESimple.cpp APEHeader.cpp
APETag.cpp APEInfo.cpp
BitArray.cpp APELink.cpp
CharacterHelper.cpp APESimple.cpp
CircleBuffer.cpp APETag.cpp
GlobalFunctions.cpp BitArray.cpp
MACProgressHelper.cpp CharacterHelper.cpp
MACLib.cpp CircleBuffer.cpp
MD5.cpp GlobalFunctions.cpp
NewPredictor.cpp MACProgressHelper.cpp
NNFilter.cpp MACLib.cpp
Prepare.cpp MD5.cpp
StdLibFileIO.cpp NewPredictor.cpp
UnBitArray.cpp NNFilter.cpp
UnBitArrayBase.cpp Prepare.cpp
WAVInputSource.cpp StdLibFileIO.cpp
Assembly.nasm UnBitArray.cpp
; UnBitArrayBase.cpp
WAVInputSource.cpp
Assembly.nasm
;
}
}