Remove OS rules for strings unit and use STRINGSUNIT variable

This commit is contained in:
Pierre Muller 2023-09-12 21:38:48 +00:00
parent e77402ecb4
commit 20e87be824
19 changed files with 30 additions and 102 deletions

View File

@ -7,7 +7,7 @@ main=rtl
[target] [target]
loaders= loaders=
units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes strings $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) \ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(STRINGSUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) \
$(HEAPTRCUNIT) \ $(HEAPTRCUNIT) \
baseunix unixutil \ baseunix unixutil \
termio unix initc cmem \ termio unix initc cmem \
@ -48,7 +48,7 @@ sourcedir=$(INC) $(PROCINC) $(UNIXINC) $(COMMON)
[lib] [lib]
libname=libfprtl.so libname=libfprtl.so
libversion=2.0.0 libversion=2.0.0
libunits=$(SYSTEMUNIT) $(OBJPASUNIT) strings \ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) $(STRINGSUNIT) \
unix \ unix \
dos crt \ dos crt \
sysutils typinfo math \ sysutils typinfo math \
@ -116,11 +116,6 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) $(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS)
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(SYSTEMUNIT).pp $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(SYSTEMUNIT).pp
strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \
$(PROCINC)/strings.inc $(PROCINC)/stringss.inc \
$(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(INC)/strings.pp
# #
# System Dependent Units # System Dependent Units
# #

View File

@ -8,7 +8,7 @@ main=rtl
[target] [target]
loaders=$(LOADERS) loaders=$(LOADERS)
units=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) \ units=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) \
$(UUCHARUNIT) unixtype ctypes baseunix strings $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) syscall unixutil \ $(UUCHARUNIT) unixtype ctypes baseunix $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) syscall unixutil \
$(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) termio unix linux initc cmem \ $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) 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 \
@ -42,7 +42,7 @@ sourcedir=$(INC) $(PROCINC) $(UNIXINC) $(ARCH) $(COMMON) $(LINUXINC)
targetdir=. targetdir=.
[shared] [shared]
libunits=$(SYSTEMUNIT) $(OBJPASUNIT) strings dos \ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) $(STRINGSUNIT) dos \
unix baseunix unixtype unixutil \ unix baseunix unixtype unixutil \
sysutils typinfo math \ sysutils typinfo math \
$(CPU_UNITS) getopts \ $(CPU_UNITS) getopts \
@ -133,11 +133,6 @@ dllprt0$(OEXT) : dllprt0.as
$(SYSTEMUNIT)$(PPUEXT) : $(LINUXINC)/$(SYSTEMUNIT).pp $(SYSDEPS) $(SYSTEMUNIT)$(PPUEXT) : $(LINUXINC)/$(SYSTEMUNIT).pp $(SYSDEPS)
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(LINUXINC)/$(SYSTEMUNIT).pp $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(LINUXINC)/$(SYSTEMUNIT).pp
strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\
$(PROCINC)/strings.inc $(PROCINC)/stringss.inc\
$(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(INC)/strings.pp
# #
# $(SYSTEMUNIT) Dependent Units # $(SYSTEMUNIT) Dependent Units
# #

View File

@ -44,7 +44,7 @@ targetdir=.
[lib] [lib]
libname=libfprtl.so libname=libfprtl.so
libversion=2.0.0 libversion=2.0.0
libunits=$(SYSTEMUNIT) $(OBJPASUNIT) strings \ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) $(STRINGSUNIT) \
unix \ unix \
dos crt \ dos crt \
sysutils typinfo math \ sysutils typinfo math \

View File

@ -11,7 +11,7 @@ fpcpackage=y
[target] [target]
loaders=prt0 cprt0 gprt0 dllprt0 loaders=prt0 cprt0 gprt0 dllprt0
units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \
strings syscall sysctl baseunix unixutil character \ $(STRINGSUNIT) syscall sysctl baseunix unixutil character \
unix rtlconsts initc cmem \ unix rtlconsts initc cmem \
dl termio \ dl termio \
sysutils math typinfo types sortbase classes fgl dynlibs \ sysutils math typinfo types sortbase classes fgl dynlibs \
@ -48,7 +48,7 @@ sourcedir=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON)
[lib] [lib]
libname=libfprtl.so libname=libfprtl.so
libversion=2.0.0 libversion=2.0.0
libunits=$(SYSTEMUNIT) $(OBJPASUNIT) strings \ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) $(STRINGSUNIT) \
unix \ unix \
dos \ dos \
sysutils typinfo math \ sysutils typinfo math \
@ -126,10 +126,6 @@ dllprt0$(OEXT) : $(CPU_TARGET)/dllprt0.as
$(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp unxconst.inc $(SYSDEPS) $(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp unxconst.inc $(SYSDEPS)
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp
strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\
$(PROCINC)/strings.inc $(PROCINC)/stringss.inc\
$(SYSTEMUNIT)$(PPUEXT)
# #
# System Dependent Units # System Dependent Units
# #

View File

@ -13,7 +13,7 @@ loaders=$(LOADERS)
# the common units which are not compiled for all CPUs are stored in # the common units which are not compiled for all CPUs are stored in
# CPU_SPECIFIC_COMMON_UNITS # CPU_SPECIFIC_COMMON_UNITS
units=$(SYSTEMUNIT) $(CPU_UNITS) $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(HEAPMGRUNIT) $(CONSOLEIOUNIT) $(CPU_SPECIFIC_COMMON_UNITS) \ units=$(SYSTEMUNIT) $(CPU_UNITS) $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(HEAPMGRUNIT) $(CONSOLEIOUNIT) $(CPU_SPECIFIC_COMMON_UNITS) \
# $(MACPASUNIT) $(ISO7185UNIT) strings # $(MACPASUNIT) $(ISO7185UNIT) $(STRINGSUNIT)
$(STRINGSUNIT) \ $(STRINGSUNIT) \
$(SORTBASEUNIT) \ $(SORTBASEUNIT) \
$(DOSUNIT) \ $(DOSUNIT) \
@ -300,7 +300,7 @@ startup$(OEXT) : $(CPU_TARGET)/startup.s
$(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)startup$(OEXT) $(CPU_TARGET)/startup.s -mabi=32 -march=pic32mx -mtune=pic32mx -W -EL -msym32 $(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)startup$(OEXT) $(CPU_TARGET)/startup.s -mabi=32 -march=pic32mx -mtune=pic32mx -W -EL -msym32
# #
# Base Units (System, strings, os-dependent-base-unit) # Base Units (System, $(STRINGSUNIT), os-dependent-base-unit)
# #
CONSOLEIO_DEPS= consoleio.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ CONSOLEIO_DEPS= consoleio.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \

View File

@ -11,7 +11,7 @@ fpcpackage=y
[target] [target]
loaders=prt0 cprt0 gprt0 dllprt0 loaders=prt0 cprt0 gprt0 dllprt0
units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \
strings syscall sysctl baseunix unixutil character \ $(STRINGSUNIT) syscall sysctl baseunix unixutil character \
unix rtlconsts initc cmem \ unix rtlconsts initc cmem \
dl termio \ dl termio \
sysutils math typinfo types sortbase classes fgl dynlibs \ sysutils math typinfo types sortbase classes fgl dynlibs \
@ -48,7 +48,7 @@ sourcedir=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(COMMON)
[lib] [lib]
libname=libfprtl.so libname=libfprtl.so
libversion=2.0.0 libversion=2.0.0
libunits=$(SYSTEMUNIT) $(OBJPASUNIT) strings \ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) $(STRINGSUNIT) \
unix \ unix \
dos \ dos \
sysutils typinfo math \ sysutils typinfo math \
@ -131,11 +131,6 @@ dllprt0$(OEXT) : $(CPU_TARGET)/dllprt0.as
$(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp unxconst.inc $(SYSDEPS) $(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp unxconst.inc $(SYSDEPS)
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp
strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\
$(PROCINC)/strings.inc $(PROCINC)/stringss.inc\
$(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
# #
# System Dependent Units # System Dependent Units
# #

View File

@ -13,7 +13,7 @@ loaders=$(LOADERS)
# the common units which are not compiled for all CPUs are stored in # the common units which are not compiled for all CPUs are stored in
# CPU_SPECIFIC_COMMON_UNITS # CPU_SPECIFIC_COMMON_UNITS
units=$(SYSTEMUNIT) $(CPU_UNITS) $(UUCHARUNIT) objpas $(ISO7185UNIT) $(EXTPASUNIT) heapmgr consoleio $(CPU_SPECIFIC_COMMON_UNITS) \ units=$(SYSTEMUNIT) $(CPU_UNITS) $(UUCHARUNIT) objpas $(ISO7185UNIT) $(EXTPASUNIT) heapmgr consoleio $(CPU_SPECIFIC_COMMON_UNITS) \
# $(MACPASUNIT) $(ISO7185UNIT) strings # $(MACPASUNIT) $(ISO7185UNIT) $(STRINGSUNIT)
$(STRINGSUNIT) \ $(STRINGSUNIT) \
$(SORTBASEUNIT) \ $(SORTBASEUNIT) \
$(DOSUNIT) \ $(DOSUNIT) \
@ -272,7 +272,7 @@ startup$(OEXT) : $(CPU_TARGET)/startup.s
$(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)startup$(OEXT) $(CPU_TARGET)/startup.s -mabi=32 -march=pic32mx -mtune=pic32mx -W -EL -msym32 $(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)startup$(OEXT) $(CPU_TARGET)/startup.s -mabi=32 -march=pic32mx -mtune=pic32mx -W -EL -msym32
# #
# Base Units (System, strings, os-dependent-base-unit) # Base Units (System, $(STRINGSUNIT), os-dependent-base-unit)
# #
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) $(INC)/softfpu.pp $(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) $(INC)/softfpu.pp

View File

@ -5,7 +5,7 @@
main=rtl main=rtl
[target] [target]
loaders=prt0 exceptn fpu loaders=prt0 exceptn fpu
units=system $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) strings \ units=system $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
go32 dpmiexcp initc ports profile dxetype dxeload emu387 \ go32 dpmiexcp initc ports profile dxetype dxeload emu387 \
dos cmem sortbase \ dos cmem sortbase \
sysutils classes math typinfo \ sysutils classes math typinfo \
@ -80,12 +80,6 @@ system$(PPUEXT) : system.pp $(SYSDEPS)
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp
$(EXECPPAS) $(EXECPPAS)
strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \
$(PROCINC)/strings.inc $(PROCINC)/stringss.inc \
system$(PPUEXT)
$(COMPILER) $(INC)/strings.pp
$(EXECPPAS)
# #
# System Dependent Units # System Dependent Units
# #

View File

@ -45,7 +45,7 @@ targetdir=.
[lib] [lib]
libname=libfprtl.so libname=libfprtl.so
libversion=2.0.0 libversion=2.0.0
libunits=$(SYSTEMUNIT) $(OBJPASUNIT) strings \ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) $(STRINGSUNIT) \
unix \ unix \
dos \ dos \
sysutils typinfo math \ sysutils typinfo math \

View File

@ -5,9 +5,9 @@
main=rtl main=rtl
[target] [target]
#loaders=prt0s prt0t prt0m prt0c prt0l prt0h # exceptn fpu #loaders=prt0s prt0t prt0m prt0c prt0l prt0h # exceptn fpu
units=system si_prc $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) strings charset cpall \ units=system si_prc $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(STRINGSUNIT) charset cpall \
getopts $(EXEINFOUNIT) $(HEAPTRCUNIT) getopts $(EXEINFOUNIT) $(HEAPTRCUNIT)
#$(UUCHARUNIT) $(OBJPASUNIT) strings dos $(HEAPTRCUNIT) $(LNFODWRFUNIT) sysconst sysutils \ #$(UUCHARUNIT) $(OBJPASUNIT) $(STRINGSUNIT) dos $(HEAPTRCUNIT) $(LNFODWRFUNIT) sysconst sysutils \
# math $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) rtlconsts typinfo cpu types \ # math $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) rtlconsts typinfo cpu types \
# getopts sortbase fgl classes \ # getopts sortbase fgl classes \
# msmouse ports \ # msmouse ports \
@ -80,13 +80,6 @@ system$(PPUEXT) : system.pp $(SYSDEPS) $(INC)/tnyheaph.inc $(INC)/tinyheap.inc r
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp
$(EXECPPAS) $(EXECPPAS)
strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \
$(PROCINC)/strings.inc $(PROCINC)/stringss.inc \
$(INC)/genstr.inc $(INC)/genstrs.inc \
system$(PPUEXT)
$(COMPILER) $(INC)/strings.pp
$(EXECPPAS)
# #
# System Dependent Units # System Dependent Units
# #

View File

@ -10,7 +10,7 @@ loaders=
#units=system $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) buildrtl $(LINEINFOUNIT) $(LNFODWRFUNIT) #units=system $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) buildrtl $(LINEINFOUNIT) $(LNFODWRFUNIT)
units=system $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) cpall buildrtl units=system $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) cpall buildrtl
implicitunits=ndk ndkutils ddk \ implicitunits=ndk ndkutils ddk \
ctypes strings \ ctypes $(STRINGSUNIT) \
# $(HEAPTRCUNIT) # $(HEAPTRCUNIT)
# initc cmem dynlibs signals \ # initc cmem dynlibs signals \
dos \ dos \

View File

@ -11,7 +11,7 @@ fpcpackage=y
[target] [target]
loaders=prt0 cprt0 dllprt0 loaders=prt0 cprt0 dllprt0
units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \
strings syscall sysctl baseunix unixutil character \ $(STRINGSUNIT) syscall sysctl baseunix unixutil character \
unix rtlconsts initc cmem \ unix rtlconsts initc cmem \
dl termio \ dl termio \
sysutils math typinfo types sortbase classes fgl dynlibs \ sysutils math typinfo types sortbase classes fgl dynlibs \
@ -47,7 +47,7 @@ sourcedir=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC)
[lib] [lib]
libname=libfprtl.so libname=libfprtl.so
libversion=2.0.0 libversion=2.0.0
libunits=$(SYSTEMUNIT) $(OBJPASUNIT) strings \ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) $(STRINGSUNIT) \
unix \ unix \
dos \ dos \
sysutils typinfo math \ sysutils typinfo math \
@ -125,11 +125,6 @@ dllprt0$(OEXT) : $(CPU_TARGET)/dllprt0.as
$(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp sysconst.inc systypes.inc syscalls.inc $(SYSDEPS) $(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp sysconst.inc systypes.inc syscalls.inc $(SYSDEPS)
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp
strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\
$(PROCINC)/strings.inc $(PROCINC)/stringss.inc\
$(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
# #
# System Dependent Units # System Dependent Units
# #

View File

@ -7,7 +7,7 @@ main=rtl
[target] [target]
loaders=nwplibc nwl_main nwl_dlle loaders=nwplibc nwl_main nwl_dlle
units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) strings \ units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
$(LINEINFOUNIT) $(LNFODWRFUNIT) $(HEAPTRCUNIT) \ $(LINEINFOUNIT) $(LNFODWRFUNIT) $(HEAPTRCUNIT) \
nwsnut libc dos sysconst \ nwsnut libc dos sysconst \
initc sysutils types typinfo sortbase fgl classes \ initc sysutils types typinfo sortbase fgl classes \
@ -127,10 +127,6 @@ $(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp libc.pp $(SYSDEPS)
$(COPY) $(IMPFILES) $(COMPILER_UNITTARGETDIR) $(COPY) $(IMPFILES) $(COMPILER_UNITTARGETDIR)
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(SYSTEMUNIT).pp $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(SYSTEMUNIT).pp
strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\
$(PROCINC)/strings.inc $(PROCINC)/stringss.inc\
$(SYSTEMUNIT)$(PPUEXT)
# #
# System Dependent Units # System Dependent Units
# #

View File

@ -10,7 +10,7 @@ fpcpackage=y
[target] [target]
loaders=$(LOADERS) loaders=$(LOADERS)
units=$(SYSTEMUNIT) $(SYSINIT_UNITS) initc $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) strings syscall baseunix \ units=$(SYSTEMUNIT) $(SYSINIT_UNITS) initc $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) syscall baseunix \
$(LINUXUNIT) unixtype unixutil unix ctypes bsd \ $(LINUXUNIT) unixtype unixutil unix ctypes bsd \
$(CPU_UNITS) dos rtlconsts \ $(CPU_UNITS) dos rtlconsts \
sysutils sortbase fgl classes typinfo math \ sysutils sortbase fgl classes typinfo math \
@ -47,7 +47,7 @@ sourcedir=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC)
[lib] [lib]
libname=libfprtl.so libname=libfprtl.so
libversion=2.0.0 libversion=2.0.0
libunits=$(SYSTEMUNIT) $(OBJPASUNIT) strings \ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) $(STRINGSUNIT) \
unix \ unix \
dos \ dos \
sysutils typinfo math \ sysutils typinfo math \
@ -144,11 +144,6 @@ si_g$(PPUEXT) : si_g.pp si_intf.inc si_impl.inc $(ARCH)/openbsd_ident.inc $(ARCH
$(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp sysconst.inc systypes.inc syscalls.inc $(SYSDEPS) $(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp sysconst.inc systypes.inc syscalls.inc $(SYSDEPS)
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp
strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\
$(PROCINC)/strings.inc $(PROCINC)/stringss.inc\
$(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(INC)/strings.pp
# #
# System Dependent Units # System Dependent Units
# #

View File

@ -7,12 +7,12 @@ main=rtl
[target] [target]
loaders= prt0 loaders= prt0
units=$(SYSTEMUNIT) si_prc $(UUCHARUNIT) objpas $(ISO7185UNIT) strings \ units=$(SYSTEMUNIT) si_prc $(UUCHARUNIT) objpas $(ISO7185UNIT) $(STRINGSUNIT) \
ctypes \ ctypes \
charset cpall \ charset cpall \
sysconst \ sysconst \
systraps pilot systraps pilot
#units=$(SYSTEMUNIT) $(UUCHARUNIT) ctypes objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) strings \ #units=$(SYSTEMUNIT) $(UUCHARUNIT) ctypes objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
# $(LNFODWRFUNIT) $(LINEINFOUNIT) $(HEAPTRCUNIT) \ # $(LNFODWRFUNIT) $(LINEINFOUNIT) $(HEAPTRCUNIT) \
# windows messages dynlibs \ # windows messages dynlibs \
# dos objects \ # dos objects \
@ -108,10 +108,6 @@ $(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS)
si_prc$(PPUEXT): si_prc.pp palmos.inc $(SYSTEMUNIT)$(PPUEXT) si_prc$(PPUEXT): si_prc.pp palmos.inc $(SYSTEMUNIT)$(PPUEXT)
strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\
$(PROCINC)/strings.inc $(PROCINC)/stringss.inc\
$(SYSTEMUNIT)$(PPUEXT)
cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT) cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT)
$(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas
@ -124,11 +120,6 @@ rtlconsts$(PPUEXT) : $(OBJPASDIR)/rtlconsts.pp $(SYSTEMUNIT)$(PPUEXT)
sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/sysconst.pp $(COMPILER) $(OBJPASDIR)/sysconst.pp
strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \
$(PROCINC)/strings.inc $(PROCINC)/stringss.inc \
$(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
# #
# System Dependent Units # System Dependent Units
# #

View File

@ -7,7 +7,7 @@ main=rtl
[target] [target]
loaders=cprt0 crti crtn loaders=cprt0 crti crtn
units=system $(UUCHARUNIT) dos $(OBJPASUNIT) objects strings \ units=system $(UUCHARUNIT) dos $(OBJPASUNIT) objects $(STRINGSUNIT) \
sysutils typinfo math \ sysutils typinfo math \
cpu mmx getopts $(HEAPTRCUNIT) $(LINEINFOUNIT) posix cpu mmx getopts $(HEAPTRCUNIT) $(LINEINFOUNIT) posix
rsts=math typinfo rsts=math typinfo
@ -90,11 +90,6 @@ dllprt$(OEXT) : $(CPU_TARGET)/dllprt.as
system$(PPUEXT) : system.pp $(SYSDEPS) system$(PPUEXT) : system.pp $(SYSDEPS)
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp
strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\
$(PROCINC)/strings.inc $(PROCINC)/stringss.inc\
system$(PPUEXT)
# #
# TP7 Compatible RTL Units # TP7 Compatible RTL Units
# #

View File

@ -10,7 +10,7 @@ loaders=$(LOADERS)
units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) buildrtl cpall units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) buildrtl cpall
# $(EXTPASUNIT) $(MACPASUNIT) # $(EXTPASUNIT) $(MACPASUNIT)
implicitunits=si_prc \ implicitunits=si_prc \
ctypes rtlconsts strings \ ctypes rtlconsts $(STRINGSUNIT) \
sortbase charset fpwidestring \ sortbase charset fpwidestring \
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 \

View File

@ -7,7 +7,7 @@ main=rtl
[target] [target]
loaders= loaders=
units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes strings $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) \ units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(STRINGSUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) \
$(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) \ $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) \
baseunix unixutil unixcp \ baseunix unixutil unixcp \
termio unix initc cmem \ termio unix initc cmem \
@ -48,7 +48,7 @@ sourcedir=$(INC) $(PROCINC) $(UNIXINC) $(COMMON)
[lib] [lib]
libname=libfprtl.so libname=libfprtl.so
libversion=2.0.0 libversion=2.0.0
libunits=$(SYSTEMUNIT) $(OBJPASUNIT) strings \ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) $(STRINGSUNIT) \
unix \ unix \
dos \ dos \
sysutils typinfo math \ sysutils typinfo math \
@ -116,11 +116,6 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) $(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS)
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(SYSTEMUNIT).pp $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(SYSTEMUNIT).pp
strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \
$(PROCINC)/strings.inc $(PROCINC)/stringss.inc \
$(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(INC)/strings.pp
# #
# System Dependent Units # System Dependent Units
# #

View File

@ -5,7 +5,7 @@
main=rtl main=rtl
[target] [target]
loaders=prt0s prt0m prt0c prt0l prt0h loaders=prt0s prt0m prt0c prt0l prt0h
units=system $(UUCHARUNIT) $(OBJPASUNIT) strings $(ISO7185UNIT) $(EXTPASUNIT) dos \ units=system $(UUCHARUNIT) $(OBJPASUNIT) $(STRINGSUNIT) $(ISO7185UNIT) $(EXTPASUNIT) dos \
wintypes winprocs win31 ports dynlibs sortbase \ wintypes winprocs win31 ports dynlibs sortbase \
sysconst rtlconsts sysutils math types typinfo fgl \ sysconst rtlconsts sysutils math types typinfo fgl \
classes charset cpu getopts cpall \ classes charset cpu getopts cpall \
@ -86,13 +86,6 @@ system$(PPUEXT) : system.pp $(SYSDEPS) wintypes.inc winprocsh.inc winprocs.inc \
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp
$(EXECPPAS) $(EXECPPAS)
strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \
$(PROCINC)/strings.inc $(PROCINC)/stringss.inc \
$(INC)/genstr.inc $(INC)/genstrs.inc \
system$(PPUEXT)
$(COMPILER) $(INC)/strings.pp
$(EXECPPAS)
# #
# WinAPI Units # WinAPI Units
# #