From 401fcf6dfc41bd3e7e50be871c361a40011e08af Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Fri, 4 Aug 2023 10:17:45 +0200 Subject: [PATCH] Use RTLCONSTSUNIT but set the variable to rtlconst --- rtl/beos/Makefile.fpc | 3 ++- rtl/emx/Makefile.fpc | 3 ++- rtl/netware/Makefile.fpc | 3 ++- rtl/os2/Makefile.fpc | 3 ++- rtl/symbian/Makefile.fpc | 3 ++- rtl/watcom/Makefile.fpc | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/rtl/beos/Makefile.fpc b/rtl/beos/Makefile.fpc index 57f4b1c722..4417c7c43c 100644 --- a/rtl/beos/Makefile.fpc +++ b/rtl/beos/Makefile.fpc @@ -12,7 +12,7 @@ units=system uuchar $(BASEUNIXUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) objpas macpas $(SYSCONSTUNIT) $(SYSUTILSUNIT) \ $(TYPESUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(TYPINFOUNIT) $(SORTBASEUNIT) $(CLASSESUNIT) $(FGLUNIT) $(MATHUNIT) \ $(CPUUNIT) $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) \ - $(RTLCONSTUNIT) $(SYSCALLUNIT) $(UNIXUNIT) $(UNIXUTILUNIT) $(TERMIOUNIT) $(INITCUNIT) \ + $(RTLCONSTSUNIT) $(SYSCALLUNIT) $(UNIXUNIT) $(UNIXUTILUNIT) $(TERMIOUNIT) $(INITCUNIT) \ $(UNIXCPUNIT) $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) \ $(CMEMUNIT) \ $(DYNLIBSUNIT) $(CWSTRINGUNIT) \ @@ -60,6 +60,7 @@ UNIXINC=$(RTL)/unix UNITPREFIX=rtl SYSTEMUNIT=system BASEUNIXDIR=. +RTLCONSTSUNIT=rtlconst # Use new feature from 1.0.5 version # that generates release PPU files # which will not be recompiled diff --git a/rtl/emx/Makefile.fpc b/rtl/emx/Makefile.fpc index d62a7fa2cd..0f4deafef1 100644 --- a/rtl/emx/Makefile.fpc +++ b/rtl/emx/Makefile.fpc @@ -14,7 +14,7 @@ units=$(SYSTEMUNIT) uuchar ctypes objpas macpas $(ISO7185UNIT) $(EXTPASUNIT) $(S $(SUSITILSUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(MATHUNIT) $(TYPINFOUNIT) \ $(CHARSETUNIT) $(CPALLUNIT) $(CPUNIT) $(MMXUNIT) $(GETOPTSUNIT) \ $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(DYNLIBSUNIT) \ - $(TYPESUNIT) $(RTLCONSTUNIT) $(SYSCONSTUNIT) \ + $(TYPESUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) \ $(FPWIDESTRINGUNIT) $(CHARACTERUNIT) \ $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SPFU128UNIT) $(UFLOAT128UNIT) rsts=$(MATHUNIT) $(TYPINFOUNIT) pmhelp $(CLASSESUNIT) $(SYSCONSTUNIT) @@ -53,6 +53,7 @@ DYNLIBS_DEPS_OD=doscalls($PPUEXT) UNITPREFIX=rtl SYSTEMUNIT=system +RTLCONSTSUNIT=rtlconst # Use new feature from 1.0.5 version # that generates release PPU files diff --git a/rtl/netware/Makefile.fpc b/rtl/netware/Makefile.fpc index be8b07a980..79b2496545 100644 --- a/rtl/netware/Makefile.fpc +++ b/rtl/netware/Makefile.fpc @@ -12,7 +12,7 @@ units=$(SYSTEMUNIT) uuchar objpas macpas $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSU $(INITCUNIT) $(SYSUTILSUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(MATHUNIT) $(TYPINFOUNIT) \ $(CHARSETUNIT) $(CPALLUNIT) $(MMXUNIT) $(GETOPTSUNIT) \ $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(DYNLIBSUNIT) \ - $(CTYPESUNIT) $(TYPESUNIT) $(RTLCONSTUNIT) \ + $(CTYPESUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) \ $(FPWIDESTRINGUNIT) $(CHARACTERUNIT) $(CMEMUNIT) \ aio nwsnut nwserv nwnit nwprot netware nwcalls nwpre \ $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SPFU128UNIT) $(UFLOAT128UNIT) @@ -48,6 +48,7 @@ PROCINC=$(RTL)/$(CPU_TARGET) UNITPREFIX=rtl SYSTEMUNIT=system +RTLCONSTSUNIT=rtlconst DOS_DEPS_OS=$(STRINGSUNIT)$(PPUEXT) SYSUTILS_DEPS_OS=$(DOSUNIT)$(PPUEXT) diff --git a/rtl/os2/Makefile.fpc b/rtl/os2/Makefile.fpc index 5339f6773b..43eb1821dc 100644 --- a/rtl/os2/Makefile.fpc +++ b/rtl/os2/Makefile.fpc @@ -14,7 +14,7 @@ units=$(SYSTEMUNIT) uuchar ctypes objpas macpas $(ISO7185UNIT) $(EXTPASUNIT) $(S $(SUSITILSUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(MATHUNIT) $(TYPINFOUNIT) \ $(CHARSETUNIT) $(CPALLUNIT) $(CPUNIT) $(MMXUNIT) $(GETOPTSUNIT) \ $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(DYNLIBSUNIT) \ - $(TYPESUNIT) $(RTLCONSTUNIT) $(SYSCONSTUNIT) \ + $(TYPESUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) \ so32dll $(FPWIDESTRINGUNIT) $(CHARACTERUNIT) \ $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SPFU128UNIT) $(UFLOAT128UNIT) rsts=$(MATHUNIT) $(TYPINFOUNIT) pmhelp $(CLASSESUNIT) $(SYSCONSTUNIT) @@ -52,6 +52,7 @@ UNITPREFIX=rtl SYSUTILS_DEPS_OS=doscalls$(PPUEXT) SYSTEMUNIT=system +RTLCONSTSUNIT=rtlconst # Use new feature from 1.0.5 version # that generates release PPU files diff --git a/rtl/symbian/Makefile.fpc b/rtl/symbian/Makefile.fpc index 8f78bbd3ec..f6330ea95a 100644 --- a/rtl/symbian/Makefile.fpc +++ b/rtl/symbian/Makefile.fpc @@ -9,7 +9,7 @@ main=rtl # macpas and iso7185 units rely on sysutils unit, not yet handled here # extpas unit relies on dos unit, not yet handled units=$(SYSTEMUNIT) iso7185 extpas uuchar objpas macpas \ - $(SYSCONSTUNIT) $(SYSUTILSUNIT) $(MATHUNIT) $(RTLCONSTUNIT) \ + $(SYSCONSTUNIT) $(SYSUTILSUNIT) $(MATHUNIT) $(RTLCONSTSUNIT) \ $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(FGLUNIT) $(CPU_UNITS) \ $(DOSUNIT) $(TYPEINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) $(CLASSESUNIT) buildrtl implicitunits=$(CTYPESUNIT) $(STRINGSUNIT) $(SYMBIANUNIT) $(UNICODEDATAUNIT) @@ -39,6 +39,7 @@ UIQINC=./uiqinc UNITPREFIX=rtl SYSTEMUNIT=system +RTLCONSTSUNIT=rtlconst OBJPASDIR=$(RTL)/objpas diff --git a/rtl/watcom/Makefile.fpc b/rtl/watcom/Makefile.fpc index f537fc9839..8d90e86075 100644 --- a/rtl/watcom/Makefile.fpc +++ b/rtl/watcom/Makefile.fpc @@ -14,7 +14,7 @@ units=$(SYSTEMUNIT) uuchar $(CTYPESUNIT) objpas macpas $(ISO7185UNIT) $(EXTPASUN $(SYSUTILSUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(MATHUNIT) $(TYPINFOUNIT) \ $(CHARSETUNIT) $(CPALLUNIT) $(CPUUNIT) $(MMXUNIT) $(GETOPTSUNIT) \ $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) \ - $(TYPESUNIT) $(RTLCONSTUNIT) $(SYSCONSTUNIT) \ + $(TYPESUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) \ $(FPWIDESTRINGUNIT) $(CHARACTERUNIT) \ $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SPFU128UNIT) $(UFLOAT128UNIT) rsts=$(MATHUNIT) $(TYPINFOUNIT) pmhelp $(CLASSESUNIT) $(SYSCONSTUNIT) @@ -53,6 +53,7 @@ PROCINC=../$(CPU_TARGET) UNITPREFIX=rtl SYSTEMUNIT=system +RTLCONSTSUNIT=rtlconst DOS_DEPS_OS=$(STRINGSUNIT)$(PPUEXT) SYSUTILS_DEPS_OS=$(DOSUNIT)$(PPUEXT)