From fedf091a276aeed6a65e97cc122ac8824f9e8673 Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Wed, 28 May 2025 08:29:48 +0000 Subject: [PATCH] Add character unit to macos RTL unit list --- rtl/macos/Makefile | 23 +++++++++++++++++------ rtl/macos/Makefile.fpc | 4 ++-- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/rtl/macos/Makefile b/rtl/macos/Makefile index 18c9757546..5cec6acbde 100644 --- a/rtl/macos/Makefile +++ b/rtl/macos/Makefile @@ -924,10 +924,10 @@ OBJPASDIR=$(RTL)/objpas DOS_DEPS_OS=$(MACOSTPUNIT)$(PPUEXT) $(MACUTILSUNIT)$(PPUEXT) SYSUTILS_DEPS_OS=$(DOSUNIT)$(PPUEXT) ifeq ($(CPU_OS_TARGET),m68k-macosclassic) -override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(STRINGSUNIT) $(MACPASUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(MACOSTPUNIT) $(MACUTILSUNIT) $(EXTPASUNIT) $(HEAPTRCUNIT) $(GETOPTSUNIT) $(UNIXUTILUNIT) $(DOSUNIT) $(CMEMUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CTYPESUNIT) $(SYSCONSTUNIT) $(SORTBASEUNIT) $(SYSUTILSUNIT) $(CLASSESUNIT) $(TYPINFOUNIT) $(FGLUNIT) $(TYPESUNIT) $(MATHUNIT) $(UFLOAT128UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(SFPUX80UNIT) $(SOFTFPUUNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(STRINGSUNIT) $(MACPASUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(MACOSTPUNIT) $(MACUTILSUNIT) $(EXTPASUNIT) $(HEAPTRCUNIT) $(GETOPTSUNIT) $(CHARACTERUNIT) $(UNIXUTILUNIT) $(DOSUNIT) $(CMEMUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CTYPESUNIT) $(SYSCONSTUNIT) $(SORTBASEUNIT) $(SYSUTILSUNIT) $(CLASSESUNIT) $(TYPINFOUNIT) $(FGLUNIT) $(TYPESUNIT) $(MATHUNIT) $(UFLOAT128UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(SFPUX80UNIT) $(SOFTFPUUNIT) endif ifeq ($(CPU_OS_TARGET),powerpc-macosclassic) -override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(STRINGSUNIT) $(MACPASUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(MACOSTPUNIT) $(MACUTILSUNIT) $(EXTPASUNIT) $(HEAPTRCUNIT) $(GETOPTSUNIT) $(UNIXUTILUNIT) $(DOSUNIT) $(CMEMUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CTYPESUNIT) $(SYSCONSTUNIT) $(SORTBASEUNIT) $(SYSUTILSUNIT) $(CLASSESUNIT) $(TYPINFOUNIT) $(FGLUNIT) $(TYPESUNIT) $(MATHUNIT) $(UFLOAT128UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(SFPUX80UNIT) $(SOFTFPUUNIT) +override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(STRINGSUNIT) $(MACPASUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(MACOSTPUNIT) $(MACUTILSUNIT) $(EXTPASUNIT) $(HEAPTRCUNIT) $(GETOPTSUNIT) $(CHARACTERUNIT) $(UNIXUTILUNIT) $(DOSUNIT) $(CMEMUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CTYPESUNIT) $(SYSCONSTUNIT) $(SORTBASEUNIT) $(SYSUTILSUNIT) $(CLASSESUNIT) $(TYPINFOUNIT) $(FGLUNIT) $(TYPESUNIT) $(MATHUNIT) $(UFLOAT128UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(SFPUX80UNIT) $(SOFTFPUUNIT) endif ifeq ($(CPU_OS_TARGET),m68k-macosclassic) override TARGET_IMPLICITUNITS+=$(CP_UNITS) @@ -936,10 +936,10 @@ ifeq ($(CPU_OS_TARGET),powerpc-macosclassic) override TARGET_IMPLICITUNITS+=$(CP_UNITS) endif ifeq ($(CPU_OS_TARGET),m68k-macosclassic) -override TARGET_RSTS+=$(MATHUNIT) $(SYSCONSTUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(SYSCONSTUNIT) $(UNICODEDATAUNIT) endif ifeq ($(CPU_OS_TARGET),powerpc-macosclassic) -override TARGET_RSTS+=$(MATHUNIT) $(SYSCONSTUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(SYSCONSTUNIT) $(UNICODEDATAUNIT) endif override INSTALL_FPCPACKAGE=y y ifeq ($(CPU_OS_TARGET),m68k-macosclassic) @@ -1166,6 +1166,7 @@ STATICLIBPREFIX=libp IMPORTLIBPREFIX=libimp RSTEXT=.rsj EXEDBGEXT=.dbg +ALL_EXEEXT=.exe ifeq ($(OS_TARGET),go32v1) STATICLIBPREFIX= SHORTSUFFIX=v1 @@ -1262,6 +1263,7 @@ ifeq ($(OS_TARGET),atari) EXEEXT=.ttp SHORTSUFFIX=ata endif +ALL_EXEEXT+=.ttp ifeq ($(OS_TARGET),beos) BATCHEXT=.sh EXEEXT= @@ -1288,6 +1290,7 @@ STATICLIBPREFIX= SHORTSUFFIX=nw IMPORTLIBPREFIX=imp endif +ALL_EXEEXT+=.nlm ifeq ($(OS_TARGET),netwlibc) EXEEXT=.nlm STATICLIBPREFIX= @@ -1313,6 +1316,7 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif +ALL_EXEEXT+=.gba ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian @@ -1326,6 +1330,7 @@ EXEEXT=.dol SHAREDLIBEXT=.so SHORTSUFFIX=wii endif +ALL_EXEEXT+=.dol ifeq ($(OS_TARGET),aix) BATCHEXT=.sh EXEEXT= @@ -1368,6 +1373,7 @@ OEXT=.rel endif SHORTSUFFIX=emb endif +ALL_EXEEXT+=.bin ifeq ($(OS_TARGET),win16) STATICLIBPREFIX= STATICLIBEXT=.a @@ -1380,6 +1386,7 @@ endif ifeq ($(OS_TARGET),wasip1) EXEEXT=.wasm endif +ALL_EXEEXT+=.wasm ifeq ($(OS_TARGET),wasip1threads) EXEEXT=.wasm endif @@ -1980,6 +1987,7 @@ override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEDBGFILES)) endif ifdef CLEAN_PROGRAMS override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEEXT), $(CLEAN_PROGRAMS))) +override ALL_CLEANEXEFILES+=$(foreach lEXEEXT,$(ALL_EXEEXT),$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(lEXEEXT), $(CLEAN_PROGRAMS)))) override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEDBGEXT), $(CLEAN_PROGRAMS))) endif ifdef CLEAN_UNITS @@ -2018,12 +2026,15 @@ ifdef LIB_NAME -$(DEL) $(LIB_NAME) $(LIB_FULLNAME) endif -$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT) - -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res + -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res symbol_order*.fpc -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES -$(DEL) $(CLEANEXEFILES) endif +ifdef ALL_CLEANEXEFILES + -$(DEL) $(ALL_CLEANEXEFILES) +endif ifdef COMPILER_UNITTARGETDIR ifdef CLEANPPUFILES -$(DEL) $(CLEANPPUFILES) @@ -2046,7 +2057,7 @@ ifneq ($(PPUEXT),.ppu) endif -$(DELTREE) *$(SMARTEXT) -$(DEL) fpcmade.* Package.fpc *.fpm - -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res + -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res symbol_order*.fpc -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT) ifdef AOUTEXT -$(DEL) *$(AOUTEXT) diff --git a/rtl/macos/Makefile.fpc b/rtl/macos/Makefile.fpc index fe2cc33453..43fad7c123 100644 --- a/rtl/macos/Makefile.fpc +++ b/rtl/macos/Makefile.fpc @@ -8,14 +8,14 @@ main=rtl [target] loaders= units=$(SYSTEMUNIT) $(UUCHARUNIT) $(STRINGSUNIT) $(MACPASUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(MACOSTPUNIT) $(MACUTILSUNIT) $(EXTPASUNIT) \ - $(HEAPTRCUNIT) $(GETOPTSUNIT) \ + $(HEAPTRCUNIT) $(GETOPTSUNIT) $(CHARACTERUNIT) \ $(UNIXUTILUNIT) $(DOSUNIT) $(CMEMUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CTYPESUNIT) $(SYSCONSTUNIT) \ $(SORTBASEUNIT) $(SYSUTILSUNIT) $(CLASSESUNIT) $(TYPINFOUNIT) $(FGLUNIT) $(TYPESUNIT) \ $(MATHUNIT) $(UFLOAT128UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(SFPUX80UNIT) $(SOFTFPUUNIT) # exec \ # printer \ # $(LINEINFOUNIT) $(LNFODWRFUNIT) -rsts=$(MATHUNIT) $(SYSCONSTUNIT) +rsts=$(MATHUNIT) $(SYSCONSTUNIT) $(UNICODEDATAUNIT) # implicitunits=exeinfo implicitunits=$(CP_UNITS)