i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bring the hybrid translators back into the image.

Browse Source
This commit is contained in:
Adrien Destugues
2013-12-03 21:00:14 +01:00
parent 97f865f72a
commit 6d9f0064ff
25 changed files with 381 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/packages/HaikuSecondary
+3 -3
View File
@@ -22,12 +22,12 @@ if $(HAIKU_GCC_VERSION_$(architecture)[1]) = 2 {
# # add-ons # # add-ons
# local addOnsDir = add-ons $(architecture) ; local addOnsDir = add-ons $(architecture) ;
# #
# AddFilesToPackage $(addOnsDir) accelerants # AddFilesToPackage $(addOnsDir) accelerants
# : $(SYSTEM_ADD_ONS_ACCELERANTS) ; # : $(SYSTEM_ADD_ONS_ACCELERANTS) ;
# AddFilesToPackage $(addOnsDir) Translators AddFilesToPackage $(addOnsDir) Translators
# : $(SYSTEM_ADD_ONS_TRANSLATORS) ; : [ MultiArchDefaultGristFiles $(SYSTEM_ADD_ONS_TRANSLATORS) ] ;
# AddFilesToPackage $(addOnsDir) locale catalogs # AddFilesToPackage $(addOnsDir) locale catalogs
# : $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ; # : $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ;
# #
src/add-ons/translators/bmp/Jamfile
+9 -3
View File
@@ -6,14 +6,20 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
AddResources BMPTranslator : BMPTranslator.rdef ; AddResources BMPTranslator : BMPTranslator.rdef ;
Translator BMPTranslator : local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Translator [ MultiArchDefaultGristFiles BMPTranslator ] :
BMPMain.cpp BMPMain.cpp
BMPTranslator.cpp BMPTranslator.cpp
BMPView.cpp BMPView.cpp
: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) : be translation
localestub [ MultiArchDefaultGristFiles libtranslatorsutils.a ]
$(TARGET_LIBSUPC++) localestub
: true : true
; ;
}
}
DoCatalogs BMPTranslator : DoCatalogs BMPTranslator :
x-vnd.Haiku-BMPTranslator x-vnd.Haiku-BMPTranslator
src/add-ons/translators/exr/Jamfile
+8 -2
View File
@@ -9,16 +9,22 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
AddResources EXRTranslator : EXRTranslator.rdef ; AddResources EXRTranslator : EXRTranslator.rdef ;
Translator EXRTranslator : local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Translator [ MultiArchDefaultGristFiles EXRTranslator ] :
main.cpp main.cpp
ConfigView.cpp ConfigView.cpp
EXRGamma.cpp EXRGamma.cpp
EXRTranslator.cpp EXRTranslator.cpp
IStreamWrapper.cpp IStreamWrapper.cpp
: be translation libilmimf.so $(TARGET_LIBSTDC++) libtranslatorsutils.a : be translation textencoding $(TARGET_LIBSTDC++)
[ MultiArchDefaultGristFiles libtranslatorsutils.a libilmimf.so ]
localestub localestub
: true : true
; ;
}
}
DoCatalogs EXRTranslator : DoCatalogs EXRTranslator :
x-vnd.Haiku-EXRTranslator x-vnd.Haiku-EXRTranslator
src/add-ons/translators/gif/Jamfile
+7 -2
View File
@@ -6,7 +6,10 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
AddResources GIFTranslator : GIFTranslator.rdef ; AddResources GIFTranslator : GIFTranslator.rdef ;
Translator GIFTranslator : local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Translator [ MultiArchDefaultGristFiles GIFTranslator ] :
# Main Source # Main Source
GIFTranslator.cpp GIFTranslator.cpp
GIFView.cpp GIFView.cpp
@@ -19,9 +22,11 @@ Translator GIFTranslator :
SFHash.cpp SFHash.cpp
: :
be translation $(TARGET_LIBSUPC++) localestub be translation $(TARGET_LIBSUPC++) localestub
libtranslatorsutils.a [ MultiArchDefaultGristFiles libtranslatorsutils.a ]
: true : true
; ;
}
}
DoCatalogs GIFTranslator : DoCatalogs GIFTranslator :
x-vnd.Haiku-GIFTranslator x-vnd.Haiku-GIFTranslator
src/add-ons/translators/hpgs/Jamfile
+13 -5
View File
@@ -2,9 +2,6 @@ SubDir HAIKU_TOP src add-ons translators hpgs ;
SubDirSysHdrs [ FDirName $(SUBDIR) lib ] ; SubDirSysHdrs [ FDirName $(SUBDIR) lib ] ;
SubDirCcFlags -DHPGS_SHARED -std=c99 ; SubDirCcFlags -DHPGS_SHARED -std=c99 ;
UseLibraryHeaders iconv ;
UseBuildFeatureHeaders libpng ;
UseBuildFeatureHeaders zlib ;
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
local sources = local sources =
@@ -46,7 +43,15 @@ Includes [ FGristFiles hpgsimage.c ]
Includes [ FGristFiles hpgszostream.c ] Includes [ FGristFiles hpgszostream.c ]
: [ BuildFeatureAttribute zlib : headers ] ; : [ BuildFeatureAttribute zlib : headers ] ;
Translator HPGSTranslator :
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
UseLibraryHeaders iconv ;
UseBuildFeatureHeaders libpng ;
UseBuildFeatureHeaders zlib ;
Translator [ MultiArchDefaultGristFiles HPGSTranslator ] :
# HPGSTranslator classes # HPGSTranslator classes
ConfigView.cpp ConfigView.cpp
HPGSTranslator.cpp HPGSTranslator.cpp
@@ -54,9 +59,12 @@ Translator HPGSTranslator :
: be translation libtextencoding.so : be translation libtextencoding.so
[ BuildFeatureAttribute libpng : library ] [ BuildFeatureAttribute libpng : library ]
[ BuildFeatureAttribute zlib : library ] [ BuildFeatureAttribute zlib : library ]
libtranslatorsutils.a $(TARGET_LIBSUPC++) localestub [ MultiArchDefaultGristFiles libtranslatorsutils.a ]
$(TARGET_LIBSUPC++) localestub
: true : true
; ;
}
}
DoCatalogs HPGSTranslator : DoCatalogs HPGSTranslator :
x-vnd.Haiku-HPGSTranslator x-vnd.Haiku-HPGSTranslator
src/add-ons/translators/hvif/Jamfile
+9 -3
View File
@@ -4,14 +4,20 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
AddResources HVIFTranslator : HVIFTranslator.rdef ; AddResources HVIFTranslator : HVIFTranslator.rdef ;
Translator HVIFTranslator : local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Translator [ MultiArchDefaultGristFiles HVIFTranslator ] :
HVIFMain.cpp HVIFMain.cpp
HVIFTranslator.cpp HVIFTranslator.cpp
HVIFView.cpp HVIFView.cpp
: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) : be translation
localestub [ MultiArchDefaultGristFiles libtranslatorsutils.a ]
$(TARGET_LIBSUPC++) localestub
: true : true
; ;
}
}
DoCatalogs HVIFTranslator : DoCatalogs HVIFTranslator :
x-vnd.Haiku-HVIFTranslator x-vnd.Haiku-HVIFTranslator
src/add-ons/translators/icns/Jamfile
+14 -8
View File
@@ -2,18 +2,12 @@ SubDir HAIKU_TOP src add-ons translators icns ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
UseBuildFeatureHeaders libpng ;
SubDirSysHdrs [ FDirName $(SUBDIR) openjpeg ] ; SubDirSysHdrs [ FDirName $(SUBDIR) openjpeg ] ;
SubDirSysHdrs [ FDirName $(SUBDIR) libicns ] ; SubDirSysHdrs [ FDirName $(SUBDIR) libicns ] ;
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
#for BaseTranslator.h and friends #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 ] ; SubDirC++Flags [ FDefines BEOS_R5_COMPATIBLE ] ;
local openjpeg_files = local openjpeg_files =
@@ -63,7 +57,15 @@ ObjectCcFlags [ FGristFiles $(libicns_files:S=$(SUFOBJ)) ] : -w ;
AddResources ICNSTranslator : ICNSTranslator.rdef ; 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 ] ;
UseBuildFeatureHeaders libpng ;
Translator [ MultiArchDefaultGristFiles ICNSTranslator ] :
# ICNSTranslator # ICNSTranslator
ICNSTranslator.cpp ICNSTranslator.cpp
@@ -75,11 +77,15 @@ Translator ICNSTranslator :
$(libicns_files) $(libicns_files)
: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) : be translation
[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
$(TARGET_LIBSUPC++)
[ BuildFeatureAttribute libpng : library ] [ BuildFeatureAttribute libpng : library ]
localestub localestub
: true : true
; ;
}
}
DoCatalogs ICNSTranslator : DoCatalogs ICNSTranslator :
x-vnd.Haiku-ICNSTranslator x-vnd.Haiku-ICNSTranslator
src/add-ons/translators/ico/Jamfile
+9 -2
View File
@@ -6,16 +6,23 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
AddResources ICOTranslator : ICOTranslator.rdef ; AddResources ICOTranslator : ICOTranslator.rdef ;
Translator ICOTranslator : local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Translator [ MultiArchDefaultGristFiles ICOTranslator ] :
# ICOTranslator classes # ICOTranslator classes
main.cpp main.cpp
ICOTranslator.cpp ICOTranslator.cpp
ConfigView.cpp ConfigView.cpp
ICO.cpp ICO.cpp
: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) : be translation
[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
$(TARGET_LIBSUPC++)
localestub localestub
: true : true
; ;
}
}
DoCatalogs ICOTranslator : DoCatalogs ICOTranslator :
x-vnd.Haiku-ICOTranslator x-vnd.Haiku-ICOTranslator
src/add-ons/translators/jpeg/Jamfile
+8 -2
View File
@@ -16,17 +16,23 @@ Includes [ FGristFiles be_jdatadst.cpp be_jdatasrc.cpp be_jerror.cpp
JPEGTranslator.cpp ] JPEGTranslator.cpp ]
: [ BuildFeatureAttribute jpeg : headers ] ; : [ BuildFeatureAttribute jpeg : headers ] ;
Translator JPEGTranslator : local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Translator [ MultiArchDefaultGristFiles JPEGTranslator ] :
be_jdatadst.cpp be_jdatadst.cpp
be_jdatasrc.cpp be_jdatasrc.cpp
be_jerror.cpp be_jerror.cpp
exif_parser.cpp exif_parser.cpp
JPEGTranslator.cpp JPEGTranslator.cpp
: be translation libtranslatorsutils.a : be translation
[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
[ BuildFeatureAttribute jpeg : library ] [ BuildFeatureAttribute jpeg : library ]
$(TARGET_LIBSTDC++) localestub $(TARGET_LIBSTDC++) localestub
: true : true
; ;
}
}
DoCatalogs JPEGTranslator : DoCatalogs JPEGTranslator :
x-vnd.Haiku-JPEGTranslator x-vnd.Haiku-JPEGTranslator
src/add-ons/translators/jpeg2000/Jamfile
+14 -8
View File
@@ -15,9 +15,6 @@ CCFLAGS += -DEXCLUDE_MIF_SUPPORT
-DEXCLUDE_JPG_SUPPORT -DEXCLUDE_JPG_SUPPORT
-DEXCLUDE_PGX_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 ] ; SubDirC++Flags [ FDefines BEOS_R5_COMPATIBLE ] ;
local jasper_files = local jasper_files =
@@ -60,21 +57,30 @@ local jasper_files =
jpc_util.c jpc_util.c
; ;
ObjectCcFlags [ FGristFiles $(jasper_files:S=$(SUFOBJ)) ] : -w ;
AddResources JPEG2000Translator : JPEG2000Translator.rdef ; 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 ] ;
ObjectCcFlags [ FGristFiles $(jasper_files:S=$(SUFOBJ)) ] : -w ;
Translator [ MultiArchDefaultGristFiles JPEG2000Translator ] :
# JPEG2000Translator # JPEG2000Translator
JPEG2000Translator.cpp JPEG2000Translator.cpp
$(jasper_files) $(jasper_files)
: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) : be translation
localestub [ MultiArchDefaultGristFiles libtranslatorsutils.a ]
$(TARGET_LIBSUPC++) localestub
: true : true
; ;
}
}
DoCatalogs JPEG2000Translator : DoCatalogs JPEG2000Translator :
x-vnd.Haiku-JPEG2000Translator x-vnd.Haiku-JPEG2000Translator
src/add-ons/translators/jpeg2000/libjasper/jas_debug.c
+4 -4
View File
@@ -115,8 +115,8 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include "jasper/jas_types.h"
#include "jasper/jas_debug.h" #include "jasper/jas_debug.h"
#include "jasper/jas_types.h"
/******************************************************************************\ /******************************************************************************\
* Local data. * Local data.
@@ -145,7 +145,7 @@ int jas_setdbglevel(int dbglevel)
} }
/* Get the library debug level. */ /* Get the library debug level. */
int jas_getdbglevel() int jas_getdbglevel(void)
{ {
return jas_dbglevel; return jas_dbglevel;
} }
@@ -169,8 +169,8 @@ int jas_eprintf(const char *fmt, ...)
/* Dump memory to a stream. */ /* Dump memory to a stream. */
int jas_memdump(FILE *out, void *data, size_t len) int jas_memdump(FILE *out, void *data, size_t len)
{ {
int i; unsigned int i;
int j; unsigned int j;
jpr_uchar_t *dp; jpr_uchar_t *dp;
dp = data; dp = data;
for (i = 0; i < len; i += 16) { for (i = 0; i < len; i += 16) {
src/add-ons/translators/jpeg2000/libjasper/jasper/jas_debug.h
+1 -1
View File
@@ -143,7 +143,7 @@ extern "C" {
#endif #endif
/* Get the library debug level. */ /* Get the library debug level. */
int jas_getdbglevel(); int jas_getdbglevel(void);
/* Set the library debug level. */ /* Set the library debug level. */
int jas_setdbglevel(int dbglevel); int jas_setdbglevel(int dbglevel);
src/add-ons/translators/pcx/Jamfile
+9 -2
View File
@@ -6,15 +6,22 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
AddResources PCXTranslator : PCXTranslator.rdef ; AddResources PCXTranslator : PCXTranslator.rdef ;
Translator PCXTranslator : local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Translator [ MultiArchDefaultGristFiles PCXTranslator ] :
# PCXTranslator classes # PCXTranslator classes
main.cpp main.cpp
PCXTranslator.cpp PCXTranslator.cpp
ConfigView.cpp ConfigView.cpp
PCX.cpp PCX.cpp
: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) localestub : be translation
[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
$(TARGET_LIBSUPC++) localestub
: true : true
; ;
}
}
DoCatalogs PCXTranslator : DoCatalogs PCXTranslator :
x-vnd.Haiku-PCXTranslator x-vnd.Haiku-PCXTranslator
src/add-ons/translators/png/Jamfile
+11 -4
View File
@@ -2,8 +2,6 @@ SubDir HAIKU_TOP src add-ons translators png ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
UseBuildFeatureHeaders libpng ;
UseBuildFeatureHeaders zlib ;
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
AddResources PNGTranslator : PNGTranslator.rdef ; AddResources PNGTranslator : PNGTranslator.rdef ;
@@ -12,10 +10,16 @@ if $(TARGET_GCC_VERSION_$(TARGET_PACKAGING_ARCH)[1]) = 2 {
SubDirCcFlags -DPNG_NO_PEDANTIC_WARNINGS ; SubDirCcFlags -DPNG_NO_PEDANTIC_WARNINGS ;
} }
local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
UseBuildFeatureHeaders libpng ;
UseBuildFeatureHeaders zlib ;
Includes [ FGristFiles PNGTranslator.cpp PNGView.cpp ] Includes [ FGristFiles PNGTranslator.cpp PNGView.cpp ]
: [ BuildFeatureAttribute libpng : headers ] ; : [ BuildFeatureAttribute libpng : headers ] ;
Translator PNGTranslator : Translator [ MultiArchDefaultGristFiles PNGTranslator ] :
PNGMain.cpp PNGMain.cpp
PNGTranslator.cpp PNGTranslator.cpp
PNGView.cpp PNGView.cpp
@@ -23,10 +27,13 @@ Translator PNGTranslator :
: be translation : be translation
[ BuildFeatureAttribute libpng : library ] [ BuildFeatureAttribute libpng : library ]
[ BuildFeatureAttribute zlib : library ] [ BuildFeatureAttribute zlib : library ]
$(TARGET_LIBSUPC++) libtranslatorsutils.a $(TARGET_LIBSUPC++)
[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
localestub localestub
: true : true
; ;
}
}
DoCatalogs PNGTranslator : DoCatalogs PNGTranslator :
x-vnd.Haiku-PNGTranslator x-vnd.Haiku-PNGTranslator
src/add-ons/translators/ppm/Jamfile
+6 -1
View File
@@ -4,11 +4,16 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
AddResources PPMTranslator : PPMTranslator.rdef ; AddResources PPMTranslator : PPMTranslator.rdef ;
Translator PPMTranslator local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Translator [ MultiArchDefaultGristFiles PPMTranslator ]
: PPMMain.cpp PPMTranslator.cpp colorspace.cpp : PPMMain.cpp PPMTranslator.cpp colorspace.cpp
: be translation $(TARGET_LIBSUPC++) localestub : be translation $(TARGET_LIBSUPC++) localestub
: true : true
; ;
}
}
DoCatalogs PPMTranslator : DoCatalogs PPMTranslator :
x-vnd.Haiku-PPMTranslator x-vnd.Haiku-PPMTranslator
src/add-ons/translators/psd/Jamfile
+9 -3
View File
@@ -6,15 +6,21 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
AddResources PSDTranslator : PSDTranslator.rdef ; AddResources PSDTranslator : PSDTranslator.rdef ;
Translator PSDTranslator : local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Translator [ MultiArchDefaultGristFiles PSDTranslator ] :
PSDTranslatorApp.cpp PSDTranslatorApp.cpp
PSDTranslator.cpp PSDTranslator.cpp
PSDLoader.cpp PSDLoader.cpp
ConfigView.cpp ConfigView.cpp
: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) : be translation
localestub [ MultiArchDefaultGristFiles libtranslatorsutils.a ]
$(TARGET_LIBSUPC++) localestub
: true : true
; ;
}
}
DoCatalogs PSDTranslator : DoCatalogs PSDTranslator :
x-vnd.Haiku-PSDTranslator x-vnd.Haiku-PSDTranslator
src/add-ons/translators/raw/Jamfile
+9 -3
View File
@@ -6,18 +6,24 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
AddResources RAWTranslator : RAWTranslator.rdef ; AddResources RAWTranslator : RAWTranslator.rdef ;
Translator RAWTranslator : local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Translator [ MultiArchDefaultGristFiles RAWTranslator ] :
# RawTranslator classes # RawTranslator classes
main.cpp main.cpp
RAWTranslator.cpp RAWTranslator.cpp
ConfigView.cpp ConfigView.cpp
RAW.cpp RAW.cpp
: :
be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) be translation
localestub [ MultiArchDefaultGristFiles libtranslatorsutils.a ]
$(TARGET_LIBSUPC++) localestub
: :
true true
; ;
}
}
DoCatalogs RAWTranslator : DoCatalogs RAWTranslator :
x-vnd.Haiku-RAWTranslator x-vnd.Haiku-RAWTranslator
src/add-ons/translators/rtf/Jamfile
+9 -2
View File
@@ -10,7 +10,10 @@ UsePrivateHeaders shared storage ;
AddResources RTFTranslator : RTFTranslator.rdef ; AddResources RTFTranslator : RTFTranslator.rdef ;
Translator RTFTranslator : local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Translator [ MultiArchDefaultGristFiles RTFTranslator ] :
main.cpp main.cpp
ConfigView.cpp ConfigView.cpp
@@ -18,9 +21,13 @@ Translator RTFTranslator :
RTF.cpp RTF.cpp
RTFTranslator.cpp RTFTranslator.cpp
: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) localestub : be translation
[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
$(TARGET_LIBSUPC++) localestub
: true : true
; ;
}
}
DoCatalogs RTFTranslator : DoCatalogs RTFTranslator :
x-vnd.Haiku-RTFTranslator x-vnd.Haiku-RTFTranslator
src/add-ons/translators/sgi/Jamfile
+9 -2
View File
@@ -6,14 +6,21 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
AddResources SGITranslator : SGITranslator.rdef ; AddResources SGITranslator : SGITranslator.rdef ;
Translator SGITranslator : local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Translator [ MultiArchDefaultGristFiles SGITranslator ] :
SGIImage.cpp SGIImage.cpp
SGIMain.cpp SGIMain.cpp
SGITranslator.cpp SGITranslator.cpp
SGIView.cpp SGIView.cpp
: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) localestub : be translation
[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
$(TARGET_LIBSUPC++) localestub
: true : true
; ;
}
}
DoCatalogs SGITranslator : DoCatalogs SGITranslator :
x-vnd.Haiku-SGITranslator x-vnd.Haiku-SGITranslator
src/add-ons/translators/shared/Jamfile
+6 -1
View File
@@ -2,12 +2,17 @@ SubDir HAIKU_TOP src add-ons translators shared ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
StaticLibrary libtranslatorsutils.a : local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
StaticLibrary [ MultiArchDefaultGristFiles libtranslatorsutils.a ] :
BaseTranslator.cpp BaseTranslator.cpp
StreamBuffer.cpp StreamBuffer.cpp
TranslatorSettings.cpp TranslatorSettings.cpp
TranslatorWindow.cpp TranslatorWindow.cpp
; ;
}
}
DoCatalogs libtranslatorsutils.a : DoCatalogs libtranslatorsutils.a :
x-pseudo.libtranslatorsutils x-pseudo.libtranslatorsutils
src/add-ons/translators/stxt/Jamfile
+8 -2
View File
@@ -10,14 +10,20 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
AddResources STXTTranslator : STXTTranslator.rdef ; AddResources STXTTranslator : STXTTranslator.rdef ;
Translator STXTTranslator : local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Translator [ MultiArchDefaultGristFiles STXTTranslator ] :
STXTMain.cpp STXTMain.cpp
STXTTranslator.cpp STXTTranslator.cpp
STXTView.cpp STXTView.cpp
: be translation libtextencoding.so libtranslatorsutils.a : be translation textencoding
[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
$(TARGET_LIBSUPC++) localestub $(TARGET_LIBSUPC++) localestub
: true : true
; ;
}
}
DoCatalogs STXTTranslator : DoCatalogs STXTTranslator :
x-vnd.Haiku-STXTTranslator x-vnd.Haiku-STXTTranslator
src/add-ons/translators/tga/Jamfile
+9 -2
View File
@@ -6,13 +6,20 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
AddResources TGATranslator : TGATranslator.rdef ; AddResources TGATranslator : TGATranslator.rdef ;
Translator TGATranslator : local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Translator [ MultiArchDefaultGristFiles TGATranslator ] :
TGAMain.cpp TGAMain.cpp
TGATranslator.cpp TGATranslator.cpp
TGAView.cpp TGAView.cpp
: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) localestub : be translation
[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
$(TARGET_LIBSUPC++) localestub
: true : true
; ;
}
}
DoCatalogs TGATranslator : DoCatalogs TGATranslator :
x-vnd.Haiku-TGATranslator x-vnd.Haiku-TGATranslator
src/add-ons/translators/tiff/Jamfile
+9 -3
View File
@@ -8,7 +8,10 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
AddResources TIFFTranslator : TIFFTranslator.rdef ; AddResources TIFFTranslator : TIFFTranslator.rdef ;
Translator TIFFTranslator : local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Translator [ MultiArchDefaultGristFiles TIFFTranslator ] :
# [ FGristFiles $(tiff_files:S=$(SUFOBJ)) ] # [ FGristFiles $(tiff_files:S=$(SUFOBJ)) ]
# TIFFTranslator classes # TIFFTranslator classes
@@ -16,10 +19,13 @@ Translator TIFFTranslator :
TIFFTranslator.cpp TIFFTranslator.cpp
TIFFView.cpp TIFFView.cpp
: be libtiff.so translation libtranslatorsutils.a $(TARGET_LIBSUPC++) : be libtiff.so translation
localestub [ MultiArchDefaultGristFiles libtranslatorsutils.a ]
$(TARGET_LIBSUPC++) localestub
: true : true
; ;
}
}
DoCatalogs TIFFTranslator : DoCatalogs TIFFTranslator :
x-vnd.Haiku-TIFFTranslator x-vnd.Haiku-TIFFTranslator
src/add-ons/translators/webp/Jamfile
+7 -2
View File
@@ -7,7 +7,10 @@ SubDirHdrs [ FDirName $(SUBDIR) libwebp ] ;
AddResources WebPTranslator : WebPTranslator.rdef ; AddResources WebPTranslator : WebPTranslator.rdef ;
Translator WebPTranslator : local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
Translator [ MultiArchDefaultGristFiles WebPTranslator ] :
main.cpp main.cpp
@@ -17,10 +20,12 @@ Translator WebPTranslator :
: :
<libwebp>webpdecode.o <libwebp>webpdecode.o
<libwebp>webpencode.o <libwebp>webpencode.o
be translation libtranslatorsutils.a be translation [ MultiArchDefaultGristFiles libtranslatorsutils.a ]
$(TARGET_LIBSUPC++) localestub $(TARGET_LIBSUPC++) localestub
: true : true
; ;
}
}
DoCatalogs WebPTranslator : DoCatalogs WebPTranslator :
x-vnd.Haiku-WebPTranslator x-vnd.Haiku-WebPTranslator
src/add-ons/translators/wonderbrush/Jamfile
+10 -5
View File
@@ -2,9 +2,6 @@ SubDir HAIKU_TOP src add-ons translators wonderbrush ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
# Include support sub folder
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators wonderbrush support ] ;
UseBuildFeatureHeaders zlib ; UseBuildFeatureHeaders zlib ;
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
@@ -13,7 +10,13 @@ AddResources WonderBrushTranslator : WonderBrushTranslator.rdef ;
Includes [ FGristFiles bitmap_compression.cpp ] Includes [ FGristFiles bitmap_compression.cpp ]
: [ BuildFeatureAttribute zlib : headers ] ; : [ BuildFeatureAttribute zlib : headers ] ;
Translator WonderBrushTranslator : local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) {
# Include support sub folder
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators wonderbrush support ] ;
Translator [ MultiArchDefaultGristFiles WonderBrushTranslator ] :
Canvas.cpp Canvas.cpp
Layer.cpp Layer.cpp
WonderBrushImage.cpp WonderBrushImage.cpp
@@ -28,10 +31,12 @@ Translator WonderBrushTranslator :
: be translation : be translation
[ BuildFeatureAttribute zlib : library ] [ BuildFeatureAttribute zlib : library ]
libtranslatorsutils.a [ MultiArchDefaultGristFiles libtranslatorsutils.a ]
$(TARGET_LIBSUPC++) localestub $(TARGET_LIBSUPC++) localestub
: true : true
; ;
}
}
DoCatalogs WonderBrushTranslator : DoCatalogs WonderBrushTranslator :
x-vnd.Haiku-WonderBrushTranslator x-vnd.Haiku-WonderBrushTranslator