Skip to content

Commit 032b67e

Browse files
royqh1979@gmail.comroyqh1979@gmail.com
royqh1979@gmail.com
authored and
royqh1979@gmail.com
committed
- change: use del instead of rm.exe in the project's makefile
1 parent 49d4c7b commit 032b67e

File tree

4 files changed

+21
-20
lines changed

4 files changed

+21
-20
lines changed

NEWS.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Version 6.7.3
22

3+
- change: use del instead of rm.exe in the project's makefile
34
- fix: Generated makefiles have error for dll projects
45
- fix: gdb annotation infos are not correctly displayed
56
- fix: the symbol completion option for ']' doesn't work

Source/Compiler.pas

+2-1
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,8 @@ procedure TCompiler.WriteMakeDefines(var F: TextFile);
309309
Writeln(F, 'CXXFLAGS = $(CXXINCS) ' + fCppCompileParams);
310310
Writeln(F, 'ENCODINGS = -finput-charset=utf-8 -fexec-charset='+GetSystemCharsetName);
311311
Writeln(F, 'CFLAGS = $(INCS) ' + fCompileParams);
312-
Writeln(F, 'RM = ' + CLEAN_PROGRAM + ' -f'); // TODO: use del or rm?
312+
// Writeln(F, 'RM = ' + CLEAN_PROGRAM + ' -f'); // TODO: use del or rm?
313+
Writeln(F, 'RM = ' + CLEAN_PROGRAM + ' /f'); // TODO: use del or rm?
313314
if fProject.Options.UsePrecompiledHeader then begin
314315
Writeln(F, 'PCH_H = ' + fProject.Options.PrecompiledHeader );
315316
Writeln(F, 'PCH = ' + fProject.Options.PrecompiledHeader +'.gch' );

Source/VCL/ClassBrowsing/CppParser.pas

-1
Original file line numberDiff line numberDiff line change
@@ -2786,7 +2786,6 @@ procedure TCppParser.InternalParse(const FileName: AnsiString; ManualUpdate: boo
27862786
end;
27872787
}
27882788

2789-
27902789
//fPreprocessor.DumpIncludesListTo('f:\\includes.txt');
27912790

27922791
// Tokenize the preprocessed buffer file

Source/main.dfm

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
object MainForm: TMainForm
22
Left = 597
3-
Top = 317
3+
Top = 312
44
HorzScrollBar.Visible = False
55
VertScrollBar.Visible = False
66
AutoScroll = False
@@ -71,7 +71,7 @@ object MainForm: TMainForm
7171
Left = 0
7272
Top = 0
7373
Width = 976
74-
Height = 196
74+
Height = 190
7575
Align = alClient
7676
BevelOuter = bvNone
7777
BorderStyle = bsNone
@@ -167,7 +167,7 @@ object MainForm: TMainForm
167167
TabOrder = 0
168168
DesignSize = (
169169
192
170-
196)
170+
190)
171171
object btnAbortCompilation: TSpeedButton
172172
Left = 5
173173
Top = 5
@@ -213,7 +213,7 @@ object MainForm: TMainForm
213213
Left = 192
214214
Top = 0
215215
Width = 784
216-
Height = 196
216+
Height = 190
217217
Align = alClient
218218
BevelOuter = bvNone
219219
TabOrder = 1
@@ -245,13 +245,13 @@ object MainForm: TMainForm
245245
Left = 450
246246
Top = 0
247247
Width = 8
248-
Height = 196
248+
Height = 190
249249
end
250250
object DebugViews: TPageControl
251251
Left = 458
252252
Top = 0
253253
Width = 518
254-
Height = 196
254+
Height = 190
255255
ActivePage = DebugConsoleSheet
256256
Align = alClient
257257
PopupMenu = LocalPopup
@@ -264,15 +264,15 @@ object MainForm: TMainForm
264264
Left = 0
265265
Top = 0
266266
Width = 510
267-
Height = 165
267+
Height = 159
268268
Align = alClient
269269
BevelOuter = bvNone
270270
TabOrder = 0
271271
object DebugOutput: TDevConsole
272272
Left = 0
273273
Top = 0
274274
Width = 510
275-
Height = 165
275+
Height = 159
276276
Align = alClient
277277
BevelInner = bvNone
278278
BevelOuter = bvNone
@@ -388,7 +388,7 @@ object MainForm: TMainForm
388388
Left = 0
389389
Top = 0
390390
Width = 450
391-
Height = 196
391+
Height = 190
392392
Align = alLeft
393393
BevelOuter = bvNone
394394
Constraints.MinWidth = 28
@@ -397,13 +397,13 @@ object MainForm: TMainForm
397397
Left = 0
398398
Top = 0
399399
Width = 450
400-
Height = 196
400+
Height = 190
401401
Align = alClient
402402
BevelOuter = bvNone
403403
TabOrder = 0
404404
DesignSize = (
405405
450
406-
196)
406+
190)
407407
object lblEvaluate: TLabel
408408
Left = 5
409409
Top = 6
@@ -438,7 +438,7 @@ object MainForm: TMainForm
438438
Left = 0
439439
Top = 62
440440
Width = 450
441-
Height = 134
441+
Height = 128
442442
Align = alBottom
443443
Anchors = [akLeft, akTop, akRight, akBottom]
444444
BevelOuter = bvNone
@@ -465,7 +465,7 @@ object MainForm: TMainForm
465465
Left = 0
466466
Top = 0
467467
Width = 976
468-
Height = 196
468+
Height = 190
469469
Align = alClient
470470
Indent = 22
471471
TabOrder = 0
@@ -743,7 +743,7 @@ object MainForm: TMainForm
743743
36)
744744
object cmbCompilers: TComboBox
745745
Left = 0
746-
Top = 5
746+
Top = 0
747747
Width = 337
748748
Height = 24
749749
AutoComplete = False
@@ -946,7 +946,7 @@ object MainForm: TMainForm
946946
Top = 80
947947
Width = 209
948948
Height = 320
949-
ActivePage = FilesSheet
949+
ActivePage = LeftProjectSheet
950950
Align = alLeft
951951
Font.Charset = DEFAULT_CHARSET
952952
Font.Color = clWindowText
@@ -1011,8 +1011,8 @@ object MainForm: TMainForm
10111011
object ClassBrowser: TClassBrowser
10121012
Left = 0
10131013
Top = 0
1014-
Width = 174
1015-
Height = 376
1014+
Width = 147
1015+
Height = 274
10161016
Align = alClient
10171017
Images = dmMain.ClassImages
10181018
Indent = 19
@@ -1208,7 +1208,7 @@ object MainForm: TMainForm
12081208
object fileBrowser: TDevFileBrowser
12091209
Left = 0
12101210
Top = 0
1211-
Width = 179
1211+
Width = 147
12121212
Height = 274
12131213
Align = alClient
12141214
Images = dmMain.FileBrowserImages_NewLook

0 commit comments

Comments
 (0)