mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-10 19:35:58 +02:00
freetype: fixed name clash
git-svn-id: trunk@63582 -
This commit is contained in:
pascal
parent
ebe42a29a7
commit
c66efeda3a
4
.gitattributes
vendored
4
.gitattributes
vendored
@ -1873,8 +1873,8 @@ components/freetype/Makefile.compiled svneol=native#text/plain
|
||||
components/freetype/Makefile.fpc svneol=native#text/plain
|
||||
components/freetype/easylazfreetype.pas svneol=native#text/pascal
|
||||
components/freetype/fpmake.pp svneol=native#text/plain
|
||||
components/freetype/freetype.lpk svneol=native#text/plain
|
||||
components/freetype/freetype.pas svneol=native#text/plain
|
||||
components/freetype/freetypelaz.lpk svneol=native#text/plain
|
||||
components/freetype/freetypelaz.pas svneol=native#text/plain
|
||||
components/freetype/lazfreetype.pas svneol=native#text/pascal
|
||||
components/freetype/lazfreetypefontcollection.pas svneol=native#text/plain
|
||||
components/freetype/lazfreetypefpimagedrawer.pas svneol=native#text/pascal
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<CONFIG>
|
||||
<Makefile Value="2"/>
|
||||
<Params Value=" -Fu../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);. -MObjFPC -Scghi -O1 -g -gl -l -vewnhibq freetype.pas"/>
|
||||
<Params Value=" -Fu../../packager/units/$(CPU_TARGET)-$(OS_TARGET);../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET);. -MObjFPC -Scghi -O1 -g -gl -l -vewnhibq freetypelaz.pas"/>
|
||||
</CONFIG>
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
# File generated automatically by Lazarus Package Manager
|
||||
#
|
||||
# Makefile.fpc for freetype 1.0
|
||||
# Makefile.fpc for freetypelaz 1.0
|
||||
#
|
||||
# This file was generated on 14.07.2020
|
||||
# This file was generated on 17.07.2020
|
||||
|
||||
[package]
|
||||
name=freetype
|
||||
name=freetypelaz
|
||||
version=1.0
|
||||
|
||||
[compiler]
|
||||
@ -14,7 +14,7 @@ unitdir=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TA
|
||||
options= -MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS)
|
||||
|
||||
[target]
|
||||
units=freetype.pas
|
||||
units=freetypelaz.pas
|
||||
|
||||
[clean]
|
||||
files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \
|
||||
@ -53,12 +53,12 @@ endif
|
||||
.PHONY: cleartarget compiled all
|
||||
|
||||
cleartarget:
|
||||
-$(DEL) $(COMPILER_UNITTARGETDIR)/freetype$(PPUEXT)
|
||||
-$(DEL) $(COMPILER_UNITTARGETDIR)/freetypelaz$(PPUEXT)
|
||||
|
||||
compiled:
|
||||
$(CPPROG) -f Makefile.compiled $(COMPILER_UNITTARGETDIR)/freetype.compiled
|
||||
$(CPPROG) -f Makefile.compiled $(COMPILER_UNITTARGETDIR)/freetypelaz.compiled
|
||||
|
||||
all: cleartarget $(COMPILER_UNITTARGETDIR) freetype$(PPUEXT) compiled
|
||||
all: cleartarget $(COMPILER_UNITTARGETDIR) freetypelaz$(PPUEXT) compiled
|
||||
|
||||
distclean: clean
|
||||
${DELTREE} lib/*
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
{
|
||||
File generated automatically by Lazarus Package Manager
|
||||
Created with the Fppkgpackagemanager package installed
|
||||
|
||||
fpmake.pp for freetype 1.0
|
||||
fpmake.pp for freetypelaz 1.0
|
||||
|
||||
This file was generated on 14.07.2020
|
||||
This file was generated on 17.07.2020
|
||||
}
|
||||
|
||||
{$ifndef ALLPACKAGES}
|
||||
@ -13,7 +14,7 @@ program fpmake;
|
||||
uses fpmkunit;
|
||||
{$endif ALLPACKAGES}
|
||||
|
||||
procedure add_freetype(const ADirectory: string);
|
||||
procedure add_freetypelaz(const ADirectory: string);
|
||||
|
||||
var
|
||||
P : TPackage;
|
||||
@ -23,7 +24,7 @@ var
|
||||
begin
|
||||
with Installer do
|
||||
begin
|
||||
P:=AddPackage('freetype');
|
||||
P:=AddPackage('freetypelaz');
|
||||
P.Version:='1.0.0-0';
|
||||
|
||||
P.Directory:=ADirectory;
|
||||
@ -43,59 +44,64 @@ begin
|
||||
P.Options.Add('-l');
|
||||
P.Options.Add('-vewnhibq');
|
||||
P.UnitPath.Add('.');
|
||||
T:=P.Targets.AddUnit('freetype.pas');
|
||||
t.Dependencies.AddUnit('easylazfreetype');
|
||||
t.Dependencies.AddUnit('lazfreetype');
|
||||
t.Dependencies.AddUnit('lazfreetypefontcollection');
|
||||
t.Dependencies.AddUnit('lazfreetypefpimagedrawer');
|
||||
t.Dependencies.AddUnit('ttcache');
|
||||
t.Dependencies.AddUnit('ttcalc');
|
||||
t.Dependencies.AddUnit('ttcmap');
|
||||
t.Dependencies.AddUnit('ttdebug');
|
||||
t.Dependencies.AddUnit('tterror');
|
||||
t.Dependencies.AddUnit('ttfile');
|
||||
t.Dependencies.AddUnit('ttgload');
|
||||
t.Dependencies.AddUnit('ttinterp');
|
||||
t.Dependencies.AddUnit('ttkern');
|
||||
t.Dependencies.AddUnit('ttload');
|
||||
t.Dependencies.AddUnit('ttmemory');
|
||||
t.Dependencies.AddUnit('ttobjs');
|
||||
t.Dependencies.AddUnit('ttprofile');
|
||||
t.Dependencies.AddUnit('ttraster');
|
||||
t.Dependencies.AddUnit('tttables');
|
||||
t.Dependencies.AddUnit('tttypes');
|
||||
|
||||
T:=P.Targets.AddUnit('easylazfreetype.pas');
|
||||
T:=P.Targets.AddUnit('lazfreetype.pas');
|
||||
T:=P.Targets.AddUnit('lazfreetypefontcollection.pas');
|
||||
T:=P.Targets.AddUnit('lazfreetypefpimagedrawer.pas');
|
||||
T:=P.Targets.AddUnit('ttcache.pas');
|
||||
T:=P.Targets.AddUnit('ttcalc.pas');
|
||||
T:=P.Targets.AddUnit('ttcmap.pas');
|
||||
T:=P.Targets.AddUnit('ttdebug.pas');
|
||||
T:=P.Targets.AddUnit('tterror.pas');
|
||||
T:=P.Targets.AddUnit('ttfile.pas');
|
||||
T:=P.Targets.AddUnit('ttgload.pas');
|
||||
T:=P.Targets.AddUnit('ttinterp.pas');
|
||||
T:=P.Targets.AddUnit('ttkern.pas');
|
||||
T:=P.Targets.AddUnit('ttload.pas');
|
||||
T:=P.Targets.AddUnit('ttmemory.pas');
|
||||
T:=P.Targets.AddUnit('ttobjs.pas');
|
||||
T:=P.Targets.AddUnit('ttprofile.pas');
|
||||
T:=P.Targets.AddUnit('ttraster.pas');
|
||||
T:=P.Targets.AddUnit('tttables.pas');
|
||||
T:=P.Targets.AddUnit('tttypes.pas');
|
||||
T:=P.Targets.AddUnit('freetypelaz.pas');
|
||||
D := T.Dependencies.AddUnit('EasyLazFreeType');
|
||||
D := T.Dependencies.AddUnit('LazFreeType');
|
||||
D := T.Dependencies.AddUnit('LazFreeTypeFontCollection');
|
||||
D := T.Dependencies.AddUnit('LazFreeTypeFPImageDrawer');
|
||||
D := T.Dependencies.AddUnit('TTCache');
|
||||
D := T.Dependencies.AddUnit('TTCalc');
|
||||
D := T.Dependencies.AddInclude('ttcalc1.inc');
|
||||
D := T.Dependencies.AddInclude('ttcalc2.inc');
|
||||
D := T.Dependencies.AddInclude('ttcalc3.inc');
|
||||
D := T.Dependencies.AddInclude('ttcalc4.inc');
|
||||
D := T.Dependencies.AddUnit('TTCMap');
|
||||
D := T.Dependencies.AddInclude('ttconfig.inc');
|
||||
D := T.Dependencies.AddUnit('TTDebug');
|
||||
D := T.Dependencies.AddUnit('TTError');
|
||||
D := T.Dependencies.AddUnit('TTFile');
|
||||
D := T.Dependencies.AddUnit('TTGLoad');
|
||||
D := T.Dependencies.AddUnit('TTInterp');
|
||||
D := T.Dependencies.AddUnit('TTKern');
|
||||
D := T.Dependencies.AddUnit('TTLoad');
|
||||
D := T.Dependencies.AddUnit('TTMemory');
|
||||
D := T.Dependencies.AddUnit('TTObjs');
|
||||
D := T.Dependencies.AddUnit('TTProfile');
|
||||
D := T.Dependencies.AddUnit('TTRASTER');
|
||||
D := T.Dependencies.AddInclude('ttraster_sweep.inc');
|
||||
D := T.Dependencies.AddUnit('TTTables');
|
||||
D := T.Dependencies.AddUnit('TTTypes');
|
||||
T := P.Targets.AddImplicitUnit('easylazfreetype.pas');
|
||||
T := P.Targets.AddImplicitUnit('lazfreetype.pas');
|
||||
T := P.Targets.AddImplicitUnit('lazfreetypefontcollection.pas');
|
||||
T := P.Targets.AddImplicitUnit('lazfreetypefpimagedrawer.pas');
|
||||
T := P.Targets.AddImplicitUnit('ttcache.pas');
|
||||
T := P.Targets.AddImplicitUnit('ttcalc.pas');
|
||||
T := P.Targets.AddImplicitUnit('ttcmap.pas');
|
||||
T := P.Targets.AddImplicitUnit('ttdebug.pas');
|
||||
T := P.Targets.AddImplicitUnit('tterror.pas');
|
||||
T := P.Targets.AddImplicitUnit('ttfile.pas');
|
||||
T := P.Targets.AddImplicitUnit('ttgload.pas');
|
||||
T := P.Targets.AddImplicitUnit('ttinterp.pas');
|
||||
T := P.Targets.AddImplicitUnit('ttkern.pas');
|
||||
T := P.Targets.AddImplicitUnit('ttload.pas');
|
||||
T := P.Targets.AddImplicitUnit('ttmemory.pas');
|
||||
T := P.Targets.AddImplicitUnit('ttobjs.pas');
|
||||
T := P.Targets.AddImplicitUnit('ttprofile.pas');
|
||||
T := P.Targets.AddImplicitUnit('ttraster.pas');
|
||||
T := P.Targets.AddImplicitUnit('tttables.pas');
|
||||
T := P.Targets.AddImplicitUnit('tttypes.pas');
|
||||
|
||||
// copy the compiled file, so the IDE knows how the package was compiled
|
||||
P.Sources.AddSrc('freetype.compiled');
|
||||
P.InstallFiles.Add('freetype.compiled',AllOSes,'$(unitinstalldir)');
|
||||
P.Sources.AddSrc('freetypelaz.compiled');
|
||||
P.InstallFiles.Add('freetypelaz.compiled',AllOSes,'$(unitinstalldir)');
|
||||
|
||||
end;
|
||||
end;
|
||||
|
||||
{$ifndef ALLPACKAGES}
|
||||
begin
|
||||
add_freetype('');
|
||||
add_freetypelaz('');
|
||||
Installer.Run;
|
||||
end.
|
||||
{$endif ALLPACKAGES}
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
{ This file was automatically created by Lazarus. Do not edit!
|
||||
This source is only used to compile and install the package.
|
||||
}
|
||||
|
||||
unit freetype;
|
||||
|
||||
{$warn 5023 off : no warning about unused units}
|
||||
interface
|
||||
|
||||
uses
|
||||
EasyLazFreeType, LazFreeType, LazFreeTypeFontCollection,
|
||||
LazFreeTypeFPImageDrawer, TTCache, TTCalc, TTCMap, TTDebug, TTError, TTFile,
|
||||
TTGLoad, TTInterp, TTKern, TTLoad, TTMemory, TTObjs, TTProfile, TTRASTER,
|
||||
TTTables, TTTypes, LazarusPackageIntf;
|
||||
|
||||
implementation
|
||||
|
||||
procedure Register;
|
||||
begin
|
||||
end;
|
||||
|
||||
initialization
|
||||
RegisterPackage('freetype', @Register);
|
||||
end.
|
||||
@ -1,13 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<CONFIG>
|
||||
<Package Version="5">
|
||||
<Name Value="freetype"/>
|
||||
<Name Value="freetypelaz"/>
|
||||
<Type Value="RunAndDesignTime"/>
|
||||
<Author Value="David Turner, Robert Wilhelm and Werner Lemberg"/>
|
||||
<CompilerOptions>
|
||||
<Version Value="11"/>
|
||||
<SearchPaths>
|
||||
<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)/"/>
|
||||
<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
|
||||
</SearchPaths>
|
||||
<Other>
|
||||
<CustomOptions Value="$(IDEBuildOptions)"/>
|
||||
23
components/freetype/freetypelaz.pas
Normal file
23
components/freetype/freetypelaz.pas
Normal file
@ -0,0 +1,23 @@
|
||||
{ This file was automatically created by Lazarus. Do not edit!
|
||||
This source is only used to compile and install the package.
|
||||
}
|
||||
|
||||
unit freetypelaz;
|
||||
|
||||
{$warn 5023 off : no warning about unused units}
|
||||
interface
|
||||
|
||||
uses
|
||||
EasyLazFreeType, LazFreeType, LazFreeTypeFontCollection, LazFreeTypeFPImageDrawer, TTCache, TTCalc, TTCMap, TTDebug,
|
||||
TTError, TTFile, TTGLoad, TTInterp, TTKern, TTLoad, TTMemory, TTObjs, TTProfile, TTRASTER, TTTables, TTTypes,
|
||||
LazarusPackageIntf;
|
||||
|
||||
implementation
|
||||
|
||||
procedure Register;
|
||||
begin
|
||||
end;
|
||||
|
||||
initialization
|
||||
RegisterPackage('freetypelaz', @Register);
|
||||
end.
|
||||
@ -1189,7 +1189,8 @@
|
||||
</i18n>
|
||||
<RequiredPkgs Count="2">
|
||||
<Item1>
|
||||
<PackageName Value="freetype"/>
|
||||
<PackageName Value="freetypelaz"/>
|
||||
<MaxVersion Major="1"/>
|
||||
</Item1>
|
||||
<Item2>
|
||||
<PackageName Value="chm"/>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user