diff --git a/build/jam/packages/HaikuSecondary b/build/jam/packages/HaikuSecondary index 9adb1b5b0a..1bacbc9b9c 100644 --- a/build/jam/packages/HaikuSecondary +++ b/build/jam/packages/HaikuSecondary @@ -22,12 +22,12 @@ if $(HAIKU_GCC_VERSION_$(architecture)[1]) = 2 { # # add-ons -# local addOnsDir = add-ons $(architecture) ; +local addOnsDir = add-ons $(architecture) ; # # AddFilesToPackage $(addOnsDir) accelerants # : $(SYSTEM_ADD_ONS_ACCELERANTS) ; -# AddFilesToPackage $(addOnsDir) Translators -# : $(SYSTEM_ADD_ONS_TRANSLATORS) ; +AddFilesToPackage $(addOnsDir) Translators + : [ MultiArchDefaultGristFiles $(SYSTEM_ADD_ONS_TRANSLATORS) ] ; # AddFilesToPackage $(addOnsDir) locale catalogs # : $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ; # diff --git a/src/add-ons/translators/bmp/Jamfile b/src/add-ons/translators/bmp/Jamfile index 981793c9c3..9da8879af4 100644 --- a/src/add-ons/translators/bmp/Jamfile +++ b/src/add-ons/translators/bmp/Jamfile @@ -6,14 +6,20 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; AddResources BMPTranslator : BMPTranslator.rdef ; -Translator BMPTranslator : - BMPMain.cpp - BMPTranslator.cpp - BMPView.cpp - : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) - localestub - : true -; +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + Translator [ MultiArchDefaultGristFiles BMPTranslator ] : + BMPMain.cpp + BMPTranslator.cpp + BMPView.cpp + : be translation + [ MultiArchDefaultGristFiles libtranslatorsutils.a ] + $(TARGET_LIBSUPC++) localestub + : true + ; + } +} DoCatalogs BMPTranslator : x-vnd.Haiku-BMPTranslator diff --git a/src/add-ons/translators/exr/Jamfile b/src/add-ons/translators/exr/Jamfile index faa6aff377..775703215a 100644 --- a/src/add-ons/translators/exr/Jamfile +++ b/src/add-ons/translators/exr/Jamfile @@ -9,16 +9,22 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; AddResources EXRTranslator : EXRTranslator.rdef ; -Translator EXRTranslator : - main.cpp - ConfigView.cpp - EXRGamma.cpp - EXRTranslator.cpp - IStreamWrapper.cpp - : be translation libilmimf.so $(TARGET_LIBSTDC++) libtranslatorsutils.a - localestub - : true -; +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + Translator [ MultiArchDefaultGristFiles EXRTranslator ] : + main.cpp + ConfigView.cpp + EXRGamma.cpp + EXRTranslator.cpp + IStreamWrapper.cpp + : be translation textencoding $(TARGET_LIBSTDC++) + [ MultiArchDefaultGristFiles libtranslatorsutils.a libilmimf.so ] + localestub + : true + ; + } +} DoCatalogs EXRTranslator : x-vnd.Haiku-EXRTranslator diff --git a/src/add-ons/translators/gif/Jamfile b/src/add-ons/translators/gif/Jamfile index 11ba11e54b..657e38a42b 100644 --- a/src/add-ons/translators/gif/Jamfile +++ b/src/add-ons/translators/gif/Jamfile @@ -6,22 +6,27 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; AddResources GIFTranslator : GIFTranslator.rdef ; -Translator GIFTranslator : - # Main Source - GIFTranslator.cpp - GIFView.cpp +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + Translator [ MultiArchDefaultGristFiles GIFTranslator ] : + # Main Source + GIFTranslator.cpp + GIFView.cpp - # Real Work - GIFLoad.cpp - LoadPalette.cpp - GIFSave.cpp - SavePalette.cpp - SFHash.cpp - : - be translation $(TARGET_LIBSUPC++) localestub - libtranslatorsutils.a - : true -; + # Real Work + GIFLoad.cpp + LoadPalette.cpp + GIFSave.cpp + SavePalette.cpp + SFHash.cpp + : + be translation $(TARGET_LIBSUPC++) localestub + [ MultiArchDefaultGristFiles libtranslatorsutils.a ] + : true + ; + } +} DoCatalogs GIFTranslator : x-vnd.Haiku-GIFTranslator diff --git a/src/add-ons/translators/hpgs/Jamfile b/src/add-ons/translators/hpgs/Jamfile index 4b57322519..e8c96ea94e 100644 --- a/src/add-ons/translators/hpgs/Jamfile +++ b/src/add-ons/translators/hpgs/Jamfile @@ -2,9 +2,6 @@ SubDir HAIKU_TOP src add-ons translators hpgs ; SubDirSysHdrs [ FDirName $(SUBDIR) lib ] ; SubDirCcFlags -DHPGS_SHARED -std=c99 ; -UseLibraryHeaders iconv ; -UseBuildFeatureHeaders libpng ; -UseBuildFeatureHeaders zlib ; SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; local sources = @@ -46,17 +43,28 @@ Includes [ FGristFiles hpgsimage.c ] Includes [ FGristFiles hpgszostream.c ] : [ BuildFeatureAttribute zlib : headers ] ; -Translator HPGSTranslator : - # HPGSTranslator classes - ConfigView.cpp - HPGSTranslator.cpp - $(sources) - : be translation libtextencoding.so - [ BuildFeatureAttribute libpng : library ] - [ BuildFeatureAttribute zlib : library ] - libtranslatorsutils.a $(TARGET_LIBSUPC++) localestub - : true -; + +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { +UseLibraryHeaders iconv ; +UseBuildFeatureHeaders libpng ; +UseBuildFeatureHeaders zlib ; + + Translator [ MultiArchDefaultGristFiles HPGSTranslator ] : + # HPGSTranslator classes + ConfigView.cpp + HPGSTranslator.cpp + $(sources) + : be translation libtextencoding.so + [ BuildFeatureAttribute libpng : library ] + [ BuildFeatureAttribute zlib : library ] + [ MultiArchDefaultGristFiles libtranslatorsutils.a ] + $(TARGET_LIBSUPC++) localestub + : true + ; + } +} DoCatalogs HPGSTranslator : x-vnd.Haiku-HPGSTranslator diff --git a/src/add-ons/translators/hvif/Jamfile b/src/add-ons/translators/hvif/Jamfile index 96814ca4ed..5bbb6083bc 100644 --- a/src/add-ons/translators/hvif/Jamfile +++ b/src/add-ons/translators/hvif/Jamfile @@ -4,14 +4,20 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; AddResources HVIFTranslator : HVIFTranslator.rdef ; -Translator HVIFTranslator : - HVIFMain.cpp - HVIFTranslator.cpp - HVIFView.cpp - : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) - localestub - : true -; +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + Translator [ MultiArchDefaultGristFiles HVIFTranslator ] : + HVIFMain.cpp + HVIFTranslator.cpp + HVIFView.cpp + : be translation + [ MultiArchDefaultGristFiles libtranslatorsutils.a ] + $(TARGET_LIBSUPC++) localestub + : true + ; + } +} DoCatalogs HVIFTranslator : x-vnd.Haiku-HVIFTranslator diff --git a/src/add-ons/translators/icns/Jamfile b/src/add-ons/translators/icns/Jamfile index f90c7075e5..fd9cae3ec2 100644 --- a/src/add-ons/translators/icns/Jamfile +++ b/src/add-ons/translators/icns/Jamfile @@ -2,18 +2,12 @@ SubDir HAIKU_TOP src add-ons translators icns ; SetSubDirSupportedPlatformsBeOSCompatible ; -UseBuildFeatureHeaders libpng ; - SubDirSysHdrs [ FDirName $(SUBDIR) openjpeg ] ; SubDirSysHdrs [ FDirName $(SUBDIR) libicns ] ; SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; #for BaseTranslator.h and friends -# Let Jam know where to find some of our source files -SEARCH_SOURCE += [ FDirName $(SUBDIR) openjpeg ] ; -SEARCH_SOURCE += [ FDirName $(SUBDIR) libicns ] ; - SubDirC++Flags [ FDefines BEOS_R5_COMPATIBLE ] ; local openjpeg_files = @@ -63,23 +57,35 @@ ObjectCcFlags [ FGristFiles $(libicns_files:S=$(SUFOBJ)) ] : -w ; AddResources ICNSTranslator : ICNSTranslator.rdef ; -Translator ICNSTranslator : +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + # Let Jam know where to find some of our source files + SEARCH_SOURCE += [ FDirName $(SUBDIR) openjpeg ] ; + SEARCH_SOURCE += [ FDirName $(SUBDIR) libicns ] ; - # ICNSTranslator - ICNSTranslator.cpp - ICNSLoader.cpp - ConfigView.cpp - main.cpp + UseBuildFeatureHeaders libpng ; + Translator [ MultiArchDefaultGristFiles ICNSTranslator ] : - $(openjpeg_files) - - $(libicns_files) + # ICNSTranslator + ICNSTranslator.cpp + ICNSLoader.cpp + ConfigView.cpp + main.cpp - : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) - [ BuildFeatureAttribute libpng : library ] - localestub - : true -; + $(openjpeg_files) + + $(libicns_files) + + : be translation + [ MultiArchDefaultGristFiles libtranslatorsutils.a ] + $(TARGET_LIBSUPC++) + [ BuildFeatureAttribute libpng : library ] + localestub + : true + ; + } +} DoCatalogs ICNSTranslator : x-vnd.Haiku-ICNSTranslator diff --git a/src/add-ons/translators/ico/Jamfile b/src/add-ons/translators/ico/Jamfile index 5a984e2ec4..441f614f87 100644 --- a/src/add-ons/translators/ico/Jamfile +++ b/src/add-ons/translators/ico/Jamfile @@ -6,16 +6,23 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; AddResources ICOTranslator : ICOTranslator.rdef ; -Translator ICOTranslator : - # ICOTranslator classes - main.cpp - ICOTranslator.cpp - ConfigView.cpp - ICO.cpp - : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) - localestub - : true -; +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + Translator [ MultiArchDefaultGristFiles ICOTranslator ] : + # ICOTranslator classes + main.cpp + ICOTranslator.cpp + ConfigView.cpp + ICO.cpp + : be translation + [ MultiArchDefaultGristFiles libtranslatorsutils.a ] + $(TARGET_LIBSUPC++) + localestub + : true + ; + } +} DoCatalogs ICOTranslator : x-vnd.Haiku-ICOTranslator diff --git a/src/add-ons/translators/jpeg/Jamfile b/src/add-ons/translators/jpeg/Jamfile index 6bf18706c5..4b7f3748b1 100644 --- a/src/add-ons/translators/jpeg/Jamfile +++ b/src/add-ons/translators/jpeg/Jamfile @@ -16,17 +16,23 @@ Includes [ FGristFiles be_jdatadst.cpp be_jdatasrc.cpp be_jerror.cpp JPEGTranslator.cpp ] : [ BuildFeatureAttribute jpeg : headers ] ; -Translator JPEGTranslator : - be_jdatadst.cpp - be_jdatasrc.cpp - be_jerror.cpp - exif_parser.cpp - JPEGTranslator.cpp - : be translation libtranslatorsutils.a - [ BuildFeatureAttribute jpeg : library ] - $(TARGET_LIBSTDC++) localestub - : true -; +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + Translator [ MultiArchDefaultGristFiles JPEGTranslator ] : + be_jdatadst.cpp + be_jdatasrc.cpp + be_jerror.cpp + exif_parser.cpp + JPEGTranslator.cpp + : be translation + [ MultiArchDefaultGristFiles libtranslatorsutils.a ] + [ BuildFeatureAttribute jpeg : library ] + $(TARGET_LIBSTDC++) localestub + : true + ; + } +} DoCatalogs JPEGTranslator : x-vnd.Haiku-JPEGTranslator diff --git a/src/add-ons/translators/jpeg2000/Jamfile b/src/add-ons/translators/jpeg2000/Jamfile index 78f9eb67bf..5e10009b3f 100644 --- a/src/add-ons/translators/jpeg2000/Jamfile +++ b/src/add-ons/translators/jpeg2000/Jamfile @@ -15,9 +15,6 @@ CCFLAGS += -DEXCLUDE_MIF_SUPPORT -DEXCLUDE_JPG_SUPPORT -DEXCLUDE_PGX_SUPPORT ; -# Let Jam know where to find some of our source files -SEARCH_SOURCE += [ FDirName $(SUBDIR) libjasper ] ; - SubDirC++Flags [ FDefines BEOS_R5_COMPATIBLE ] ; local jasper_files = @@ -60,21 +57,30 @@ local jasper_files = jpc_util.c ; -ObjectCcFlags [ FGristFiles $(jasper_files:S=$(SUFOBJ)) ] : -w ; - AddResources JPEG2000Translator : JPEG2000Translator.rdef ; -Translator JPEG2000Translator : +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + # Let Jam know where to find some of our source files + SEARCH_SOURCE += [ FDirName $(SUBDIR) libjasper ] ; - # JPEG2000Translator - JPEG2000Translator.cpp + ObjectCcFlags [ FGristFiles $(jasper_files:S=$(SUFOBJ)) ] : -w ; - $(jasper_files) + Translator [ MultiArchDefaultGristFiles JPEG2000Translator ] : - : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) - localestub - : true -; + # JPEG2000Translator + JPEG2000Translator.cpp + + $(jasper_files) + + : be translation + [ MultiArchDefaultGristFiles libtranslatorsutils.a ] + $(TARGET_LIBSUPC++) localestub + : true + ; + } +} DoCatalogs JPEG2000Translator : x-vnd.Haiku-JPEG2000Translator diff --git a/src/add-ons/translators/jpeg2000/libjasper/jas_debug.c b/src/add-ons/translators/jpeg2000/libjasper/jas_debug.c index 2c395f6d07..8b1c1c0282 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jas_debug.c +++ b/src/add-ons/translators/jpeg2000/libjasper/jas_debug.c @@ -115,8 +115,8 @@ #include #include -#include "jasper/jas_types.h" #include "jasper/jas_debug.h" +#include "jasper/jas_types.h" /******************************************************************************\ * Local data. @@ -145,7 +145,7 @@ int jas_setdbglevel(int dbglevel) } /* Get the library debug level. */ -int jas_getdbglevel() +int jas_getdbglevel(void) { return jas_dbglevel; } @@ -169,8 +169,8 @@ int jas_eprintf(const char *fmt, ...) /* Dump memory to a stream. */ int jas_memdump(FILE *out, void *data, size_t len) { - int i; - int j; + unsigned int i; + unsigned int j; jpr_uchar_t *dp; dp = data; for (i = 0; i < len; i += 16) { diff --git a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_debug.h b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_debug.h index ab015eba18..a63e5a778c 100644 --- a/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_debug.h +++ b/src/add-ons/translators/jpeg2000/libjasper/jasper/jas_debug.h @@ -143,7 +143,7 @@ extern "C" { #endif /* Get the library debug level. */ -int jas_getdbglevel(); +int jas_getdbglevel(void); /* Set the library debug level. */ int jas_setdbglevel(int dbglevel); diff --git a/src/add-ons/translators/pcx/Jamfile b/src/add-ons/translators/pcx/Jamfile index c5dc7431e9..3a2ae9bd6e 100644 --- a/src/add-ons/translators/pcx/Jamfile +++ b/src/add-ons/translators/pcx/Jamfile @@ -6,15 +6,22 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; AddResources PCXTranslator : PCXTranslator.rdef ; -Translator PCXTranslator : - # PCXTranslator classes - main.cpp - PCXTranslator.cpp - ConfigView.cpp - PCX.cpp - : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) localestub - : true -; +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + Translator [ MultiArchDefaultGristFiles PCXTranslator ] : + # PCXTranslator classes + main.cpp + PCXTranslator.cpp + ConfigView.cpp + PCX.cpp + : be translation + [ MultiArchDefaultGristFiles libtranslatorsutils.a ] + $(TARGET_LIBSUPC++) localestub + : true + ; + } +} DoCatalogs PCXTranslator : x-vnd.Haiku-PCXTranslator diff --git a/src/add-ons/translators/png/Jamfile b/src/add-ons/translators/png/Jamfile index 37b6248db0..672ea1026c 100644 --- a/src/add-ons/translators/png/Jamfile +++ b/src/add-ons/translators/png/Jamfile @@ -2,8 +2,6 @@ SubDir HAIKU_TOP src add-ons translators png ; SetSubDirSupportedPlatformsBeOSCompatible ; -UseBuildFeatureHeaders libpng ; -UseBuildFeatureHeaders zlib ; SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; AddResources PNGTranslator : PNGTranslator.rdef ; @@ -12,21 +10,30 @@ if $(TARGET_GCC_VERSION_$(TARGET_PACKAGING_ARCH)[1]) = 2 { SubDirCcFlags -DPNG_NO_PEDANTIC_WARNINGS ; } -Includes [ FGristFiles PNGTranslator.cpp PNGView.cpp ] - : [ BuildFeatureAttribute libpng : headers ] ; +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + UseBuildFeatureHeaders libpng ; + UseBuildFeatureHeaders zlib ; -Translator PNGTranslator : - PNGMain.cpp - PNGTranslator.cpp - PNGView.cpp + Includes [ FGristFiles PNGTranslator.cpp PNGView.cpp ] + : [ BuildFeatureAttribute libpng : headers ] ; - : be translation - [ BuildFeatureAttribute libpng : library ] - [ BuildFeatureAttribute zlib : library ] - $(TARGET_LIBSUPC++) libtranslatorsutils.a - localestub - : true -; + Translator [ MultiArchDefaultGristFiles PNGTranslator ] : + PNGMain.cpp + PNGTranslator.cpp + PNGView.cpp + + : be translation + [ BuildFeatureAttribute libpng : library ] + [ BuildFeatureAttribute zlib : library ] + $(TARGET_LIBSUPC++) + [ MultiArchDefaultGristFiles libtranslatorsutils.a ] + localestub + : true + ; + } +} DoCatalogs PNGTranslator : x-vnd.Haiku-PNGTranslator diff --git a/src/add-ons/translators/ppm/Jamfile b/src/add-ons/translators/ppm/Jamfile index f29c39eda8..8006bcb1be 100644 --- a/src/add-ons/translators/ppm/Jamfile +++ b/src/add-ons/translators/ppm/Jamfile @@ -4,11 +4,16 @@ SetSubDirSupportedPlatformsBeOSCompatible ; AddResources PPMTranslator : PPMTranslator.rdef ; -Translator PPMTranslator - : PPMMain.cpp PPMTranslator.cpp colorspace.cpp - : be translation $(TARGET_LIBSUPC++) localestub - : true -; +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + Translator [ MultiArchDefaultGristFiles PPMTranslator ] + : PPMMain.cpp PPMTranslator.cpp colorspace.cpp + : be translation $(TARGET_LIBSUPC++) localestub + : true + ; + } +} DoCatalogs PPMTranslator : x-vnd.Haiku-PPMTranslator diff --git a/src/add-ons/translators/psd/Jamfile b/src/add-ons/translators/psd/Jamfile index b0a56a53c8..015236ae3a 100644 --- a/src/add-ons/translators/psd/Jamfile +++ b/src/add-ons/translators/psd/Jamfile @@ -6,15 +6,21 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; AddResources PSDTranslator : PSDTranslator.rdef ; -Translator PSDTranslator : - PSDTranslatorApp.cpp - PSDTranslator.cpp - PSDLoader.cpp - ConfigView.cpp - : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) - localestub - : true -; +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + Translator [ MultiArchDefaultGristFiles PSDTranslator ] : + PSDTranslatorApp.cpp + PSDTranslator.cpp + PSDLoader.cpp + ConfigView.cpp + : be translation + [ MultiArchDefaultGristFiles libtranslatorsutils.a ] + $(TARGET_LIBSUPC++) localestub + : true + ; + } +} DoCatalogs PSDTranslator : x-vnd.Haiku-PSDTranslator diff --git a/src/add-ons/translators/raw/Jamfile b/src/add-ons/translators/raw/Jamfile index e9a682a98c..4e0e860bfe 100644 --- a/src/add-ons/translators/raw/Jamfile +++ b/src/add-ons/translators/raw/Jamfile @@ -6,18 +6,24 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; AddResources RAWTranslator : RAWTranslator.rdef ; -Translator RAWTranslator : - # RawTranslator classes - main.cpp - RAWTranslator.cpp - ConfigView.cpp - RAW.cpp - : - be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) - localestub - : - true -; +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + Translator [ MultiArchDefaultGristFiles RAWTranslator ] : + # RawTranslator classes + main.cpp + RAWTranslator.cpp + ConfigView.cpp + RAW.cpp + : + be translation + [ MultiArchDefaultGristFiles libtranslatorsutils.a ] + $(TARGET_LIBSUPC++) localestub + : + true + ; + } +} DoCatalogs RAWTranslator : x-vnd.Haiku-RAWTranslator diff --git a/src/add-ons/translators/rtf/Jamfile b/src/add-ons/translators/rtf/Jamfile index 5da96912c9..95c665e686 100644 --- a/src/add-ons/translators/rtf/Jamfile +++ b/src/add-ons/translators/rtf/Jamfile @@ -10,17 +10,24 @@ UsePrivateHeaders shared storage ; AddResources RTFTranslator : RTFTranslator.rdef ; -Translator RTFTranslator : - main.cpp - ConfigView.cpp +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + Translator [ MultiArchDefaultGristFiles RTFTranslator ] : + main.cpp + ConfigView.cpp - convert.cpp - RTF.cpp - RTFTranslator.cpp + convert.cpp + RTF.cpp + RTFTranslator.cpp - : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) localestub - : true -; + : be translation + [ MultiArchDefaultGristFiles libtranslatorsutils.a ] + $(TARGET_LIBSUPC++) localestub + : true + ; + } +} DoCatalogs RTFTranslator : x-vnd.Haiku-RTFTranslator diff --git a/src/add-ons/translators/sgi/Jamfile b/src/add-ons/translators/sgi/Jamfile index d324e6f444..4c87437895 100644 --- a/src/add-ons/translators/sgi/Jamfile +++ b/src/add-ons/translators/sgi/Jamfile @@ -6,14 +6,21 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; AddResources SGITranslator : SGITranslator.rdef ; -Translator SGITranslator : - SGIImage.cpp - SGIMain.cpp - SGITranslator.cpp - SGIView.cpp - : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) localestub - : true -; +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + Translator [ MultiArchDefaultGristFiles SGITranslator ] : + SGIImage.cpp + SGIMain.cpp + SGITranslator.cpp + SGIView.cpp + : be translation + [ MultiArchDefaultGristFiles libtranslatorsutils.a ] + $(TARGET_LIBSUPC++) localestub + : true + ; + } +} DoCatalogs SGITranslator : x-vnd.Haiku-SGITranslator diff --git a/src/add-ons/translators/shared/Jamfile b/src/add-ons/translators/shared/Jamfile index 4384ac660e..012f0238f2 100644 --- a/src/add-ons/translators/shared/Jamfile +++ b/src/add-ons/translators/shared/Jamfile @@ -2,12 +2,17 @@ SubDir HAIKU_TOP src add-ons translators shared ; SetSubDirSupportedPlatformsBeOSCompatible ; -StaticLibrary libtranslatorsutils.a : - BaseTranslator.cpp - StreamBuffer.cpp - TranslatorSettings.cpp - TranslatorWindow.cpp -; +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + StaticLibrary [ MultiArchDefaultGristFiles libtranslatorsutils.a ] : + BaseTranslator.cpp + StreamBuffer.cpp + TranslatorSettings.cpp + TranslatorWindow.cpp + ; + } +} DoCatalogs libtranslatorsutils.a : x-pseudo.libtranslatorsutils diff --git a/src/add-ons/translators/stxt/Jamfile b/src/add-ons/translators/stxt/Jamfile index 4d185ca542..08dec881a9 100644 --- a/src/add-ons/translators/stxt/Jamfile +++ b/src/add-ons/translators/stxt/Jamfile @@ -10,14 +10,20 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; AddResources STXTTranslator : STXTTranslator.rdef ; -Translator STXTTranslator : - STXTMain.cpp - STXTTranslator.cpp - STXTView.cpp - : be translation libtextencoding.so libtranslatorsutils.a - $(TARGET_LIBSUPC++) localestub - : true -; +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + Translator [ MultiArchDefaultGristFiles STXTTranslator ] : + STXTMain.cpp + STXTTranslator.cpp + STXTView.cpp + : be translation textencoding + [ MultiArchDefaultGristFiles libtranslatorsutils.a ] + $(TARGET_LIBSUPC++) localestub + : true + ; + } +} DoCatalogs STXTTranslator : x-vnd.Haiku-STXTTranslator diff --git a/src/add-ons/translators/tga/Jamfile b/src/add-ons/translators/tga/Jamfile index 24ad561598..9bfc000736 100644 --- a/src/add-ons/translators/tga/Jamfile +++ b/src/add-ons/translators/tga/Jamfile @@ -6,13 +6,20 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; AddResources TGATranslator : TGATranslator.rdef ; -Translator TGATranslator : - TGAMain.cpp - TGATranslator.cpp - TGAView.cpp - : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) localestub - : true -; +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + Translator [ MultiArchDefaultGristFiles TGATranslator ] : + TGAMain.cpp + TGATranslator.cpp + TGAView.cpp + : be translation + [ MultiArchDefaultGristFiles libtranslatorsutils.a ] + $(TARGET_LIBSUPC++) localestub + : true + ; + } +} DoCatalogs TGATranslator : x-vnd.Haiku-TGATranslator diff --git a/src/add-ons/translators/tiff/Jamfile b/src/add-ons/translators/tiff/Jamfile index 6196768a01..b70ed817b4 100644 --- a/src/add-ons/translators/tiff/Jamfile +++ b/src/add-ons/translators/tiff/Jamfile @@ -8,18 +8,24 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; AddResources TIFFTranslator : TIFFTranslator.rdef ; -Translator TIFFTranslator : - # [ FGristFiles $(tiff_files:S=$(SUFOBJ)) ] +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + Translator [ MultiArchDefaultGristFiles TIFFTranslator ] : + # [ FGristFiles $(tiff_files:S=$(SUFOBJ)) ] - # TIFFTranslator classes - TIFFMain.cpp - TIFFTranslator.cpp - TIFFView.cpp + # TIFFTranslator classes + TIFFMain.cpp + TIFFTranslator.cpp + TIFFView.cpp - : be libtiff.so translation libtranslatorsutils.a $(TARGET_LIBSUPC++) - localestub - : true -; + : be libtiff.so translation + [ MultiArchDefaultGristFiles libtranslatorsutils.a ] + $(TARGET_LIBSUPC++) localestub + : true + ; + } +} DoCatalogs TIFFTranslator : x-vnd.Haiku-TIFFTranslator diff --git a/src/add-ons/translators/webp/Jamfile b/src/add-ons/translators/webp/Jamfile index a6d95fddb0..69a2469e37 100644 --- a/src/add-ons/translators/webp/Jamfile +++ b/src/add-ons/translators/webp/Jamfile @@ -7,20 +7,25 @@ SubDirHdrs [ FDirName $(SUBDIR) libwebp ] ; AddResources WebPTranslator : WebPTranslator.rdef ; -Translator WebPTranslator : +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + Translator [ MultiArchDefaultGristFiles WebPTranslator ] : - main.cpp + main.cpp - WebPTranslator.cpp - ConfigView.cpp + WebPTranslator.cpp + ConfigView.cpp - : - webpdecode.o - webpencode.o - be translation libtranslatorsutils.a - $(TARGET_LIBSUPC++) localestub - : true -; + : + webpdecode.o + webpencode.o + be translation [ MultiArchDefaultGristFiles libtranslatorsutils.a ] + $(TARGET_LIBSUPC++) localestub + : true + ; + } +} DoCatalogs WebPTranslator : x-vnd.Haiku-WebPTranslator diff --git a/src/add-ons/translators/wonderbrush/Jamfile b/src/add-ons/translators/wonderbrush/Jamfile index 58c8077991..917531593e 100644 --- a/src/add-ons/translators/wonderbrush/Jamfile +++ b/src/add-ons/translators/wonderbrush/Jamfile @@ -2,9 +2,6 @@ SubDir HAIKU_TOP src add-ons translators wonderbrush ; SetSubDirSupportedPlatformsBeOSCompatible ; -# Include support sub folder -SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators wonderbrush support ] ; - UseBuildFeatureHeaders zlib ; SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; @@ -13,25 +10,33 @@ AddResources WonderBrushTranslator : WonderBrushTranslator.rdef ; Includes [ FGristFiles bitmap_compression.cpp ] : [ BuildFeatureAttribute zlib : headers ] ; -Translator WonderBrushTranslator : - Canvas.cpp - Layer.cpp - WonderBrushImage.cpp - WonderBrushMain.cpp - WonderBrushTranslator.cpp - WonderBrushView.cpp +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + # Include support sub folder + SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators wonderbrush support ] ; - # support - bitmap_compression.cpp - blending.cpp - lab_convert.cpp + Translator [ MultiArchDefaultGristFiles WonderBrushTranslator ] : + Canvas.cpp + Layer.cpp + WonderBrushImage.cpp + WonderBrushMain.cpp + WonderBrushTranslator.cpp + WonderBrushView.cpp - : be translation - [ BuildFeatureAttribute zlib : library ] - libtranslatorsutils.a - $(TARGET_LIBSUPC++) localestub - : true -; + # support + bitmap_compression.cpp + blending.cpp + lab_convert.cpp + + : be translation + [ BuildFeatureAttribute zlib : library ] + [ MultiArchDefaultGristFiles libtranslatorsutils.a ] + $(TARGET_LIBSUPC++) localestub + : true + ; + } +} DoCatalogs WonderBrushTranslator : x-vnd.Haiku-WonderBrushTranslator