paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-23 11:39:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix conventions for pas2js targets, refactor code to contain less if/then

Browse Source
This commit is contained in:
Michaël Van Canneyt 2022-03-05 11:35:08 +01:00
parent d68fd2277e
commit 71a560a97f
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ide/lazconf.pp
View File

@ -355,22 +355,30 @@ function GetLibraryExt(TargetOS: string): string;
begin begin
if TargetOS='' then if TargetOS='' then
TargetOS:=GetCompiledTargetOS; TargetOS:=GetCompiledTargetOS;
if CompareText(copy(TargetOS,1,3), 'win') = 0 then TargetOS:=LowerCase(TargetOS);
if copy(TargetOS,1,3)='win' then
Result:='.dll' Result:='.dll'
else if CompareText(TargetOS, 'darwin') = 0 then
Result:='.dylib'
else if CompareText(TargetOS, 'ios') = 0 then
Result:='.dylib'
else if (CompareText(TargetOS, 'linux') = 0)
or (CompareText(TargetOS, 'android') = 0)
or (CompareText(TargetOS, 'freebsd') = 0)
or (CompareText(TargetOS, 'openbsd') = 0)
or (CompareText(TargetOS, 'netbsd') = 0)
or (CompareText(TargetOS, 'dragonfly') = 0)
or (CompareText(TargetOS, 'haiku') = 0) then
Result:='.so'
else else
Result:=''; case TargetOS of
'darwin',
'ios':
Result:='.dylib';
'linux',
'android',
'freebsd',
'openbsd',
'netbsd',
'dragonfly',
'haiku':
Result:='.so';
'browser',
'nodejs',
'electron',
'module':
Result:='.js';
else
Result:='';
end;
end; end;
function GetLibraryPrefix(TargetOS: string): string; function GetLibraryPrefix(TargetOS: string): string;
@ -382,7 +390,7 @@ begin
TargetOS:=LowerCase(TargetOS); TargetOS:=LowerCase(TargetOS);
Result:=''; Result:='';
case TargetOS of case TargetOS of
'browser','nodejs','electron','module': exit('.js'); 'browser','nodejs','electron','module': exit('');
end; end;
SrcOS:=GetDefaultSrcOSForTargetOS(TargetOS); SrcOS:=GetDefaultSrcOSForTargetOS(TargetOS);
if CompareText(SrcOS, 'unix') = 0 then if CompareText(SrcOS, 'unix') = 0 then