Introduce Amiga/AROS/MorphOS and MUI Widgetset to Lazarus gui settings

git-svn-id: trunk@54253 -
This commit is contained in:
marcus 2017-02-22 22:16:40 +00:00
parent b51e25235f
commit 7eaa1abf9f
3 changed files with 33 additions and 7 deletions

View File

@ -106,7 +106,7 @@ const
VirtualTempDir='TEMPORARYDIRECTORY'; VirtualTempDir='TEMPORARYDIRECTORY';
// FPC operating systems and processor types // FPC operating systems and processor types
FPCOperatingSystemNames: array[1..34] of shortstring =( FPCOperatingSystemNames: array[1..35] of shortstring =(
'linux', 'linux',
'win32','win64','wince', 'win32','win64','wince',
'darwin','macos', 'darwin','macos',
@ -114,6 +114,7 @@ const
'aix', 'aix',
'amiga', 'amiga',
'android', 'android',
'aros',
'atari', 'atari',
'beos', 'beos',
'embedded', 'embedded',
@ -137,10 +138,11 @@ const
'wdosx', 'wdosx',
'wii' 'wii'
); );
FPCOperatingSystemCaptions: array[1..34] of shortstring =( FPCOperatingSystemCaptions: array[1..35] of shortstring =(
'AIX', 'AIX',
'Amiga', 'Amiga',
'Android', 'Android',
'AROS',
'Atari', 'Atari',
'Beos', 'Beos',
'Darwin', 'Darwin',
@ -198,7 +200,7 @@ const
'FPC', 'ObjFPC', 'Delphi', 'TP', 'MacPas', 'ISO' 'FPC', 'ObjFPC', 'Delphi', 'TP', 'MacPas', 'ISO'
); );
Lazarus_CPU_OS_Widget_Combinations: array[1..75] of shortstring = ( Lazarus_CPU_OS_Widget_Combinations: array[1..81] of shortstring = (
'i386-linux-gtk', 'i386-linux-gtk',
'i386-linux-gtk2', 'i386-linux-gtk2',
'i386-linux-qt', 'i386-linux-qt',
@ -239,12 +241,16 @@ const
'i386-haiku-qt', 'i386-haiku-qt',
'i386-haiku-qt5', 'i386-haiku-qt5',
'i386-haiku-nogui', 'i386-haiku-nogui',
'i386-aros-mui',
'i386-aros-nogui',
'powerpc-darwin-gtk', 'powerpc-darwin-gtk',
'powerpc-darwin-gtk2', 'powerpc-darwin-gtk2',
'powerpc-darwin-carbon', 'powerpc-darwin-carbon',
'powerpc-linux-gtk', 'powerpc-linux-gtk',
'powerpc-linux-gtk2', 'powerpc-linux-gtk2',
'powerpc-linux-nogui', 'powerpc-linux-nogui',
'powerpc-morphos-mui',
'powerpc-morphos-nogui',
'sparc-linux-gtk', 'sparc-linux-gtk',
'sparc-linux-gtk2', 'sparc-linux-gtk2',
'sparc-linux-nogui', 'sparc-linux-nogui',
@ -273,7 +279,9 @@ const
'x86_64-linux-nogui', 'x86_64-linux-nogui',
'x86_64-win64-win32', 'x86_64-win64-win32',
'x86_64-win64-fpgui', 'x86_64-win64-fpgui',
'x86_64-win64-nogui' 'x86_64-win64-nogui',
'm68k-amiga-mui',
'm68k-amiga-nogui'
); );
type type
@ -3501,13 +3509,26 @@ procedure GetTargetProcessors(const TargetCPU: string; aList: TStrings);
aList.Add('AVR51'); aList.Add('AVR51');
aList.Add('AVR6'); aList.Add('AVR6');
end; end;
procedure M68k;
begin
aList.Add('68000');
aList.Add('68020');
aList.Add('68040');
aList.Add('68060');
aList.Add('ISAA');
aList.Add('ISAA+');
aList.Add('ISAB');
aList.Add('ISAC');
aList.Add('CFV4');
end;
begin begin
case TargetCPU of case TargetCPU of
'arm' : Arm; 'arm' : Arm;
'avr' : AVR; 'avr' : AVR;
'i386' : Intel_i386; 'i386' : Intel_i386;
'm68k' : ; 'm68k' : M68k;
'powerpc': PowerPC; 'powerpc': PowerPC;
'sparc' : Sparc; 'sparc' : Sparc;
'x86_64' : Intel_x86_64; 'x86_64' : Intel_x86_64;

View File

@ -26,6 +26,8 @@ if LCLWidgetType+''='' then begin
LCLWidgetType := 'wince' LCLWidgetType := 'wince'
else if TargetOS='darwin' then else if TargetOS='darwin' then
LCLWidgetType := 'carbon' LCLWidgetType := 'carbon'
else if (TargetOS='amiga') or (TargetOS='aros') or (TargetOS='morphos') then
LCLWidgetType := 'mui'
else else
LCLWidgetType:='gtk2'; LCLWidgetType:='gtk2';
end; end;
@ -89,7 +91,7 @@ end;"/>
<Item1> <Item1>
<Identifier Value="LCLWidgetType"/> <Identifier Value="LCLWidgetType"/>
<Description Value="gtk3"/> <Description Value="gtk3"/>
<Values Count="12"> <Values Count="13">
<Item1 Value="gtk"/> <Item1 Value="gtk"/>
<Item2 Value="gtk2"/> <Item2 Value="gtk2"/>
<Item3 Value="qt"/> <Item3 Value="qt"/>
@ -102,8 +104,9 @@ end;"/>
<Item10 Value="cocoa"/> <Item10 Value="cocoa"/>
<Item11 Value="customdrawn"/> <Item11 Value="customdrawn"/>
<Item12 Value="gtk3"/> <Item12 Value="gtk3"/>
<Item13 Value="mui"/>
</Values> </Values>
<ValueDescriptions Count="12"/> <ValueDescriptions Count="13"/>
</Item1> </Item1>
<Item2> <Item2>
<Identifier Value="fpGUIPlatform"/> <Identifier Value="fpGUIPlatform"/>

View File

@ -74,6 +74,7 @@ type
awGtk, awGtk,
awGtk2, awGtk2,
awGtk3, awGtk3,
awMUI,
awNoGui, awNoGui,
awQt, awQt,
awWin32, awWin32,
@ -105,6 +106,7 @@ const
'gtk', 'gtk',
'gtk2', 'gtk2',
'gtk3', 'gtk3',
'mui',
'nogui', 'nogui',
'qt', 'qt',
'win32', 'win32',