From d3fdf8b17f0fdbeae0bcba63303ae3b022974b1a Mon Sep 17 00:00:00 2001 From: Vincent Snijders Date: Thu, 15 Jan 2009 22:35:17 +0000 Subject: [PATCH] * fixed calling windres: don't create short names with forward slashes for output file name, becaause it fails, if the output file does not yet exist. Short names are only required for parameters that windres pass on to the preprocessor. git-svn-id: trunk@12549 - --- compiler/comprsrc.pas | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/compiler/comprsrc.pas b/compiler/comprsrc.pas index 7dbb6ae3da..086a48ee05 100644 --- a/compiler/comprsrc.pas +++ b/compiler/comprsrc.pas @@ -240,8 +240,8 @@ var arch : ansistring; function WindresFileName(filename: TCmdStr): TCmdStr; - // to be on the safe side, only give short file names with forward slashes to - // windres + // to be on the safe side, for files that are passed to the preprocessor, + // only give short file names with forward slashes to windres var i: longint; begin @@ -257,15 +257,10 @@ begin begin s:=target_res.rccmd; if target_res.rcbin = 'windres' then - begin - Replace(s,'$RES',WindresFileName(OutName)); - Replace(s,'$RC',WindresFileName(fname)); - end + Replace(s,'$RC',WindresFileName(fname)) else - begin - Replace(s,'$RES',maybequoted(OutName)); - Replace(s,'$RC',maybequoted(fname)); - end; + Replace(s,'$RC',maybequoted(fname)); + Replace(s,'$RES',maybequoted(OutName)); ObjUsed:=False; end else