Skip to content

Commit a2c9da6

Browse files
committed
fix: Use handle 1 for standard output
Also the usual shenanigans with the `.lpi` compatibility and correct paths for all binary outputs.
1 parent 6745da0 commit a2c9da6

File tree

3 files changed

+23
-30
lines changed

3 files changed

+23
-30
lines changed

entries/gklark/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# G Klark
2+
13
This program uses thread pool from fpthreadpool
24
and swissmap adapted from https://github.com/LIMachi/swiss-table/tree/master/src
35

entries/gklark/src/wcontest.lpi

Lines changed: 20 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,24 @@
77
<MainUnitHasCreateFormStatements Value="False"/>
88
<MainUnitHasTitleStatement Value="False"/>
99
<MainUnitHasScaledStatement Value="False"/>
10+
<CompatibilityMode Value="True"/>
1011
</Flags>
1112
<SessionStorage Value="InProjectDir"/>
1213
<Title Value="wcontest"/>
1314
<UseAppBundle Value="False"/>
1415
<ResourceType Value="res"/>
1516
</General>
16-
<BuildModes>
17-
<Item Name="Debug" Default="True"/>
18-
<Item Name="Release">
17+
<BuildModes Count="2">
18+
<Item1 Name="Debug" Default="True"/>
19+
<Item2 Name="Release">
1920
<CompilerOptions>
2021
<Version Value="11"/>
2122
<Target>
2223
<Filename Value="../../../bin/gklark"/>
2324
</Target>
2425
<SearchPaths>
2526
<IncludeFiles Value="$(ProjOutDir)"/>
26-
<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
27+
<UnitOutputDirectory Value="../../../bin/lib/$(TargetCPU)-$(TargetOS)"/>
2728
</SearchPaths>
2829
<CodeGeneration>
2930
<SmartLinkUnit Value="True"/>
@@ -38,13 +39,8 @@
3839
</Debugging>
3940
<LinkSmart Value="True"/>
4041
</Linking>
41-
<Other>
42-
<ConfigFile>
43-
<WriteConfigFilePath Value=""/>
44-
</ConfigFile>
45-
</Other>
4642
</CompilerOptions>
47-
</Item>
43+
</Item2>
4844
</BuildModes>
4945
<PublishOptions>
5046
<Version Value="2"/>
@@ -53,16 +49,16 @@
5349
<RunParams>
5450
<FormatVersion Value="2"/>
5551
</RunParams>
56-
<RequiredPackages>
57-
<Item>
52+
<RequiredPackages Count="1">
53+
<Item1>
5854
<PackageName Value="LazUtils"/>
59-
</Item>
55+
</Item1>
6056
</RequiredPackages>
61-
<Units>
62-
<Unit>
57+
<Units Count="1">
58+
<Unit0>
6359
<Filename Value="wcontest.lpr"/>
6460
<IsPartOfProject Value="True"/>
65-
</Unit>
61+
</Unit0>
6662
</Units>
6763
</ProjectOptions>
6864
<CompilerOptions>
@@ -72,7 +68,7 @@
7268
</Target>
7369
<SearchPaths>
7470
<IncludeFiles Value="$(ProjOutDir)"/>
75-
<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
71+
<UnitOutputDirectory Value="../../../bin/lib/$(TargetCPU)-$(TargetOS)"/>
7672
</SearchPaths>
7773
<Parsing>
7874
<SyntaxOptions>
@@ -94,23 +90,18 @@
9490
<UseExternalDbgSyms Value="True"/>
9591
</Debugging>
9692
</Linking>
97-
<Other>
98-
<ConfigFile>
99-
<WriteConfigFilePath Value=""/>
100-
</ConfigFile>
101-
</Other>
10293
</CompilerOptions>
10394
<Debugging>
104-
<Exceptions>
105-
<Item>
95+
<Exceptions Count="3">
96+
<Item1>
10697
<Name Value="EAbort"/>
107-
</Item>
108-
<Item>
98+
</Item1>
99+
<Item2>
109100
<Name Value="ECodetoolError"/>
110-
</Item>
111-
<Item>
101+
</Item2>
102+
<Item3>
112103
<Name Value="EFOpenError"/>
113-
</Item>
104+
</Item3>
114105
</Exceptions>
115106
</Debugging>
116107
</CONFIG>

entries/gklark/src/wcontest.lpr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ tcmp = class(tComparer<tsortitem>)
162162
cmp := tcmp.Create;
163163
TArrayHelper<tsortitem>.sort(keys, cmp);
164164
cmp.Free;
165-
stream := THandleStream.Create(0);
165+
stream := THandleStream.Create(1);
166166
stream.WriteByte(Ord('{'));
167167
eka := True;
168168
for k in keys do

0 commit comments

Comments
 (0)