From 51d8ec90a7556a5a641ad5250ed26ece45456919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A1roly=20Balogh?= Date: Tue, 10 Nov 2020 21:31:04 +0000 Subject: [PATCH] sinclairql: now the target short name is also sinclairql as proposed by Pierre, so it's unified everywhere git-svn-id: trunk@47376 - --- compiler/msg/errore.msg | 2 +- compiler/systems/i_sinclairql.pas | 6 +++--- packages/bzip2/fpmake.pp | 2 +- packages/chm/fpmake.pp | 2 +- packages/fcl-base/fpmake.pp | 2 +- packages/fcl-db/fpmake.pp | 2 +- packages/fcl-fpcunit/fpmake.pp | 2 +- packages/fcl-image/fpmake.pp | 2 +- packages/fcl-js/fpmake.pp | 2 +- packages/fcl-json/fpmake.pp | 2 +- packages/fcl-net/fpmake.pp | 2 +- packages/fcl-passrc/fpmake.pp | 2 +- packages/fcl-pdf/fpmake.pp | 2 +- packages/fcl-process/fpmake.pp | 2 +- packages/fcl-registry/fpmake.pp | 2 +- packages/fcl-res/fpmake.pp | 2 +- packages/fcl-sdo/fpmake.pp | 2 +- packages/fcl-sound/fpmake.pp | 2 +- packages/fcl-stl/fpmake.pp | 2 +- packages/fcl-xml/fpmake.pp | 2 +- packages/fpmkunit/fpmake.pp | 2 +- packages/fppkg/fpmake.pp | 2 +- packages/hash/fpmake.pp | 2 +- packages/hermes/fpmake.pp | 2 +- packages/libgd/fpmake.pp | 2 +- packages/libtar/fpmake.pp | 2 +- packages/pasjpeg/fpmake.pp | 2 +- packages/paszlib/fpmake.pp | 2 +- packages/regexpr/fpmake.pp | 2 +- packages/rtl-generics/fpmake.pp | 2 +- packages/sdl/fpmake.pp | 2 +- packages/symbolic/fpmake.pp | 2 +- packages/unzip/fpmake.pp | 2 +- packages/webidl/fpmake.pp | 2 +- rtl/sinclairql/Makefile.fpc | 2 +- utils/fpcm/fpcmmain.pp | 4 ++-- 36 files changed, 39 insertions(+), 39 deletions(-) diff --git a/compiler/msg/errore.msg b/compiler/msg/errore.msg index d61f193514..4dcbe6dff5 100644 --- a/compiler/msg/errore.msg +++ b/compiler/msg/errore.msg @@ -4151,7 +4151,7 @@ F*2P_Set target CPU (aarch64,arm,avr,i386,i8086,jvm,m68k,mips,mipsel,powerpc, 6*2Tnetbsd_NetBSD 6*2Tmacosclassic_Classic Mac OS 6*2Tpalmos_PalmOS -6*2Tql_Sinclair QL +6*2Tsinclairql_Sinclair QL # i8086 targets 8*2Tembedded_Embedded 8*2Tmsdos_MS-DOS (and compatible) diff --git a/compiler/systems/i_sinclairql.pas b/compiler/systems/i_sinclairql.pas index ff2ba1a110..01d0ed610f 100644 --- a/compiler/systems/i_sinclairql.pas +++ b/compiler/systems/i_sinclairql.pas @@ -33,7 +33,7 @@ unit i_sinclairql; ( system : system_m68k_sinclairql; name : 'Sinclair QL'; - shortname : 'ql'; + shortname : 'sinclairql'; flags : [tf_use_8_3,tf_requires_proper_alignment, tf_smartlink_sections,tf_under_development]; cpu : cpu_m68k; @@ -62,8 +62,8 @@ unit i_sinclairql; Cprefix : '_'; newline : #13#10; dirsep : '/'; { ... the underlying tools (binutils/vlink/vasm) prefer Unix paths } - assem : as_m68k_as_aout; - assemextern : as_m68k_as_aout; + assem : as_m68k_vasm; + assemextern : as_m68k_vasm; link : ld_none; linkextern : ld_sinclairql; ar : ar_gnu_ar; diff --git a/packages/bzip2/fpmake.pp b/packages/bzip2/fpmake.pp index 5b84bc8c81..49df5f9bf0 100644 --- a/packages/bzip2/fpmake.pp +++ b/packages/bzip2/fpmake.pp @@ -28,7 +28,7 @@ begin P.Email := ''; P.Description := 'BZip2 decompression unit.'; P.NeedLibC:= true; - P.OSes := P.OSes - [embedded,nativent,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes := P.OSes - [embedded,nativent,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/chm/fpmake.pp b/packages/chm/fpmake.pp index 95240a6219..e0d25dbe59 100644 --- a/packages/chm/fpmake.pp +++ b/packages/chm/fpmake.pp @@ -25,7 +25,7 @@ begin P.Email := ''; P.Description := 'Standalone CHM reader and writer library'; P.NeedLibC:= false; - P.OSes := P.OSes - [embedded,nativent,msdos,win16,macosclassic,palmos,atari,zxspectrum,msxdos,amstradcpc,watcom,ql]; + P.OSes := P.OSes - [embedded,nativent,msdos,win16,macosclassic,palmos,atari,zxspectrum,msxdos,amstradcpc,watcom,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/fcl-base/fpmake.pp b/packages/fcl-base/fpmake.pp index 067e7c4b04..b1e29560e4 100644 --- a/packages/fcl-base/fpmake.pp +++ b/packages/fcl-base/fpmake.pp @@ -26,7 +26,7 @@ begin P.Email := ''; P.Description := 'Base library of Free Component Libraries (FCL), FPC''s OOP library.'; P.NeedLibC:= false; - P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/fcl-db/fpmake.pp b/packages/fcl-db/fpmake.pp index b2a06c74ac..15584bdcd8 100644 --- a/packages/fcl-db/fpmake.pp +++ b/packages/fcl-db/fpmake.pp @@ -32,7 +32,7 @@ begin P.Email := ''; P.Description := 'Database library of Free Component Libraries(FCL), FPC''s OOP library.'; P.NeedLibC:= false; - P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/fcl-fpcunit/fpmake.pp b/packages/fcl-fpcunit/fpmake.pp index 774389f39b..b929c0f1bb 100644 --- a/packages/fcl-fpcunit/fpmake.pp +++ b/packages/fcl-fpcunit/fpmake.pp @@ -30,7 +30,7 @@ begin P.Email := ''; P.Description := 'Unit testing system inspired by JUnit of Free Component Libraries (FCL), FPC''s OOP library.'; P.NeedLibC:= false; - P.OSes := P.OSes - [embedded,nativent,msdos,win16,macosclassic,palmos,symbian,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes := P.OSes - [embedded,nativent,msdos,win16,macosclassic,palmos,symbian,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/fcl-image/fpmake.pp b/packages/fcl-image/fpmake.pp index 33da2416eb..d02855c3ae 100644 --- a/packages/fcl-image/fpmake.pp +++ b/packages/fcl-image/fpmake.pp @@ -28,7 +28,7 @@ begin P.Email := ''; P.Description := 'Image loading and conversion parts of Free Component Libraries (FCL), FPC''s OOP library.'; P.NeedLibC:= false; - P.OSes := P.OSes - [embedded,nativent,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes := P.OSes - [embedded,nativent,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/fcl-js/fpmake.pp b/packages/fcl-js/fpmake.pp index 4065d524a3..16e0d16bfe 100644 --- a/packages/fcl-js/fpmake.pp +++ b/packages/fcl-js/fpmake.pp @@ -23,7 +23,7 @@ begin P.HomepageURL := 'www.freepascal.org'; P.Email := 'michael@freepascal.org'; P.Description := 'Javascript scanner/parser/syntax tree units'; - P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/fcl-json/fpmake.pp b/packages/fcl-json/fpmake.pp index a9e8dc0bec..65a814d53d 100644 --- a/packages/fcl-json/fpmake.pp +++ b/packages/fcl-json/fpmake.pp @@ -26,7 +26,7 @@ begin P.Email := ''; P.Description := 'Json interfacing, part of Free Component Libraries (FCL), FPC''s OOP library.'; P.NeedLibC:= false; - P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/fcl-net/fpmake.pp b/packages/fcl-net/fpmake.pp index 20586010a2..b9f99c043e 100644 --- a/packages/fcl-net/fpmake.pp +++ b/packages/fcl-net/fpmake.pp @@ -30,7 +30,7 @@ begin P.Email := ''; P.Description := 'Network related parts of Free Component Libraries (FCL), FPC''s OOP library.'; P.NeedLibC:= false; - P.OSes:=P.OSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes:=P.OSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/fcl-passrc/fpmake.pp b/packages/fcl-passrc/fpmake.pp index 60ecd4293c..4bdbda94cf 100644 --- a/packages/fcl-passrc/fpmake.pp +++ b/packages/fcl-passrc/fpmake.pp @@ -25,7 +25,7 @@ begin P.Email := ''; P.Description := 'Pascal parsing parts of Free Component Libraries (FCL), FPC''s OOP library.'; P.NeedLibC:= false; - P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/fcl-pdf/fpmake.pp b/packages/fcl-pdf/fpmake.pp index d9c4f98763..add9adf6b8 100644 --- a/packages/fcl-pdf/fpmake.pp +++ b/packages/fcl-pdf/fpmake.pp @@ -24,7 +24,7 @@ begin P.Email := ''; P.Description := 'PDF generating and TTF file info library'; P.NeedLibC:= false; - P.OSes:=P.OSes-[embedded,win16,msdos,nativent,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes:=P.OSes-[embedded,win16,msdos,nativent,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/fcl-process/fpmake.pp b/packages/fcl-process/fpmake.pp index 8f0bee5882..354c27cd58 100644 --- a/packages/fcl-process/fpmake.pp +++ b/packages/fcl-process/fpmake.pp @@ -25,7 +25,7 @@ begin P.Description := 'Process (execution) related parts of Free Component Libraries (FCL), FPC''s OOP library.'; P.Options.Add('-S2h'); P.NeedLibC:= false; - P.OSes:=AllOSes-[embedded,msdos,win16,go32v2,nativent,macosclassic,palmos,atari,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes:=AllOSes-[embedded,msdos,win16,go32v2,nativent,macosclassic,palmos,atari,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/fcl-registry/fpmake.pp b/packages/fcl-registry/fpmake.pp index deaea59e26..b398893b4e 100644 --- a/packages/fcl-registry/fpmake.pp +++ b/packages/fcl-registry/fpmake.pp @@ -27,7 +27,7 @@ begin P.Email := ''; P.Description := 'Windows registry + emulation parts of Free Component Libraries (FCL), FPC''s OOP library.'; P.NeedLibC:= false; - P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/fcl-res/fpmake.pp b/packages/fcl-res/fpmake.pp index a364f66f9c..216bb7fbe3 100644 --- a/packages/fcl-res/fpmake.pp +++ b/packages/fcl-res/fpmake.pp @@ -27,7 +27,7 @@ begin P.Email := ''; P.Description := 'Resource handling of Free Component Libraries (FCL), FPC''s OOP library.'; P.NeedLibC:= false; - P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/fcl-sdo/fpmake.pp b/packages/fcl-sdo/fpmake.pp index 39a824cba3..9e4af57382 100644 --- a/packages/fcl-sdo/fpmake.pp +++ b/packages/fcl-sdo/fpmake.pp @@ -25,7 +25,7 @@ begin P.HomepageURL := 'www.freepascal.org'; P.Email := 'inoussa12@gmail.com'; P.Description := 'Free Pascal implementation of Service Data Objects'; - P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/fcl-sound/fpmake.pp b/packages/fcl-sound/fpmake.pp index f0a40ae2e8..7caaa8083f 100644 --- a/packages/fcl-sound/fpmake.pp +++ b/packages/fcl-sound/fpmake.pp @@ -26,7 +26,7 @@ begin P.Email := ''; P.Description := 'Sound loading, storing and conversion parts for the Free Component Libraries (FCL), FPC''s OOP library.'; P.NeedLibC:= false; - P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/fcl-stl/fpmake.pp b/packages/fcl-stl/fpmake.pp index ffd33a44eb..c610db40eb 100644 --- a/packages/fcl-stl/fpmake.pp +++ b/packages/fcl-stl/fpmake.pp @@ -25,7 +25,7 @@ begin P.Email := ''; P.Description := 'Generic container library of Free Component Libraries (FCL), FPC''s OOP library.'; P.NeedLibC:= false; - P.OSes:=AllOSes-[embedded,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes:=AllOSes-[embedded,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/fcl-xml/fpmake.pp b/packages/fcl-xml/fpmake.pp index 93d12690d5..c8c35e1685 100644 --- a/packages/fcl-xml/fpmake.pp +++ b/packages/fcl-xml/fpmake.pp @@ -29,7 +29,7 @@ begin P.Email := ''; P.Description := 'XML and DOM parts of Free Component Libraries (FCL), FPC''s OOP library.'; P.NeedLibC:= false; - P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/fpmkunit/fpmake.pp b/packages/fpmkunit/fpmake.pp index 7e2991798e..7331b8bc68 100644 --- a/packages/fpmkunit/fpmake.pp +++ b/packages/fpmkunit/fpmake.pp @@ -25,7 +25,7 @@ begin P.Email := ''; P.Description := 'Basic library of the fpmake/fppkg build system.'; P.NeedLibC:= false; // true for headers that indirectly link to libc? - P.OSes := P.OSes - [embedded,nativent,msdos,win16,atari,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes := P.OSes - [embedded,nativent,msdos,win16,atari,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/fppkg/fpmake.pp b/packages/fppkg/fpmake.pp index 96ae7f82cb..2c800d9c5f 100644 --- a/packages/fppkg/fpmake.pp +++ b/packages/fppkg/fpmake.pp @@ -44,7 +44,7 @@ begin P.Email := ''; P.Description := 'Libraries to create fppkg package managers.'; P.NeedLibC:= false; - P.OSes := P.OSes - [embedded,nativent,msdos,win16,atari,macosclassic,palmos,symbian,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes := P.OSes - [embedded,nativent,msdos,win16,atari,macosclassic,palmos,symbian,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/hash/fpmake.pp b/packages/hash/fpmake.pp index 8a2dcb0f5d..a581804efb 100644 --- a/packages/hash/fpmake.pp +++ b/packages/hash/fpmake.pp @@ -23,7 +23,7 @@ begin P.Email := ''; P.Description := 'Several hash and cryptography algorithms (MD5,CRC,Linux crypt and NTLM1).'; P.NeedLibC:= false; - P.OSes:=P.OSes-[embedded,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes:=P.OSes-[embedded,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/hermes/fpmake.pp b/packages/hermes/fpmake.pp index 73f46cfd5f..6fa4e15f92 100644 --- a/packages/hermes/fpmake.pp +++ b/packages/hermes/fpmake.pp @@ -25,7 +25,7 @@ begin P.Email := ''; P.Description := 'Library for pixel graphics conversion'; P.NeedLibC := false; - P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/libgd/fpmake.pp b/packages/libgd/fpmake.pp index 8f5db05584..830b4ce2ac 100644 --- a/packages/libgd/fpmake.pp +++ b/packages/libgd/fpmake.pp @@ -20,7 +20,7 @@ begin {$endif ALLPACKAGES} P.Version:='3.3.1'; P.SourcePath.Add('src'); - P.OSes := P.OSes - [embedded,nativent,msdos,wii,win16,atari,macosclassic,palmos,symbian,freertos,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes := P.OSes - [embedded,nativent,msdos,wii,win16,atari,macosclassic,palmos,symbian,freertos,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/libtar/fpmake.pp b/packages/libtar/fpmake.pp index 7838fcb6c1..2846e819be 100644 --- a/packages/libtar/fpmake.pp +++ b/packages/libtar/fpmake.pp @@ -24,7 +24,7 @@ begin P.HomepageURL := 'http://www.destructor.de/'; P.Description := 'Library for handling tar-files.'; - P.OSes:=AllOSes-[embedded,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes:=AllOSes-[embedded,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/pasjpeg/fpmake.pp b/packages/pasjpeg/fpmake.pp index 3eec065a78..f56cc4d4b3 100644 --- a/packages/pasjpeg/fpmake.pp +++ b/packages/pasjpeg/fpmake.pp @@ -19,7 +19,7 @@ begin P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='3.3.1'; - P.OSes:=P.OSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes:=P.OSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/paszlib/fpmake.pp b/packages/paszlib/fpmake.pp index ad7e610164..87113af705 100644 --- a/packages/paszlib/fpmake.pp +++ b/packages/paszlib/fpmake.pp @@ -20,7 +20,7 @@ begin P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='3.3.1'; - P.OSes := P.OSes - [embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes := P.OSes - [embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/regexpr/fpmake.pp b/packages/regexpr/fpmake.pp index f428e80fbf..0c8bc50396 100644 --- a/packages/regexpr/fpmake.pp +++ b/packages/regexpr/fpmake.pp @@ -19,7 +19,7 @@ begin P.Directory:=ADirectory; {$endif ALLPACKAGES} P.Version:='3.3.1'; - P.OSes:=P.OSes-[embedded,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes:=P.OSes-[embedded,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/rtl-generics/fpmake.pp b/packages/rtl-generics/fpmake.pp index afc71ef733..80773b2f73 100644 --- a/packages/rtl-generics/fpmake.pp +++ b/packages/rtl-generics/fpmake.pp @@ -23,7 +23,7 @@ begin P.Email := ''; P.Description := 'Generic collection library.'; P.NeedLibC:= false; - P.OSes := AllOSes-[embedded,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,watcom,ql]; + P.OSes := AllOSes-[embedded,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,watcom,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/sdl/fpmake.pp b/packages/sdl/fpmake.pp index e3faa15286..c4ec202011 100644 --- a/packages/sdl/fpmake.pp +++ b/packages/sdl/fpmake.pp @@ -26,7 +26,7 @@ begin P.OSes := P.OSes - [darwin]; P.OSes := P.OSes - [iphonesim,ios,java,os2,emx,go32v2,watcom,netware,netwlibc,nativent,embedded, android,amiga,aros,msdos,gba,nds,win16,atari,macosclassic,palmos,symbian,wii, - freertos,zxspectrum,msxdos,amstradcpc,ql]; + freertos,zxspectrum,msxdos,amstradcpc,sinclairql]; T:=P.Targets.AddUnit('logger.pas'); with T.Dependencies do diff --git a/packages/symbolic/fpmake.pp b/packages/symbolic/fpmake.pp index 7f04a5d790..f6aef818f6 100644 --- a/packages/symbolic/fpmake.pp +++ b/packages/symbolic/fpmake.pp @@ -23,7 +23,7 @@ begin P.Email := ''; P.Description := 'Expression parser with support for fast evaluation'; P.NeedLibC:= false; - P.OSes:=P.OSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes:=P.OSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/unzip/fpmake.pp b/packages/unzip/fpmake.pp index 9157f1a601..82a0e890ce 100644 --- a/packages/unzip/fpmake.pp +++ b/packages/unzip/fpmake.pp @@ -20,7 +20,7 @@ begin {$endif ALLPACKAGES} P.Version:='3.3.1'; P.SourcePath.Add('src'); - P.OSes := P.OSes - [embedded,nativent,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes := P.OSes - [embedded,nativent,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/packages/webidl/fpmake.pp b/packages/webidl/fpmake.pp index 13410ad8f1..587a5a1d14 100644 --- a/packages/webidl/fpmake.pp +++ b/packages/webidl/fpmake.pp @@ -25,7 +25,7 @@ begin P.Email := ''; P.Description := 'WEB IDL parser and converter to Object Pascal classes'; P.NeedLibC:= false; - P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,ql]; + P.OSes:=AllOSes-[embedded,msdos,win16,macosclassic,palmos,zxspectrum,msxdos,amstradcpc,sinclairql]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/rtl/sinclairql/Makefile.fpc b/rtl/sinclairql/Makefile.fpc index 8035e5ee5d..04b8ff4c80 100644 --- a/rtl/sinclairql/Makefile.fpc +++ b/rtl/sinclairql/Makefile.fpc @@ -29,7 +29,7 @@ fpcpackage=y [default] fpcdir=../.. -target=ql +target=sinclairql cpu=m68k [compiler] diff --git a/utils/fpcm/fpcmmain.pp b/utils/fpcm/fpcmmain.pp index 4964b61900..ae342f002c 100644 --- a/utils/fpcm/fpcmmain.pp +++ b/utils/fpcm/fpcmmain.pp @@ -103,7 +103,7 @@ interface 'win64','wince','gba','nds','embedded','symbian','nativent', 'iphonesim', 'wii', 'aix', 'java', 'android', 'msdos', 'aros', 'dragonfly', 'win16', 'wasm', 'freertos', 'zxspectrum', 'msxdos', - 'ios','amstradcpc','ql' + 'ios','amstradcpc','sinclairql' ); OSSuffix : array[TOS] of string=( @@ -113,7 +113,7 @@ interface '_win64','_wince','_gba','_nds','_embedded','_symbian','_nativent', '_iphonesim','_wii','_aix','_java','_android','_msdos','_aros', '_dragonfly','_win16','_wasm','_freertos','_zxspectrum','_msxdos', - '_ios','_amstradcpc','_ql' + '_ios','_amstradcpc','_sinclairql' ); { This table is kept OS,Cpu because it is easier to maintain (PFV) }