Replace all fpintres with $(FPINTRESUNIT) in Makefile.fpc

This commit is contained in:
Pierre Muller 2023-09-11 21:44:47 +00:00
parent abffcbb1ea
commit 24a5c24cb6
17 changed files with 17 additions and 17 deletions

View File

@ -20,7 +20,7 @@ units=$(SYSTEMUNIT) uuchar unixtype ctypes strings objpas iso7185 extpas macpas
types sysconst \ types sysconst \
rtlconsts cthreads \ rtlconsts cthreads \
dos \ dos \
cwstring fpwidestring fpintres $(CPU_UNITS) \ cwstring fpwidestring $(FPINTRESUNIT) $(CPU_UNITS) \
softfpu sfpux80 ufloatx80 sfpu128 ufloat128 softfpu sfpux80 ufloatx80 sfpu128 ufloat128
implicitunits=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 \ implicitunits=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 \
cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 \ cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 \

View File

@ -64,7 +64,7 @@ endif
ifeq ($(ARCH),powerpc) ifeq ($(ARCH),powerpc)
override LOADERS= override LOADERS=
RESUNIT=fpintres RESUNIT=$(FPINTRESUNIT)
SYSINITUNITS=si_prc SYSINITUNITS=si_prc
EXEUNITS=lineinfo exeinfo EXEUNITS=lineinfo exeinfo
endif endif

View File

@ -9,7 +9,7 @@ main=rtl
loaders=$(LOADERS) loaders=$(LOADERS)
units=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) \ units=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) \
uuchar unixtype ctypes baseunix strings objpas macpas iso7185 extpas syscall unixutil \ uuchar unixtype ctypes baseunix strings objpas macpas iso7185 extpas syscall unixutil \
fpintres heaptrc lineinfo lnfodwrf termio unix linux initc cmem \ $(FPINTRESUNIT) heaptrc lineinfo lnfodwrf termio unix linux initc cmem \
linuxvcs sysutils typinfo math charset cpall character \ linuxvcs sysutils typinfo math charset cpall character \
getopts errors dl dynlibs \ getopts errors dl dynlibs \
types sysconst cthreads sortbase classes fgl \ types sysconst cthreads sortbase classes fgl \

View File

@ -8,7 +8,7 @@ main=rtl
[target] [target]
loaders=$(LOADERS) loaders=$(LOADERS)
units=$(SYSTEMUNIT) heaptrc uuchar objpas $(ISO7185UNIT) $(EXTPASUNIT) buildrtl $(CPALLUNIT) units=$(SYSTEMUNIT) heaptrc uuchar objpas $(ISO7185UNIT) $(EXTPASUNIT) buildrtl $(CPALLUNIT)
implicitunits=$(SYSINITUNITS) athreads fpintres $(DOSUNIT) \ implicitunits=$(SYSINITUNITS) athreads $(FPINTRESUNIT) $(DOSUNIT) \
$(CTYPESUNIT) $(STRINGSUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(TYPESUNIT) \ $(CTYPESUNIT) $(STRINGSUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(TYPESUNIT) \
$(FPWIDESTRINGUNIT) $(CHARACTERUNIT) \ $(FPWIDESTRINGUNIT) $(CHARACTERUNIT) \
$(CHARSETUNIT) $(GETOPTSUNIT) \ $(CHARSETUNIT) $(GETOPTSUNIT) \

View File

@ -16,7 +16,7 @@ units=$(SYSTEMUNIT) sysinit uuchar $(UNIXTYPEUNIT) $(CTYPESUNIT) objpas macpas $
$(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) heaptrc $(LINEINFOUNIT) $(LNFODWRFUNIT) $(LNFOGDBUNIT) \ $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) heaptrc $(LINEINFOUNIT) $(LNFODWRFUNIT) $(LNFOGDBUNIT) \
$(ERRORSUNIT) $(TERMIOUNIT) \ $(ERRORSUNIT) $(TERMIOUNIT) \
$(SYSCONSTUNIT) $(CTHREADSUNIT) $(RTLCONSTSUNIT) $(CWSTRINGUNIT) $(BSDUNIT) $(SYSUTILSUNIT) $(FPWIDESTRINGUNIT) \ $(SYSCONSTUNIT) $(CTHREADSUNIT) $(RTLCONSTSUNIT) $(CWSTRINGUNIT) $(BSDUNIT) $(SYSUTILSUNIT) $(FPWIDESTRINGUNIT) \
fpintres fpextres $(OBJCUNIT) $(OBJCBASEUNIT) $(UNIXCPUNIT) \ $(FPINTRESUNIT) fpextres $(OBJCUNIT) $(OBJCBASEUNIT) $(UNIXCPUNIT) \
$(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
implicitunits=$(EXEINFOUNIT) \ implicitunits=$(EXEINFOUNIT) \
$(CP1250UNIT) $(CP1251UNIT) $(CP1252UNIT) $(CP1253UNIT) $(CP1254UNIT) $(CP1255UNIT) $(CP1256UNIT) $(CP1257UNIT) $(CP1258UNIT) \ $(CP1250UNIT) $(CP1251UNIT) $(CP1252UNIT) $(CP1253UNIT) $(CP1254UNIT) $(CP1255UNIT) $(CP1256UNIT) $(CP1257UNIT) $(CP1258UNIT) \

View File

@ -19,7 +19,7 @@ units=$(SYSTEMUNIT) uuchar unixtype ctypes objpas macpas iso7185 extpas \
errors bsd \ errors bsd \
console \ console \
sysconst cthreads dos cwstring \ sysconst cthreads dos cwstring \
fpintres unixcp fpwidestring \ $(FPINTRESUNIT) unixcp fpwidestring \
softfpu sfpux80 ufloatx80 sfpu128 ufloat128 softfpu sfpux80 ufloatx80 sfpu128 ufloat128
implicitunits=exeinfo \ implicitunits=exeinfo \
cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 \ cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 \

View File

@ -19,7 +19,7 @@ units=$(SYSTEMUNIT) uuchar unixtype ctypes objpas macpas iso7185 extpas \
errors bsd freebsd \ errors bsd freebsd \
console \ console \
sysconst cthreads dos cwstring \ sysconst cthreads dos cwstring \
fpintres unixcp fpwidestring \ $(FPINTRESUNIT) unixcp fpwidestring \
softfpu sfpux80 ufloatx80 sfpu128 ufloat128 softfpu sfpux80 ufloatx80 sfpu128 ufloat128
implicitunits=exeinfo \ implicitunits=exeinfo \
cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 \ cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 \

View File

@ -7,7 +7,7 @@ main=rtl
[target] [target]
loaders=$(LOADERS) loaders=$(LOADERS)
units=$(SYSTEMUNIT) fpintres $(SYSINIT_UNITS) \ units=$(SYSTEMUNIT) $(FPINTRESUNIT) $(SYSINIT_UNITS) \
uuchar $(UNIXTYPEUNIT) $(CTYPESUNIT) $(BASEUNIXUNIT) $(STRINGSUNIT) objpas macpas $(ISO7185UNIT) $(EXTPASUNIT) $(SYSCALLUNIT) $(UNIXUTILUNIT) \ uuchar $(UNIXTYPEUNIT) $(CTYPESUNIT) $(BASEUNIXUNIT) $(STRINGSUNIT) objpas macpas $(ISO7185UNIT) $(EXTPASUNIT) $(SYSCALLUNIT) $(UNIXUTILUNIT) \
heaptrc $(LINEINFOUNIT) $(LNFODWRFUNIT) \ heaptrc $(LINEINFOUNIT) $(LNFODWRFUNIT) \
$(TERMIOUNIT) $(UNIXUNIT) $(LINUXUNIT) $(INITCUNIT) $(CMEMUNIT) $(CPU_UNITS) \ $(TERMIOUNIT) $(UNIXUNIT) $(LINUXUNIT) $(INITCUNIT) $(CMEMUNIT) $(CPU_UNITS) \

View File

@ -8,7 +8,7 @@ main=rtl
[target] [target]
#loaders=prt0 #loaders=prt0
units=$(SYSTEMUNIT) heaptrc uuchar objpas macpas iso7185 extpas buildrtl cpall units=$(SYSTEMUNIT) heaptrc uuchar objpas macpas iso7185 extpas buildrtl cpall
implicitunits=$(SYSINITUNITS) athreads fpintres $(DOSUNIT) $(SYSUTILSUNIT) \ implicitunits=$(SYSINITUNITS) athreads $(FPINTRESUNIT) $(DOSUNIT) $(SYSUTILSUNIT) \
$(CTYPESUNIT) $(STRINGSUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(MATHUNIT) $(TYPESUNIT) \ $(CTYPESUNIT) $(STRINGSUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(MATHUNIT) $(TYPESUNIT) \
$(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(CHARSETUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) \ $(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(CHARSETUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) \
$(FPWIDESTRINGUNIT) $(FPINTRESUNIT) $(EXEINFOUNIT) $(LINEINFOUNIT) \ $(FPWIDESTRINGUNIT) $(FPINTRESUNIT) $(EXEINFOUNIT) $(LINEINFOUNIT) \

View File

@ -20,7 +20,7 @@ implicitunits=ndk ndkutils ddk \
softfpu sfpux80 ufloatx80 sfpu128 ufloat128 \ softfpu sfpux80 ufloatx80 sfpu128 ufloat128 \
# sockets printer \ # sockets printer \
# keyboard # keyboard
# sharemem exeinfo fpintres \ # sharemem exeinfo $(FPINTRESUNIT) \
cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 \ cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 \
cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 \ cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 \
cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 \ cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 \

View File

@ -18,7 +18,7 @@ units=$(SYSTEMUNIT) uuchar unixtype ctypes objpas macpas iso7185 extpas \
$(CPU_UNITS) charset cpall getopts heaptrc lnfodwrf lineinfo \ $(CPU_UNITS) charset cpall getopts heaptrc lnfodwrf lineinfo \
errors bsd \ errors bsd \
sysconst cthreads dos cwstring \ sysconst cthreads dos cwstring \
fpintres unixcp fpwidestring \ $(FPINTRESUNIT) unixcp fpwidestring \
softfpu sfpux80 ufloatx80 sfpu128 ufloat128 softfpu sfpux80 ufloatx80 sfpu128 ufloat128
implicitunits=exeinfo \ implicitunits=exeinfo \
cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 \ cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 \

View File

@ -17,7 +17,7 @@ units=$(SYSTEMUNIT) $(SYSINIT_UNITS) initc uuchar objpas macpas iso7185 extpas s
charset cpall character getopts heaptrc lineinfo lnfodwrf \ charset cpall character getopts heaptrc lineinfo lnfodwrf \
errors \ errors \
types sysctl sysconst \ types sysctl sysconst \
fpintres dynlibs cwstring cmem dl termio \ $(FPINTRESUNIT) dynlibs cwstring cmem dl termio \
cthreads unixcp fpwidestring \ cthreads unixcp fpwidestring \
softfpu sfpux80 ufloatx80 sfpu128 ufloat128 softfpu sfpux80 ufloatx80 sfpu128 ufloat128

View File

@ -18,7 +18,7 @@ units=$(SYSTEMUNIT) uuchar unixtype ctypes strings objpas iso7185 extpas macpas
types sysconst character \ types sysconst character \
rtlconsts cthreads \ rtlconsts cthreads \
dos fpwidestring \ dos fpwidestring \
cwstring fpintres $(CPU_UNITS) \ cwstring $(FPINTRESUNIT) $(CPU_UNITS) \
softfpu sfpux80 ufloatx80 sfpu128 ufloat128 softfpu sfpux80 ufloatx80 sfpu128 ufloat128
implicitunits=exeinfo \ implicitunits=exeinfo \

View File

@ -40,7 +40,7 @@ PROCINC=../$(CPU_TARGET)
UNITPREFIX=rtl UNITPREFIX=rtl
SYSTEMUNIT=system SYSTEMUNIT=system
SYSINIT_UNITS=si_prc si_dll SYSINIT_UNITS=si_prc si_dll
RESUNIT=fpintres RESUNIT=$(FPINTRESUNIT)
# Paths # Paths
OBJPASDIR=$(RTL)/objpas OBJPASDIR=$(RTL)/objpas
# Insert exception handler in system unit # Insert exception handler in system unit

View File

@ -15,7 +15,7 @@ implicitunits=sysinitpas sysinitcyg sysinitgprof initc extpas heaptrc \
$(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(MATHUNIT) $(TYPESUNIT) \ $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(MATHUNIT) $(TYPESUNIT) \
$(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(GETOPTSUNIT) \ $(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(GETOPTSUNIT) \
$(CHARACTERUNIT) $(FPWIDESTRINGUNIT) \ $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) \
$(SHAREMEMUNIT) $(EXEINFOUNIT) fpintres $(WINDIRSUNIT) \ $(SHAREMEMUNIT) $(EXEINFOUNIT) $(FPINTRESUNIT) $(WINDIRSUNIT) \
$(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) \ $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) \
$(CP1250UNIT) $(CP1251UNIT) $(CP1252UNIT) $(CP1253UNIT) $(CP1254UNIT) $(CP1255UNIT) $(CP1256UNIT) $(CP1257UNIT) $(CP1258UNIT) \ $(CP1250UNIT) $(CP1251UNIT) $(CP1252UNIT) $(CP1253UNIT) $(CP1254UNIT) $(CP1255UNIT) $(CP1256UNIT) $(CP1257UNIT) $(CP1258UNIT) \
$(CP437UNIT) $(CP646UNIT) $(CP737UNIT) $(CP775UNIT) $(CP850UNIT) $(CP852UNIT) $(CP855UNIT) $(CP856UNIT) $(CP857UNIT) $(CP860UNIT) $(CP861UNIT) $(CP862UNIT) \ $(CP437UNIT) $(CP646UNIT) $(CP737UNIT) $(CP775UNIT) $(CP850UNIT) $(CP852UNIT) $(CP855UNIT) $(CP856UNIT) $(CP857UNIT) $(CP860UNIT) $(CP861UNIT) $(CP862UNIT) \

View File

@ -8,7 +8,7 @@ main=rtl
[target] [target]
loaders=$(LOADERS) loaders=$(LOADERS)
units=system uuchar objpas macpas $(ISO7185UNIT) $(WINDOWSUNIT) $(SYSUTILSUNIT) buildrtl $(CHARSETUNIT) $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) units=system uuchar objpas macpas $(ISO7185UNIT) $(WINDOWSUNIT) $(SYSUTILSUNIT) buildrtl $(CHARSETUNIT) $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT)
implicitunits=sysinit extpas heaptrc fpintres \ implicitunits=sysinit extpas heaptrc $(FPINTRESUNIT) \
$(CTYPESUNIT) $(STRINGSUNIT) \ $(CTYPESUNIT) $(STRINGSUNIT) \
$(DOSUNIT) $(MESSAGESUNIT) \ $(DOSUNIT) $(MESSAGESUNIT) \
$(CMEMUNIT) $(DYNLIBSUNIT) \ $(CMEMUNIT) $(DYNLIBSUNIT) \

View File

@ -6,7 +6,7 @@
main=rtl main=rtl
[target] [target]
units=$(SYSTEMUNIT) uuchar fpintres ctypes objpas macpas $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \ units=$(SYSTEMUNIT) uuchar $(FPINTRESUNIT) ctypes objpas macpas $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
$(CPU_UNITS) heaptrc $(LINEINFOUNIT) \ $(CPU_UNITS) heaptrc $(LINEINFOUNIT) \
$(WINDOWSUNIT) $(MESSAGESUNIT) $(DYNLIBSUNIT) \ $(WINDOWSUNIT) $(MESSAGESUNIT) $(DYNLIBSUNIT) \
$(DOSUNIT) \ $(DOSUNIT) \