浏览代码

* write resource object file to unit output directory

git-svn-id: trunk@7276 -
Vincent Snijders 18 年之前
父节点
当前提交
e18966c372
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      compiler/comprsrc.pas

+ 1 - 1
compiler/comprsrc.pas

@@ -89,9 +89,9 @@ begin
      current_settings.globalswitches:=current_settings.globalswitches+[cs_link_nolink];
      current_settings.globalswitches:=current_settings.globalswitches+[cs_link_nolink];
    end;
    end;
   srcfilepath:=ExtractFilePath(current_module.mainsource^);
   srcfilepath:=ExtractFilePath(current_module.mainsource^);
+  resobj:=current_module.outputpath^+ChangeFileExt(ExtractFileName(fname),target_info.resobjext);
   if not path_absolute(fname) then
   if not path_absolute(fname) then
     fname:=srcfilepath+fname;
     fname:=srcfilepath+fname;
-  resobj:=ChangeFileExt(fname,target_info.resobjext);
   s:=target_res.rescmd;
   s:=target_res.rescmd;
   ObjUsed:=(pos('$OBJ',s)>0);
   ObjUsed:=(pos('$OBJ',s)>0);
   Replace(s,'$OBJ',maybequoted(resobj));
   Replace(s,'$OBJ',maybequoted(resobj));