From e4fb8aa30ad3028a6641f972c854dce1fefddfad Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Sat, 23 Sep 2023 00:41:05 +0200 Subject: [PATCH] Handle rtlconst(s) unit for DOTTED --- rtl/aix/Makefile.fpc | 12 ++++-------- rtl/amiga/Makefile.fpc | 2 +- rtl/android/Makefile.fpc | 13 +++++-------- rtl/beos/Makefile.fpc | 2 +- rtl/darwin/Makefile.fpc | 2 +- rtl/dragonfly/Makefile.fpc | 9 +++------ rtl/embedded/Makefile.fpc | 4 ++-- rtl/freebsd/Makefile.fpc | 9 +++------ rtl/freertos/Makefile.fpc | 16 ++++++++-------- rtl/gba/Makefile.fpc | 2 +- rtl/go32v2/Makefile.fpc | 14 +++++++------- rtl/linux/Makefile.fpc | 2 +- rtl/msxdos/Makefile.fpc | 10 +++------- rtl/nativent/Makefile.fpc | 2 +- rtl/nds/Makefile.fpc | 2 +- rtl/netbsd/Makefile.fpc | 9 +++------ rtl/netwlibc/Makefile.fpc | 9 +++------ rtl/openbsd/Makefile.fpc | 8 +------- rtl/palmos/Makefile.fpc | 5 +---- rtl/sinclairql/Makefile.fpc | 4 ++-- rtl/solaris/Makefile.fpc | 11 ++++------- rtl/wii/Makefile.fpc | 2 +- rtl/win16/Makefile.fpc | 10 +++------- 23 files changed, 60 insertions(+), 99 deletions(-) diff --git a/rtl/aix/Makefile.fpc b/rtl/aix/Makefile.fpc index 42cffd070c..a29084e5db 100644 --- a/rtl/aix/Makefile.fpc +++ b/rtl/aix/Makefile.fpc @@ -18,13 +18,13 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(STRINGSUNIT) $(OBJPASUNIT) $ # ipc $(DLUNIT) $(DYNLIBSUNIT) \ types $(SYSCONSTUNIT) \ - rtlconsts cthreads \ + $(RTLCONSTSUNIT) cthreads \ dos \ cwstring $(FPWIDESTRINGUNIT) $(FPINTRESUNIT) $(CPU_UNITS) \ $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) implicitunits=$(CP_UNITS) $(UNICODEDATAUNIT) -rsts=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT) rtlconst +rsts=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT) [require] nortl=y @@ -156,20 +156,16 @@ sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.in $(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) types$(PPUEXT) \ + sysutils$(PPUEXT) typinfo$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) types$(PPUEXT) \ $(SYSTEMUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) sortbase$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp -typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) rtlconsts$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) +typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(OBJPASDIR)/types.pp -rtlconsts$(PPUEXT) : $(OBJPASDIR)/rtlconsts.pp $(OBJPASUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) - $(COMPILER) $(OBJPASDIR)/rtlconsts.pp - - # # Other system-independent RTL Units # diff --git a/rtl/amiga/Makefile.fpc b/rtl/amiga/Makefile.fpc index 98970b1632..f732f096e9 100644 --- a/rtl/amiga/Makefile.fpc +++ b/rtl/amiga/Makefile.fpc @@ -15,7 +15,7 @@ implicitunits=$(SYSINITUNITS) $(EXEUNITS) athreads $(DOSUNIT) $(SYSUTILSUNIT) $( $(UFLOAT128UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(SFPUX80UNIT) $(SOFTFPUUNIT) -rsts=$(MATHUNIT) rtlconsts typinfo classes $(SYSCONSTUNIT) +rsts=$(MATHUNIT) $(RTLCONSTSUNIT) typinfo classes $(SYSCONSTUNIT) [require] nortl=y diff --git a/rtl/android/Makefile.fpc b/rtl/android/Makefile.fpc index fa1151a933..da7a6120f8 100644 --- a/rtl/android/Makefile.fpc +++ b/rtl/android/Makefile.fpc @@ -13,10 +13,10 @@ units=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) \ $(LINUXVCSUNIT) sysutils typinfo $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) \ $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) \ types $(SYSCONSTUNIT) cthreads $(SORTBASEUNIT) classes $(FGLUNIT) \ - rtlconsts dos cwstring $(FPCYLIXUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) \ + $(RTLCONSTSUNIT) dos cwstring $(FPCYLIXUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) \ $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) implicitunits=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT) -rsts=$(MATHUNIT) typinfo $(SYSCONSTUNIT) rtlconsts +rsts=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT) [require] nortl=y @@ -41,7 +41,7 @@ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) $(STRINGSUNIT) dos \ sysutils typinfo $(MATHUNIT) \ $(CPU_UNITS) $(GETOPTSUNIT) \ $(ERRORSUNIT) sockets \ - $(SORTBASEUNIT) classes $(FGLUNIT) $(SYSCONSTUNIT) rtlconsts \ + $(SORTBASEUNIT) classes $(FGLUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) \ [prerules] RTL=.. @@ -171,18 +171,15 @@ sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.in $(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) $(FGLUNIT)$(PPUEXT) sortbase$(PPUEXT) + sysutils$(PPUEXT) typinfo$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) sortbase$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp -typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) rtlconsts$(PPUEXT) +typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(OBJPASDIR)/types.pp -rtlconsts$(PPUEXT) : $(OBJPASDIR)/rtlconsts.pp $(OBJPASUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) - $(COMPILER) $(OBJPASDIR)/rtlconsts.pp - # # Other $(SYSTEMUNIT)-independent RTL Units # diff --git a/rtl/beos/Makefile.fpc b/rtl/beos/Makefile.fpc index b8874a5a92..5c67849819 100644 --- a/rtl/beos/Makefile.fpc +++ b/rtl/beos/Makefile.fpc @@ -18,7 +18,7 @@ units=system $(UUCHARUNIT) $(BASEUNIXUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPA $(DYNLIBSUNIT) $(CWSTRINGUNIT) \ $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU218UNIT) $(UFLOAT128UNIT) # beos -rsts=$(MATHUNIT) typinfo $(SYSCONSTUNIT) rtlconsts +rsts=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT) implicitunits=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT) [require] diff --git a/rtl/darwin/Makefile.fpc b/rtl/darwin/Makefile.fpc index 224a3683a3..fb63fdaa91 100644 --- a/rtl/darwin/Makefile.fpc +++ b/rtl/darwin/Makefile.fpc @@ -20,7 +20,7 @@ units=$(SYSTEMUNIT) sysinit $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPAS $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) implicitunits=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT) -rsts=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT) rtlconsts +rsts=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT) [require] nortl=y diff --git a/rtl/dragonfly/Makefile.fpc b/rtl/dragonfly/Makefile.fpc index 931a9a7f37..c1a3d3b72d 100644 --- a/rtl/dragonfly/Makefile.fpc +++ b/rtl/dragonfly/Makefile.fpc @@ -12,7 +12,7 @@ fpcpackage=y loaders=prt0 cprt0 gprt0 dllprt0 units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \ $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTL) baseunix unixutil $(CHARACTERUNIT) \ - unix rtlconsts $(INITCUNIT) $(CMEMUNIT) \ + unix $(RTLCONSTSUNIT) $(INITCUNIT) $(CMEMUNIT) \ $(DLUNIT) $(TERMIOUNIT) \ sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) \ $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \ @@ -159,14 +159,11 @@ sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.in $(OBJPASUNIT)$(PPUEXT) unix$(PPUEXT) $(ERRORSUNIT)$(PPUEXT) $(SYSCONSTUNIT)$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp -rtlconsts$(PPUEXT) : $(OBJPASDIR)/rtlconsts.pp - $(COMPILER) $(OBJPASDIR)/rtlconsts.pp - classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) $(FGLUNIT)$(PPUEXT) sortbase$(PPUEXT) + sysutils$(PPUEXT) typinfo$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) sortbase$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp -typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) rtlconsts$(PPUEXT) +typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) diff --git a/rtl/embedded/Makefile.fpc b/rtl/embedded/Makefile.fpc index ea618306e8..3f1ecde00c 100644 --- a/rtl/embedded/Makefile.fpc +++ b/rtl/embedded/Makefile.fpc @@ -22,7 +22,7 @@ units=$(SYSTEMUNIT) $(CPU_UNITS) $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EX $(SYSCONSTUNIT) #implicitunits=exeinfo $(CP_UNITS) -#rsts=$(MATHUNIT) rtlconsts varutils typinfo variants classes $(SYSCONSTUNIT) dateutil +#rsts=$(MATHUNIT) $(RTLCONSTSUNIT) varutils typinfo variants classes $(SYSCONSTUNIT) dateutil [require] nortl=y @@ -218,7 +218,7 @@ endif endif ifeq ($(ARCH),riscv32) -CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts $(GETOPTSUNIT) $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT) ifeq ($(SUBARCH),rv32ec) override FPCOPT+=-Cprv32ec CPU_UNITS=CH32VxBootstrap diff --git a/rtl/freebsd/Makefile.fpc b/rtl/freebsd/Makefile.fpc index 7a105d6141..8b349082e3 100644 --- a/rtl/freebsd/Makefile.fpc +++ b/rtl/freebsd/Makefile.fpc @@ -12,7 +12,7 @@ fpcpackage=y loaders=prt0 cprt0 gprt0 dllprt0 units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \ $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTL) baseunix unixutil $(CHARACTERUNIT) \ - unix rtlconsts $(INITCUNIT) $(CMEMUNIT) \ + unix $(RTLCONSTSUNIT) $(INITCUNIT) $(CMEMUNIT) \ $(DLUNIT) $(TERMIOUNIT) \ sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) \ $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \ @@ -170,15 +170,12 @@ sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.in $(OBJPASUNIT)$(PPUEXT) unix$(PPUEXT) $(ERRORSUNIT)$(PPUEXT) $(SYSCONSTUNIT)$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp -rtlconsts$(PPUEXT) : $(OBJPASDIR)/rtlconsts.pp - $(COMPILER) $(OBJPASDIR)/rtlconsts.pp - classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) $(FGLUNIT)$(PPUEXT) \ + sysutils$(PPUEXT) typinfo$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) \ sortbase$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp -typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) rtlconsts$(PPUEXT) +typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) diff --git a/rtl/freertos/Makefile.fpc b/rtl/freertos/Makefile.fpc index 99b82a32f8..faab426f0b 100644 --- a/rtl/freertos/Makefile.fpc +++ b/rtl/freertos/Makefile.fpc @@ -23,7 +23,7 @@ units=$(SYSTEMUNIT) $(CPU_UNITS) $(UUCHARUNIT) objpas $(ISO7185UNIT) $(EXTPASUNI $(CHARACTERUNIT) implicitunits=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT) -#rsts=$(MATHUNIT) rtlconsts varutils typinfo variants classes $(SYSCONSTUNIT) dateutil +#rsts=$(MATHUNIT) $(RTLCONSTSUNIT) varutils typinfo variants classes $(SYSCONSTUNIT) dateutil [require] nortl=y @@ -71,7 +71,7 @@ DOSDIR=. DOS_DEPS_OS=objpas$(PPUEXT) ifeq ($(ARCH),arm) -CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts $(GETOPTSUNIT) $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT) ifeq ($(SUBARCH),armv7m) CPU_UNITS=stm32f103xe cortexm3 cortexm4 # thumb2_bare CPU_UNITS_DEFINED=1 @@ -173,7 +173,7 @@ endif endif ifeq ($(ARCH),i386) -CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts $(GETOPTSUNIT) $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT) CPU_UNITS=multiboot CPU_UNITS_DEFINED=1 ifeq ($(CPU_UNITS_DEFINED),) @@ -182,7 +182,7 @@ endif endif ifeq ($(ARCH),x86_64) -CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts $(GETOPTSUNIT) $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT) # CPU_UNITS=multiboot endif @@ -192,7 +192,7 @@ CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) endif ifeq ($(ARCH),mipsel) -CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts $(GETOPTSUNIT) $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT) ifeq ($(SUBARCH),pic32mx) CPU_UNITS=pic32mx1xxfxxxb pic32mx2xxfxxxb pic32mx1xxfxxxc pic32mx2xxfxxxc pic32mx1xxfxxxd pic32mx2xxfxxxd pic32mx7x5fxxxl pic32mx7x5fxxxh CPU_UNITS_DEFINED=1 @@ -203,7 +203,7 @@ endif endif ifeq ($(ARCH),riscv32) -CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts $(GETOPTSUNIT) $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT) ifeq ($(SUBARCH),rv32imc) override FPCOPT+=-Cprv32imc CPU_UNITS=esp32c3 esp32c3idf_50000 @@ -215,7 +215,7 @@ endif endif ifeq ($(ARCH),riscv64) -CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts $(GETOPTSUNIT) $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT) CPU_UNITS= CPU_UNITS_DEFINED=1 ifeq ($(CPU_UNITS_DEFINED),) @@ -224,7 +224,7 @@ endif endif ifeq ($(ARCH),xtensa) -CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types rtlconsts $(GETOPTSUNIT) $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT) ifeq ($(SUBARCH),lx6) CPU_UNITS=esp32 espidf_40100 espidf_40200 espidf_40400 CPU_UNITS_DEFINED=1 diff --git a/rtl/gba/Makefile.fpc b/rtl/gba/Makefile.fpc index 65ca6a2af3..28d2c271d9 100644 --- a/rtl/gba/Makefile.fpc +++ b/rtl/gba/Makefile.fpc @@ -13,7 +13,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUN $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) \ $(FPWIDESTRINGUNIT) $(CHARACTERUNIT) \ $(TYPESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) $(LINEINFOUNIT) $(FGLUNIT) -#rsts=$(MATHUNIT) rtlconsts varutils typinfo variants classes $(SYSCONSTUNIT) dateutil fpmkunit +#rsts=$(MATHUNIT) $(RTLCONSTSUNIT) varutils typinfo variants classes $(SYSCONSTUNIT) dateutil fpmkunit implicitunits=$(CP_UNITS) $(UNICODEDATAUNIT) [require] diff --git a/rtl/go32v2/Makefile.fpc b/rtl/go32v2/Makefile.fpc index 5cbc2d1768..141915f751 100644 --- a/rtl/go32v2/Makefile.fpc +++ b/rtl/go32v2/Makefile.fpc @@ -12,7 +12,7 @@ units=system $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUN cpu $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) ctypes $(FGLUNIT) \ msmouse $(CHARSETUNIT) $(CPALLUNIT) \ $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(UNICODEDATAUNIT) \ - types $(SYSCONSTUNIT) rtlconst \ + types $(SYSCONSTUNIT) $(RTLCONSTSUNIT) \ $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) rsts=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT) implicitunits=$(EXEINFOUNIT) $(CP_UNITS) @@ -33,6 +33,10 @@ COMMON=$(RTL)/common PROCINC=../$(CPU_TARGET) UNITPREFIX=rtl SYSTEMUNIT=system +ifndef FPC_DOTTEDUNITS +RTLCONSTSUNIT=rtlconst +endif + INITC_DEPS_OS=$(DPMIEXCPUNIT)$(PPUEXT) # Use new feature from 1.0.5 version @@ -122,11 +126,11 @@ sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \ $(EXECPPAS) classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconst$(PPUEXT) types$(PPUEXT) $(FGLUNIT)$(PPUEXT) \ + sysutils$(PPUEXT) typinfo$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) types$(PPUEXT) $(FGLUNIT)$(PPUEXT) \ sortbase$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp -typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) rtlconst$(PPUEXT) +typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(COMPILER) -Sg -Fi$(OBJPASDIR) $(OBJPASDIR)/typinfo.pp $(EXECPPAS) @@ -134,10 +138,6 @@ types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEX $(COMPILER) $(OBJPASDIR)/types.pp $(EXECPPAS) -rtlconst$(PPUEXT) : $(OBJPASDIR)/rtlconst.pp - $(COMPILER) -Fi$(OBJPASDIR) $(OBJPASDIR)/rtlconst.pp - $(EXECPPAS) - # # Other system-independent RTL Units # diff --git a/rtl/linux/Makefile.fpc b/rtl/linux/Makefile.fpc index 684f852dd0..40469fa774 100644 --- a/rtl/linux/Makefile.fpc +++ b/rtl/linux/Makefile.fpc @@ -21,7 +21,7 @@ units=$(SYSTEMUNIT) $(FPINTRESUNIT) $(SYSINIT_UNITS) \ implicitunits=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT) -rsts=$(MATHUNIT) typinfo $(SYSCONSTUNIT) rtlconsts +rsts=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT) [require] nortl=y diff --git a/rtl/msxdos/Makefile.fpc b/rtl/msxdos/Makefile.fpc index 74dfac6373..2b75efe640 100644 --- a/rtl/msxdos/Makefile.fpc +++ b/rtl/msxdos/Makefile.fpc @@ -8,7 +8,7 @@ main=rtl units=system si_prc $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(STRINGSUNIT) $(CHARSETUNIT) $(CPALLUNIT) \ $(GETOPTSUNIT) $(EXEINFOUNIT) $(HEAPTRCUNIT) #$(UUCHARUNIT) $(OBJPASUNIT) $(STRINGSUNIT) dos $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(SYSCONSTUNIT) sysutils \ -# $(MATHUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) rtlconsts typinfo cpu types \ +# $(MATHUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(RTLCONSTSUNIT) typinfo cpu types \ # $(GETOPTSUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes \ # msmouse $(PORTSUNIT) \ # $(CHARSETUNIT) $(CPALLUNIT) ctypes \ @@ -97,13 +97,13 @@ sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \ $(EXECPPAS) classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) \ + sysutils$(PPUEXT) typinfo$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ types$(PPUEXT) $(FGLUNIT)$(PPUEXT) sortbase$(PPUEXT) \ $(OBJPASUNIT)$(PPUEXT) system$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp $(EXECPPAS) -typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp sysutils$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) rtlconsts$(PPUEXT) system$(PPUEXT) +typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp sysutils$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) system$(PPUEXT) $(COMPILER) -Sg -Fi$(OBJPASDIR) $(OBJPASDIR)/typinfo.pp $(EXECPPAS) @@ -111,10 +111,6 @@ types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEX $(COMPILER) $(OBJPASDIR)/types.pp $(EXECPPAS) -rtlconsts$(PPUEXT) : $(OBJPASDIR)/rtlconsts.pp $(OBJPASDIR)/rtlconst.inc $(OBJPASUNIT)$(PPUEXT) system$(PPUEXT) - $(COMPILER) -Fi$(OBJPASDIR) $(OBJPASDIR)/rtlconsts.pp - $(EXECPPAS) - # # Other system-independent RTL Units # diff --git a/rtl/nativent/Makefile.fpc b/rtl/nativent/Makefile.fpc index 0d19ca3cbd..a1f1e1a736 100644 --- a/rtl/nativent/Makefile.fpc +++ b/rtl/nativent/Makefile.fpc @@ -14,7 +14,7 @@ implicitunits=ndk ndkutils ddk \ # $(HEAPTRCUNIT) # $(INITCUNIT) $(CMEMUNIT) $(DYNLIBSUNIT) signals \ dos \ - rtlconsts $(SYSCONSTUNIT) sysutils $(MATHUNIT) types \ + $(RTLCONSTSUNIT) $(SYSCONSTUNIT) sysutils $(MATHUNIT) types \ typinfo $(FGLUNIT) classes \ $(CPU_UNITS) $(CHARSETUNIT) $(GETOPTSUNIT) \ $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) \ diff --git a/rtl/nds/Makefile.fpc b/rtl/nds/Makefile.fpc index 8e244aaadd..455fcec75a 100644 --- a/rtl/nds/Makefile.fpc +++ b/rtl/nds/Makefile.fpc @@ -13,7 +13,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUN $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) \ $(FPWIDESTRINGUNIT) $(CHARACTERUNIT) \ $(TYPESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) $(LINEINFOUNIT) $(FGLUNIT) -#rsts=$(MATHUNIT) rtlconsts varutils typinfo variants classes $(SYSCONSTUNIT) dateutil fpmkunit +#rsts=$(MATHUNIT) $(RTLCONSTSUNIT) varutils typinfo variants classes $(SYSCONSTUNIT) dateutil fpmkunit implicitunits=$(CP_UNITS) $(UNICODEDATAUNIT) [require] diff --git a/rtl/netbsd/Makefile.fpc b/rtl/netbsd/Makefile.fpc index 6cb6a98f5d..037f2a0a7a 100644 --- a/rtl/netbsd/Makefile.fpc +++ b/rtl/netbsd/Makefile.fpc @@ -12,7 +12,7 @@ fpcpackage=y loaders=prt0 cprt0 dllprt0 units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \ $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTL) baseunix unixutil $(CHARACTERUNIT) \ - unix rtlconsts $(INITCUNIT) $(CMEMUNIT) \ + unix $(RTLCONSTSUNIT) $(INITCUNIT) $(CMEMUNIT) \ $(DLUNIT) $(TERMIOUNIT) \ sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) \ $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) \ @@ -164,11 +164,8 @@ sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.in objpas$(PPUEXT) unix$(PPUEXT) $(ERRORSUNIT)$(PPUEXT) $(SYSCONSTUNIT)$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp -rtlconsts$(PPUEXT) : $(OBJPASDIR)/rtlconsts.pp - $(COMPILER) $(OBJPASDIR)/rtlconsts.pp - classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) $(FGLUNIT)$(PPUEXT) \ + sysutils$(PPUEXT) typinfo$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) \ sortbase$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp @@ -202,7 +199,7 @@ unixutil$(PPUEXT) : $(UNIXINC)/unixutil.pp $(INC)/textrec.inc $(INC)/filerec.inc cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $< -variants$(PPUEXT) : $(INC)/variants.pp sysutils$(PPUEXT) $(SYSCONSTUNIT)$(PPUEXT) varutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) $(MATHUNIT)$(PPUEXT) +variants$(PPUEXT) : $(INC)/variants.pp sysutils$(PPUEXT) $(SYSCONSTUNIT)$(PPUEXT) varutils$(PPUEXT) typinfo$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEXT) $(COMPILER) -Fi$(INC) $(INC)/variants.pp cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) baseunix$(PPUEXT) unix$(PPUEXT) unixtype$(PPUEXT) ctypes$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT) diff --git a/rtl/netwlibc/Makefile.fpc b/rtl/netwlibc/Makefile.fpc index 2f0144f785..9b29c9f3b9 100644 --- a/rtl/netwlibc/Makefile.fpc +++ b/rtl/netwlibc/Makefile.fpc @@ -13,11 +13,11 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(E $(INITCUNIT) sysutils types typinfo $(SORTBASEUNIT) $(FGLUNIT) classes \ cpu $(MMXUNIT) $(GETOPTSUNIT) \ $(CHARSETUNIT) $(CPALLUNIT) \ - rtlconsts $(MATHUNIT) \ + $(RTLCONSTSUNIT) $(MATHUNIT) \ $(DYNLIBSUNIT) $(CMEMUNIT) ctypes \ $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) -rsts=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT) rtlconsts system +rsts=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT) system implicitunits=$(EXEINFOUNIT) $(CP_UNITS) [require] @@ -146,7 +146,7 @@ sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \ $(COMPILER) -Fi$(OBJPASDIR)/sysutils sysutils.pp classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) \ + sysutils$(PPUEXT) typinfo$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(SYSCONSTUNIT)$(PPUEXT) types$(PPUEXT) sortbase$(PPUEXT) \ tthread.inc $(FGLUNIT)$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp @@ -157,9 +157,6 @@ typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(OBJPASDIR)/types.pp -rtlconsts$(PPUEXT) : $(OBJPASDIR)/rtlconsts.pp $(OBJPASUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) - $(COMPILER) $(OBJPASDIR)/rtlconsts.pp - # # Other system-independent RTL Units # diff --git a/rtl/openbsd/Makefile.fpc b/rtl/openbsd/Makefile.fpc index 2453a8d9e7..cb7fefbb73 100644 --- a/rtl/openbsd/Makefile.fpc +++ b/rtl/openbsd/Makefile.fpc @@ -12,7 +12,7 @@ fpcpackage=y loaders=$(LOADERS) units=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(INITCUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) baseunix \ $(LINUXUNIT) unixtype unixutil unix ctypes $(BSDUNIT) \ - $(CPU_UNITS) dos rtlconsts \ + $(CPU_UNITS) dos $(RTLCONSTSUNIT) \ sysutils $(SORTBASEUNIT) $(FGLUNIT) classes typinfo $(MATHUNIT) \ $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) \ $(ERRORSUNIT) \ @@ -191,9 +191,6 @@ classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) sysutils$(PPUEXT) typinfo$(PPUEXT) $(FGLUNIT)$(PPUEXT) sortbase$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp -rtlconsts$(PPUEXT) : $(OBJPASDIR)/rtlconsts.pp - $(COMPILER) $(OBJPASDIR)/rtlconsts.pp - typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp @@ -225,6 +222,3 @@ endif cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp $(COMPILER) $< -rtlconst$(PPUEXT) : $(OBJPASDIR)/rtlconst.pp - $(COMPILER) $(OBJPASDIR)/rtlconst.pp - diff --git a/rtl/palmos/Makefile.fpc b/rtl/palmos/Makefile.fpc index 9d70a75f95..8b9f15593d 100644 --- a/rtl/palmos/Makefile.fpc +++ b/rtl/palmos/Makefile.fpc @@ -16,7 +16,7 @@ units=$(SYSTEMUNIT) si_prc $(UUCHARUNIT) objpas $(ISO7185UNIT) $(STRINGSUNIT) \ # $(LNFODWRFUNIT) $(LINEINFOUNIT) $(HEAPTRCUNIT) \ # windows messages $(DYNLIBSUNIT) \ # dos objects \ -# rtlconsts $(SYSCONSTUNIT) sysutils \ +# $(RTLCONSTSUNIT) $(SYSCONSTUNIT) sysutils \ # typinfo types $(FGLUNIT) classes fmtbcd \ # strutils convutils $(MATHUNIT) dateutils \ # varutils variants \ @@ -107,9 +107,6 @@ si_prc$(PPUEXT): si_prc.pp palmos.inc $(SYSTEMUNIT)$(PPUEXT) types$(PPUEXT) : $(OBJPASDIR)/types.pp objpas$(PPUEXT) $(MATHUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(OBJPASDIR)/types.pp -rtlconsts$(PPUEXT) : $(OBJPASDIR)/rtlconsts.pp $(SYSTEMUNIT)$(PPUEXT) - $(COMPILER) $(OBJPASDIR)/rtlconsts.pp - # # System Dependent Units # diff --git a/rtl/sinclairql/Makefile.fpc b/rtl/sinclairql/Makefile.fpc index 6ca4789cd7..0dbdc56c8d 100644 --- a/rtl/sinclairql/Makefile.fpc +++ b/rtl/sinclairql/Makefile.fpc @@ -10,11 +10,11 @@ loaders=$(LOADERS) units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) buildrtl $(CPALLUNIT) # $(EXTPASUNIT) $(MACPASUNIT) implicitunits=si_prc \ - ctypes rtlconsts $(STRINGSUNIT) \ + ctypes $(RTLCONSTSUNIT) $(STRINGSUNIT) \ $(SORTBASEUNIT) $(CHARSETUNIT) $(FPWIDESTRINGUNIT) \ $(CP_UNITS) $(UNICODEDATAUNIT) -rsts=$(MATHUNIT) rtlconsts typinfo classes $(SYSCONSTUNIT) +rsts=$(MATHUNIT) $(RTLCONSTSUNIT) typinfo classes $(SYSCONSTUNIT) [require] nortl=y diff --git a/rtl/solaris/Makefile.fpc b/rtl/solaris/Makefile.fpc index c4dfa33905..a7b62a9e72 100644 --- a/rtl/solaris/Makefile.fpc +++ b/rtl/solaris/Makefile.fpc @@ -16,14 +16,14 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(STRINGSUNIT) $(OBJPASUNIT) $ $(ERRORSUNIT) \ $(DLUNIT) $(DYNLIBSUNIT) \ types $(SYSCONSTUNIT) $(CHARACTERUNIT) \ - rtlconsts cthreads \ + $(RTLCONSTSUNIT) cthreads \ dos $(FPWIDESTRINGUNIT) \ cwstring $(FPINTRESUNIT) $(CPU_UNITS) \ $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) implicitunits=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT) -rsts=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT) rtlconst +rsts=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT) [require] nortl=y @@ -155,19 +155,16 @@ sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.in $(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) types$(PPUEXT) \ + sysutils$(PPUEXT) typinfo$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) types$(PPUEXT) \ $(SYSTEMUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) sortbase$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp -typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) rtlconsts$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) +typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(OBJPASDIR)/types.pp -rtlconsts$(PPUEXT) : $(OBJPASDIR)/rtlconsts.pp $(OBJPASUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) - $(COMPILER) $(OBJPASDIR)/rtlconsts.pp - # # Other system-independent RTL Units # diff --git a/rtl/wii/Makefile.fpc b/rtl/wii/Makefile.fpc index b3a948580b..69a2cd0a30 100644 --- a/rtl/wii/Makefile.fpc +++ b/rtl/wii/Makefile.fpc @@ -13,7 +13,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUN $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) \ $(FPWIDESTRINGUNIT) $(CHARACTERUNIT) \ $(TYPESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) $(LINEINFOUNIT) $(FGLUNIT) $(CMEMUNIT) -#rsts=$(MATHUNIT) rtlconsts varutils typinfo variants classes $(SYSCONSTUNIT) dateutil fpmkunit +#rsts=$(MATHUNIT) $(RTLCONSTSUNIT) varutils typinfo variants classes $(SYSCONSTUNIT) dateutil fpmkunit implicitunits=$(CP_UNITS) $(UNICODEDATAUNIT) [require] diff --git a/rtl/win16/Makefile.fpc b/rtl/win16/Makefile.fpc index ff575f8c8a..e861310f66 100644 --- a/rtl/win16/Makefile.fpc +++ b/rtl/win16/Makefile.fpc @@ -7,7 +7,7 @@ main=rtl loaders=prt0s prt0m prt0c prt0l prt0h units=system $(UUCHARUNIT) $(OBJPASUNIT) $(STRINGSUNIT) $(ISO7185UNIT) $(EXTPASUNIT) dos \ wintypes winprocs win31 $(PORTSUNIT) $(DYNLIBSUNIT) $(SORTBASEUNIT) \ - $(SYSCONSTUNIT) rtlconsts sysutils $(MATHUNIT) types typinfo $(FGLUNIT) \ + $(SYSCONSTUNIT) $(RTLCONSTSUNIT) sysutils $(MATHUNIT) types typinfo $(FGLUNIT) \ classes $(CHARSETUNIT) cpu $(GETOPTSUNIT) $(CPALLUNIT) \ $(UNICODEDATAUNIT) $(CHARACTERUNIT) ctypes implicitunits=$(CP_UNITS) @@ -117,13 +117,13 @@ sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \ $(EXECPPAS) classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconsts$(PPUEXT) \ + sysutils$(PPUEXT) typinfo$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ types$(PPUEXT) $(FGLUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ winprocs$(PPUEXT) wintypes$(PPUEXT) sortbase$(PPUEXT) system$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp $(EXECPPAS) -typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp sysutils$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) rtlconsts$(PPUEXT) system$(PPUEXT) +typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp sysutils$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) system$(PPUEXT) $(COMPILER) -Sg -Fi$(OBJPASDIR) $(OBJPASDIR)/typinfo.pp $(EXECPPAS) @@ -131,10 +131,6 @@ types$(PPUEXT) : $(OBJPASDIR)/types.pp $(MATHUNIT)$(PPUEXT) wintypes$(PPUEXT) $( $(COMPILER) $(OBJPASDIR)/types.pp $(EXECPPAS) -rtlconsts$(PPUEXT) : $(OBJPASDIR)/rtlconsts.pp $(OBJPASDIR)/rtlconst.inc $(OBJPASUNIT)$(PPUEXT) system$(PPUEXT) - $(COMPILER) -Fi$(OBJPASDIR) $(OBJPASDIR)/rtlconsts.pp - $(EXECPPAS) - # # Other system-independent RTL Units #