paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-12 10:09:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

* only add resext if no extension was specified

Browse Source 
* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/scandir.pas
View File

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

8
compiler/systems/i_win.pas
View File

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