mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2026-01-06 11:40:35 +01:00
Keith: Fixed Win32 compilation problems
git-svn-id: trunk@1678 -
This commit is contained in:
parent
f65bee54ef
commit
b8972ebce8
@ -47,7 +47,6 @@ export RCPP?=$(strip $(wildcard $(addsuffix /cpp$(SRCEXEEXT), $(SEARCHPATH))))
|
||||
|
||||
%.res: %.rc
|
||||
windres -i $< -o $@ --preprocessor $(RCPP)
|
||||
# $(strip $(wildcard $(addsuffix /cpp$(SRCEXEEXT), $(SEARCHPATH))))
|
||||
|
||||
ide:
|
||||
ifeq ($(OS_TARGET), win32)
|
||||
|
||||
@ -294,7 +294,7 @@ begin
|
||||
inc(SrcPos,2);
|
||||
continue;
|
||||
end else if (DestPos=3) and (Result[1]=PathDelim)
|
||||
and (Result[2]=PathDelim) then
|
||||
and (Result[2]=PathDelim) then begin
|
||||
// 5. \\.. -> skip .., keep \\
|
||||
inc(SrcPos,2);
|
||||
continue;
|
||||
|
||||
@ -436,7 +436,7 @@ begin
|
||||
inc(SrcPos,2);
|
||||
continue;
|
||||
end else if (DestPos=3) and (Result[1]=PathDelim)
|
||||
and (Result[2]=PathDelim) then
|
||||
and (Result[2]=PathDelim) then begin
|
||||
// 5. \\.. -> skip .., keep \\
|
||||
inc(SrcPos,2);
|
||||
continue;
|
||||
|
||||
@ -81,7 +81,7 @@ procedure BinaryToLazarusResourceCode(BinStream,ResStream:TStream;
|
||||
+#83#187#6#78#83
|
||||
);
|
||||
}
|
||||
const LineEnd:ShortString={$IFDEF win32}#13{$ENDIF}#10;
|
||||
const LineEnd:ShortString={$IFDEF win32}#13#10{$ELSE}#10{$ENDIF};
|
||||
var s, Indent: ShortString;
|
||||
p, x: integer;
|
||||
c, h: char;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user