Skip to content

Commit 8b7f105

Browse files
lmbelolmbelo
committed
Fixing Android compiler hpp error #4
Former-commit-id: 02fa29e191fd46bedd9d7d0358b22d6ad5bfb889 [formerly 4635117f59a1eead94d603a01c064c86dfdafff1] [formerly 6c03ac1815cbadeb8229a2211107ce9a5b930367 [formerly 868a1c800fb4a26f5c0789c2d0c88e9ab82b469c]] Former-commit-id: e341777fd63c675915be0664c9f9aa128794883b [formerly 342fa04503974a82039a2e46aa3fdace66aec8cf] Former-commit-id: ac17961594f9001e04fc2548d257f0f68389a43c Former-commit-id: 4725ef6
1 parent 78bb676 commit 8b7f105

9 files changed

Lines changed: 1541 additions & 1443 deletions

‎packages/P4DEnvironment.dpk‎

Lines changed: 47 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,53 @@
11
package P4DEnvironment;
22

33
{$R *.res}
4-
{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
5-
{$ALIGN 8}
6-
{$ASSERTIONS ON}
7-
{$BOOLEVAL OFF}
8-
{$DEBUGINFO OFF}
9-
{$EXTENDEDSYNTAX ON}
10-
{$IMPORTEDDATA ON}
11-
{$IOCHECKS ON}
12-
{$LOCALSYMBOLS OFF}
13-
{$LONGSTRINGS ON}
14-
{$OPENSTRINGS ON}
15-
{$OPTIMIZATION ON}
16-
{$OVERFLOWCHECKS OFF}
17-
{$RANGECHECKS OFF}
18-
{$REFERENCEINFO OFF}
19-
{$SAFEDIVIDE OFF}
20-
{$STACKFRAMES OFF}
21-
{$TYPEDADDRESS OFF}
22-
{$VARSTRINGCHECKS ON}
23-
{$WRITEABLECONST OFF}
24-
{$MINENUMSIZE 1}
25-
{$IMAGEBASE $400000}
26-
{$DEFINE RELEASE}
27-
{$ENDIF IMPLICITBUILDING}
28-
{$LIBSUFFIX AUTO}
29-
{$RUNONLY}
30-
{$IMPLICITBUILD ON}
31-
4+
{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
5+
{$ALIGN 8}
6+
{$ASSERTIONS ON}
7+
{$BOOLEVAL OFF}
8+
{$DEBUGINFO OFF}
9+
{$EXTENDEDSYNTAX ON}
10+
{$IMPORTEDDATA ON}
11+
{$IOCHECKS ON}
12+
{$LOCALSYMBOLS OFF}
13+
{$LONGSTRINGS ON}
14+
{$OPENSTRINGS ON}
15+
{$OPTIMIZATION ON}
16+
{$OVERFLOWCHECKS OFF}
17+
{$RANGECHECKS OFF}
18+
{$REFERENCEINFO OFF}
19+
{$SAFEDIVIDE OFF}
20+
{$STACKFRAMES OFF}
21+
{$TYPEDADDRESS OFF}
22+
{$VARSTRINGCHECKS ON}
23+
{$WRITEABLECONST OFF}
24+
{$MINENUMSIZE 1}
25+
{$DEFINE RELEASE}
26+
{$ENDIF IMPLICITBUILDING}
27+
{$LIBSUFFIX AUTO}
28+
{$RUNONLY}
29+
{$IMPLICITBUILD ON}
30+
3231
requires
33-
rtl,
34-
python,
35-
p4dtools,
36-
p4denvironmentproject;
37-
32+
rtl,
33+
python,
34+
p4dtools,
35+
p4denvironmentproject;
36+
3837
contains
39-
PyEnvironment in '..\src\PyEnvironment.pas',
40-
PyEnvironment.Notification in '..\src\PyEnvironment.Notification.pas',
41-
PyEnvironment.Distribution in '..\src\PyEnvironment.Distribution.pas',
42-
PyEnvironment.Local in '..\src\PyEnvironment.Local.pas',
43-
PyEnvironment.Path in '..\src\PyEnvironment.Path.pas',
44-
PyEnvironment.Embeddable in '..\src\Embeddable\PyEnvironment.Embeddable.pas',
45-
PyEnvironment.Embeddable.Res in '..\src\Embeddable\Res\PyEnvironment.Embeddable.Res.pas',
46-
PyEnvironment.Embeddable.Res.Python37 in '..\src\Embeddable\Res\PyEnvironment.Embeddable.Res.Python37.pas',
47-
PyEnvironment.Embeddable.Res.Python38 in '..\src\Embeddable\Res\PyEnvironment.Embeddable.Res.Python38.pas',
48-
PyEnvironment.Embeddable.Res.Python39 in '..\src\Embeddable\Res\PyEnvironment.Embeddable.Res.Python39.pas',
49-
PyEnvironment.Embeddable.Res.Python310 in '..\src\Embeddable\Res\PyEnvironment.Embeddable.Res.Python310.pas',
50-
PyEnvironment.AddOn.EnsurePip in '..\src\AddOn\PyEnvironment.AddOn.EnsurePip.pas',
51-
PyEnvironment.AddOn.GetPip in '..\src\AddOn\PyEnvironment.AddOn.GetPip.pas',
52-
PyEnvironment.AddOn in '..\src\AddOn\PyEnvironment.AddOn.pas';
53-
38+
PyEnvironment in '..\src\PyEnvironment.pas',
39+
PyEnvironment.Notification in '..\src\PyEnvironment.Notification.pas',
40+
PyEnvironment.Distribution in '..\src\PyEnvironment.Distribution.pas',
41+
PyEnvironment.Local in '..\src\PyEnvironment.Local.pas',
42+
PyEnvironment.Path in '..\src\PyEnvironment.Path.pas',
43+
PyEnvironment.Embeddable in '..\src\Embeddable\PyEnvironment.Embeddable.pas',
44+
PyEnvironment.Embeddable.Res in '..\src\Embeddable\Res\PyEnvironment.Embeddable.Res.pas',
45+
PyEnvironment.Embeddable.Res.Python37 in '..\src\Embeddable\Res\PyEnvironment.Embeddable.Res.Python37.pas',
46+
PyEnvironment.Embeddable.Res.Python38 in '..\src\Embeddable\Res\PyEnvironment.Embeddable.Res.Python38.pas',
47+
PyEnvironment.Embeddable.Res.Python39 in '..\src\Embeddable\Res\PyEnvironment.Embeddable.Res.Python39.pas',
48+
PyEnvironment.Embeddable.Res.Python310 in '..\src\Embeddable\Res\PyEnvironment.Embeddable.Res.Python310.pas',
49+
PyEnvironment.AddOn.EnsurePip in '..\src\AddOn\PyEnvironment.AddOn.EnsurePip.pas',
50+
PyEnvironment.AddOn.GetPip in '..\src\AddOn\PyEnvironment.AddOn.GetPip.pas',
51+
PyEnvironment.AddOn in '..\src\AddOn\PyEnvironment.AddOn.pas';
52+
5453
end.

‎packages/P4DEnvironment.dproj‎

Lines changed: 323 additions & 311 deletions
Large diffs are not rendered by default.

‎packages/P4DEnvironmentProject.dpk‎

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,37 @@
1-
package P4DEnvironmentProject;
2-
3-
{$R *.res}
4-
{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
5-
{$ALIGN 8}
6-
{$ASSERTIONS ON}
7-
{$BOOLEVAL OFF}
8-
{$DEBUGINFO OFF}
9-
{$EXTENDEDSYNTAX ON}
10-
{$IMPORTEDDATA ON}
11-
{$IOCHECKS ON}
12-
{$LOCALSYMBOLS ON}
13-
{$LONGSTRINGS ON}
14-
{$OPENSTRINGS ON}
15-
{$OPTIMIZATION OFF}
16-
{$OVERFLOWCHECKS ON}
17-
{$RANGECHECKS ON}
18-
{$REFERENCEINFO ON}
19-
{$SAFEDIVIDE OFF}
20-
{$STACKFRAMES ON}
21-
{$TYPEDADDRESS OFF}
22-
{$VARSTRINGCHECKS ON}
23-
{$WRITEABLECONST OFF}
24-
{$MINENUMSIZE 1}
25-
{$IMAGEBASE $400000}
26-
{$DEFINE DEBUG}
27-
{$ENDIF IMPLICITBUILDING}
28-
{$LIBSUFFIX AUTO}
29-
{$RUNONLY}
30-
{$IMPLICITBUILD ON}
31-
32-
requires
33-
rtl;
34-
35-
contains
36-
PyEnvironment.Project in '..\src\Project\PyEnvironment.Project.pas';
37-
38-
end.
1+
package P4DEnvironmentProject;
2+
3+
{$R *.res}
4+
{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users}
5+
{$ALIGN 8}
6+
{$ASSERTIONS ON}
7+
{$BOOLEVAL OFF}
8+
{$DEBUGINFO OFF}
9+
{$EXTENDEDSYNTAX ON}
10+
{$IMPORTEDDATA ON}
11+
{$IOCHECKS ON}
12+
{$LOCALSYMBOLS OFF}
13+
{$LONGSTRINGS ON}
14+
{$OPENSTRINGS ON}
15+
{$OPTIMIZATION ON}
16+
{$OVERFLOWCHECKS OFF}
17+
{$RANGECHECKS OFF}
18+
{$REFERENCEINFO OFF}
19+
{$SAFEDIVIDE OFF}
20+
{$STACKFRAMES OFF}
21+
{$TYPEDADDRESS OFF}
22+
{$VARSTRINGCHECKS ON}
23+
{$WRITEABLECONST OFF}
24+
{$MINENUMSIZE 1}
25+
{$DEFINE RELEASE}
26+
{$ENDIF IMPLICITBUILDING}
27+
{$LIBSUFFIX AUTO}
28+
{$RUNONLY}
29+
{$IMPLICITBUILD ON}
30+
31+
requires
32+
rtl;
33+
34+
contains
35+
PyEnvironment.Project in '..\src\Project\PyEnvironment.Project.pas';
36+
37+
end.

0 commit comments

Comments
 (0)