* enable gtk2 for android, based on a patch (adapated to 3.3.1) by Alfred Glänzer in #40994

This commit is contained in:
florian 2024-11-05 21:47:51 +01:00
parent d9ec917586
commit 4784c141e3
4 changed files with 12 additions and 12 deletions

View File

@ -20,7 +20,7 @@ begin
P.Author := 'Library: University of Southern California + Red Hat Inc., header: Luiz AmXrico Pereira CXmara'; P.Author := 'Library: University of Southern California + Red Hat Inc., header: Luiz AmXrico Pereira CXmara';
P.License := 'Library: MPL 1.1 + LGPL-2.1, header: LGPL with modification, '; P.License := 'Library: MPL 1.1 + LGPL-2.1, header: LGPL with modification, ';
P.HomepageURL := 'www.freepascal.org'; P.HomepageURL := 'www.freepascal.org';
P.OSes := [beos,haiku,freebsd,solaris,netbsd,openbsd,linux,win32,win64,aix,dragonfly]; P.OSes := [beos,haiku,freebsd,solaris,netbsd,openbsd,linux,win32,win64,aix,dragonfly,android];
// Do not build cairo on iPhone (=arm-darwin) // Do not build cairo on iPhone (=arm-darwin)
if Defaults.CPU<>arm then if Defaults.CPU<>arm then
P.OSes := P.OSes + [darwin]; P.OSes := P.OSes + [darwin];

View File

@ -236,20 +236,20 @@ begin
begin begin
AddUnit('fpimage'); AddUnit('fpimage');
end; end;
T:=P.Targets.AddUnit('freetypeh.pp',[solaris,iphonesim,ios,darwin,freebsd,openbsd,netbsd,linux,haiku,beos,win32,win64,aix,dragonfly]); T:=P.Targets.AddUnit('freetypeh.pp',[solaris,iphonesim,ios,darwin,freebsd,openbsd,netbsd,linux,haiku,beos,win32,win64,aix,dragonfly,android]);
T.CPUS:=T.CPUS-[wasm32]; T.CPUS:=T.CPUS-[wasm32];
T.Dependencies.AddInclude('libfreetype.inc'); T.Dependencies.AddInclude('libfreetype.inc');
T:=P.Targets.AddUnit('freetypehdyn.pp',[solaris,iphonesim,ios,darwin,freebsd,openbsd,netbsd,linux,haiku,beos,win32,win64,aix,dragonfly]); T:=P.Targets.AddUnit('freetypehdyn.pp',[solaris,iphonesim,ios,darwin,freebsd,openbsd,netbsd,linux,haiku,beos,win32,win64,aix,dragonfly,android]);
T.ResourceStrings:=true; T.ResourceStrings:=true;
T.CPUS:=T.CPUS-[wasm32]; T.CPUS:=T.CPUS-[wasm32];
T.Dependencies.AddInclude('libfreetype.inc'); T.Dependencies.AddInclude('libfreetype.inc');
T:=P.Targets.AddUnit('freetype.pp',[solaris,iphonesim,ios,darwin,freebsd,openbsd,netbsd,linux,haiku,beos,win32,win64,aix,dragonfly]); T:=P.Targets.AddUnit('freetype.pp',[solaris,iphonesim,ios,darwin,freebsd,openbsd,netbsd,linux,haiku,beos,win32,win64,aix,dragonfly,android]);
with T.Dependencies do with T.Dependencies do
begin begin
AddUnit('freetypeh'); AddUnit('freetypeh');
AddUnit('fpimgcmn'); AddUnit('fpimgcmn');
end; end;
T:=P.Targets.AddUnit('ftfont.pp',[solaris,iphonesim,ios,darwin,freebsd,openbsd,netbsd,linux,haiku,beos,win32,win64,aix,dragonfly]); T:=P.Targets.AddUnit('ftfont.pp',[solaris,iphonesim,ios,darwin,freebsd,openbsd,netbsd,linux,haiku,beos,win32,win64,aix,dragonfly,android]);
with T.Dependencies do with T.Dependencies do
begin begin
AddUnit('fpcanvas'); AddUnit('fpcanvas');

View File

@ -18,7 +18,7 @@ begin
{$endif ALLPACKAGES} {$endif ALLPACKAGES}
P.Version:='3.3.1'; P.Version:='3.3.1';
P.SupportBuildModes := [bmOneByOne]; P.SupportBuildModes := [bmOneByOne];
P.OSes:=AllUnixOSes+[Win32,Win64]-[darwin,iphonesim,ios,Android]; P.OSes:=AllUnixOSes+[Win32,Win64]-[darwin,iphonesim,ios];
if Defaults.CPU<>arm then if Defaults.CPU<>arm then
P.OSes := P.OSes + [darwin]; P.OSes := P.OSes + [darwin];

View File

@ -18,7 +18,7 @@ begin
P.Directory:=ADirectory; P.Directory:=ADirectory;
{$endif ALLPACKAGES} {$endif ALLPACKAGES}
P.Version:='3.3.1'; P.Version:='3.3.1';
P.OSes:=[beos,haiku,freebsd,solaris,netbsd,openbsd,linux,os2,emx,aix,dragonfly]; P.OSes:=[beos,haiku,freebsd,solaris,netbsd,openbsd,linux,os2,emx,aix,dragonfly,android];
// Do not build x11 on iPhone (=arm-darwin) // Do not build x11 on iPhone (=arm-darwin)
if Defaults.CPU<>arm then if Defaults.CPU<>arm then
P.OSes := P.OSes + [darwin]; P.OSes := P.OSes + [darwin];