Browse Source

* 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 -
Vincent Snijders 16 years ago
parent
commit
d3fdf8b17f
1 changed files with 5 additions and 10 deletions
  1. 5 10
      compiler/comprsrc.pas

+ 5 - 10
compiler/comprsrc.pas

@@ -240,8 +240,8 @@ var
   arch : ansistring;
   arch : ansistring;
 
 
   function WindresFileName(filename: TCmdStr): TCmdStr;
   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
   var
     i: longint;
     i: longint;
   begin
   begin
@@ -257,15 +257,10 @@ begin
     begin
     begin
       s:=target_res.rccmd;
       s:=target_res.rccmd;
       if target_res.rcbin = 'windres' then
       if target_res.rcbin = 'windres' then
-        begin
-          Replace(s,'$RES',WindresFileName(OutName));
-          Replace(s,'$RC',WindresFileName(fname));
-        end
+        Replace(s,'$RC',WindresFileName(fname))
       else
       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;
       ObjUsed:=False;
     end
     end
   else
   else