* only add resext if no extension was specified

* default resext for windows changed to .res

git-svn-id: trunk@5193 -
This commit is contained in:
peter 2006-11-03 08:51:23 +00:00
parent 658c46b903
commit 55f9758c25
2 changed files with 8 additions and 6 deletions

View File

@ -916,9 +916,11 @@ implementation
if Assigned(Current_Module) then
begin
delete(S,1,1);
insert(ExtractFileName(ChangeFileExt(current_module.mainsource^,'')),S,1 );
insert(ChangeFileExt(ExtractFileName(current_module.mainsource^),''),S,1 );
end;
s:=ChangeFileExt(FixFileName(s),target_info.resext);
s:=FixFileName(s);
if ExtractFileExt(s)='' then
s:=ChangeFileExt(s,target_info.resext);
if target_info.res<>res_none then
begin
current_module.flags:=current_module.flags or uf_has_resourcefiles;

View File

@ -45,7 +45,7 @@ unit i_win;
unitlibext : '.ppl';
asmext : '.s';
objext : '.o';
resext : '.rc';
resext : '.res';
resobjext : '.or';
sharedlibext : '.dll';
staticlibext : '.a';
@ -104,7 +104,7 @@ unit i_win;
unitlibext : '.ppl';
asmext : '.s';
objext : '.o';
resext : '.rc';
resext : '.res';
resobjext : '.or';
sharedlibext : '.dll';
staticlibext : '.a';
@ -163,7 +163,7 @@ unit i_win;
unitlibext : '.ppl';
asmext : '.s';
objext : '.o';
resext : '.rc';
resext : '.res';
resobjext : '.or';
sharedlibext : '.dll';
staticlibext : '.a';
@ -222,7 +222,7 @@ unit i_win;
unitlibext : '.ppl';
asmext : '.s';
objext : '.o';
resext : '.rc';
resext : '.res';
resobjext : '.or';
sharedlibext : '.dll';
staticlibext : '.a';