mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-09-10 21:29:20 +02:00
* 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:
parent
658c46b903
commit
55f9758c25
@ -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;
|
||||
|
@ -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';
|
||||
|
Loading…
Reference in New Issue
Block a user