diff --git a/packages/fcl-base/fpmake.pp b/packages/fcl-base/fpmake.pp index f7a3f8270f..9b36a94a7f 100644 --- a/packages/fcl-base/fpmake.pp +++ b/packages/fcl-base/fpmake.pp @@ -137,6 +137,7 @@ begin P.Sources.AddSrcFiles('src/win/fclel.*', P.Directory); // Install windows resources P.InstallFiles.Add('src/win/fclel.res',AllWindowsOSes,'$(unitinstalldir)'); + T:=P.Targets.addUnit('basenenc.pp'); // Examples P.ExamplePath.Add('examples'); diff --git a/packages/rtl-extra/src/inc/basenenc.pp b/packages/fcl-base/src/basenenc.pp similarity index 98% rename from packages/rtl-extra/src/inc/basenenc.pp rename to packages/fcl-base/src/basenenc.pp index 40a1e60b0d..1287190ff4 100644 --- a/packages/rtl-extra/src/inc/basenenc.pp +++ b/packages/fcl-base/src/basenenc.pp @@ -19,9 +19,10 @@ unit basenenc; interface -uses Types, SysUtils; +uses SysUtils; Type + TBytes = Array of Byte; { TAlphabetEncoder } TReverseAlphabet = Array[0..255] of Byte; @@ -42,7 +43,7 @@ Type 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_'); Private FBits : Byte; - FAlphabet : TByteDynArray; + FAlphabet : TBytes; FReverse : TReverseAlphabet; FPadding : Integer; class var StdEncoders : Array[TStandardEncoder] of TAlphabetEncoder; @@ -74,7 +75,7 @@ Type // Bits per characters Property Bits : Byte Read FBits; // ASCII value of characters - Property Alphabet : TByteDynArray Read FAlphabet; + Property Alphabet : TBytes Read FAlphabet; // Reverse byte->character map Property Reverse : TReverseAlphabet Read FReverse; // Bits of padding diff --git a/packages/rtl-extra/fpmake.pp b/packages/rtl-extra/fpmake.pp index e01cf860cd..af31c75472 100644 --- a/packages/rtl-extra/fpmake.pp +++ b/packages/rtl-extra/fpmake.pp @@ -115,7 +115,6 @@ begin end; T:=P.Targets.AddUnit('objects.pp',ObjectsOSes); - T:=P.Targets.AddUnit('basenenc.pp'); T:=P.Targets.AddUnit('printer.pp',PrinterOSes); T.Dependencies.AddInclude('printerh.inc',PrinterOSes);