mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-13 07:34:28 +02:00
Remove OS spefic rules for system unit.
Use SYSDEPS variable to add specific dependencies. Override FPC_SYTEM_OPT to add OS specific options. Use SYSTEMUNIT variable.
This commit is contained in:
parent
b9544ad342
commit
70d25e3b60
@ -106,11 +106,3 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
|
||||
# Put system unit dependencies together.
|
||||
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
|
||||
|
||||
|
||||
#
|
||||
# System Units (System, Objpas, Strings)
|
||||
#
|
||||
|
||||
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS)
|
||||
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(SYSTEMUNIT).pp
|
||||
|
||||
|
@ -91,7 +91,7 @@ endif
|
||||
# Base Units (System, strings, os-dependent-base-unit)
|
||||
#
|
||||
|
||||
buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(HEAPTRCUNIT)$(PPUEXT)
|
||||
buildrtl$(PPUEXT): buildrtl.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(HEAPTRCUNIT)$(PPUEXT)
|
||||
$(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(CPU_TARGET) -Fu$(PROCINC) -Fu$(AMIINC) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) $(BUILDRTL_OPT) buildrtl
|
||||
|
||||
$(RESUNIT)$(PPUEXT) : $(INC)/$(RESUNIT).pp $(SYSTEMUNIT)$(PPUEXT)
|
||||
|
@ -59,6 +59,7 @@ TERMIODIR=$(LINUXINC)
|
||||
PTHREADINCDIR=$(LINUXINC)
|
||||
PTYPESINCDIR=$(LINUXINC)
|
||||
|
||||
SYSTEMDIR = $(LINUXINC)
|
||||
SYSCALL_DEPS_OS=$(LINUXINC)/$(ARCH)/syscallh.inc $(LINUXINC)/$(ARCH)/sysnr.inc
|
||||
SYSUTILS_DEPS_OS=$(DLUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) $(ERRORSUNIT)$(PPUEXT)
|
||||
SYSUTILSDIR=$(UNIXINC)
|
||||
@ -134,10 +135,4 @@ prt0$(OEXT) : prt0.as
|
||||
dllprt0$(OEXT) : dllprt0.as
|
||||
$(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)dllprt0$(OEXT) --defsym CPU$(CPUBITS)=1 dllprt0.as
|
||||
|
||||
#
|
||||
# $(SYSTEMUNIT) Units ($(SYSTEMUNIT), Objpas, Strings)
|
||||
#
|
||||
|
||||
$(SYSTEMUNIT)$(PPUEXT) : $(LINUXINC)/$(SYSTEMUNIT).pp $(SYSDEPS)
|
||||
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(LINUXINC)/$(SYSTEMUNIT).pp
|
||||
|
||||
|
@ -87,6 +87,6 @@ prt0$(OEXT) : $(CPU_TARGET)/prt0.as
|
||||
#
|
||||
|
||||
|
||||
buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(HEAPTRCUNIT)$(PPUEXT)
|
||||
buildrtl$(PPUEXT): buildrtl.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(HEAPTRCUNIT)$(PPUEXT)
|
||||
$(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -Fu$(AMIINC) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl
|
||||
|
||||
|
@ -65,6 +65,6 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
|
||||
# Base Units (System, strings, os-dependent-base-unit)
|
||||
#
|
||||
|
||||
buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(HEAPTRCUNIT)$(PPUEXT)
|
||||
buildrtl$(PPUEXT): buildrtl.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(HEAPTRCUNIT)$(PPUEXT)
|
||||
$(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(CPU_TARGET) -Fu$(PROCINC) -Fu$(AMIINC) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl
|
||||
|
||||
|
@ -7,7 +7,7 @@ main=rtl
|
||||
|
||||
[target]
|
||||
loaders=prt0 cprt0 func dllprt
|
||||
units=system $(UUCHARUNIT) $(BASEUNIXUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
|
||||
units=$(SYSTEMUNIT) $(UUCHARUNIT) $(BASEUNIXUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \
|
||||
$(ERRORSUNIT) $(DOSUNIT) $(DLUNIT) $(CTHREADSUNIIT) \
|
||||
$(SYSCONSTUNIT) $(SYSUTILSUNIT) \
|
||||
$(TYPESUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(TYPINFOUNIT) $(SORTBASEUNIT) $(CLASSESUNIT) $(FGLUNIT) $(MATHUNIT) \
|
||||
|
@ -97,8 +97,8 @@ include $(PROCINC)/makefile.cpu
|
||||
SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
|
||||
|
||||
# Put system unit dependencies together.
|
||||
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
|
||||
|
||||
SYSDEPS = unxconst.inc $(SYSINCDEPS) $(SYSCPUDEPS)
|
||||
SYSTEMDIR = $(BSDINC)
|
||||
|
||||
#
|
||||
# Loaders
|
||||
@ -116,10 +116,3 @@ gprt0$(OEXT) : $(CPU_TARGET)/gprt0.as
|
||||
dllprt0$(OEXT) : $(CPU_TARGET)/dllprt0.as
|
||||
$(AS) -o $(UNITTARGETDIRPREFIX)dllprt0$(OEXT) $(CPU_TARGET)/dllprt0.as
|
||||
|
||||
#
|
||||
# System Units (System, Objpas, Strings)
|
||||
#
|
||||
|
||||
$(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp unxconst.inc $(SYSDEPS)
|
||||
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp
|
||||
|
||||
|
@ -285,7 +285,7 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
|
||||
|
||||
# Put system unit dependencies together.
|
||||
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) $(INC)/softfpu.pp
|
||||
FPC_SYSTEM_OPT=@system.cfg
|
||||
override FPC_SYSTEM_OPT += @system.cfg
|
||||
|
||||
#
|
||||
# Loaders
|
||||
|
@ -103,8 +103,8 @@ include $(PROCINC)/makefile.cpu
|
||||
SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
|
||||
|
||||
# Put system unit dependencies together.
|
||||
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
|
||||
|
||||
SYSDEPS = unxconst.inc $(SYSINCDEPS) $(SYSCPUDEPS)
|
||||
SYSTEMDIR = $(BSDINC)
|
||||
|
||||
#
|
||||
# Loaders
|
||||
@ -122,13 +122,6 @@ gprt0$(OEXT) : $(CPU_TARGET)/gprt0.as
|
||||
dllprt0$(OEXT) : $(CPU_TARGET)/dllprt0.as
|
||||
$(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)dllprt0$(OEXT) $(CPU_TARGET)/dllprt0.as
|
||||
|
||||
#
|
||||
# System Units (System, Objpas, Strings)
|
||||
#
|
||||
|
||||
$(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp unxconst.inc $(SYSDEPS)
|
||||
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp
|
||||
|
||||
#
|
||||
# freebsd unit
|
||||
#
|
||||
@ -138,7 +131,6 @@ else
|
||||
FREEBSD_DEPS_OS+=$(INITCUNIT)$(PPUEXT)
|
||||
endif
|
||||
|
||||
|
||||
FREEBSD_DEPS = freebsd.pas $(SYSTEMUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) $(SYSCTLUNIT)$(PPUEXT) \
|
||||
$(FREEBSD_DEPS_OS) $(FREEBSD_DEPS_CPU)
|
||||
|
||||
@ -148,5 +140,3 @@ freebsd$(PPUEXT): $(FREEBSD_DEPS)
|
||||
FreeBSDApi.FreeBSD$(PPUEXT): $(NSFREEBSDDIR)/FreeBSDApi.FreeBSD.pas $(FREEBSD_DEPS)
|
||||
$(COMPILER) $(FREEBSD_OPT) $<
|
||||
|
||||
|
||||
|
||||
|
@ -256,7 +256,8 @@ include $(PROCINC)/makefile.cpu
|
||||
SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
|
||||
|
||||
# Put system unit dependencies together.
|
||||
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
|
||||
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) $(INC)/softfpu.pp
|
||||
override FPC_SYSTEM_OPT += @system.cfg
|
||||
|
||||
#
|
||||
# Loaders
|
||||
@ -269,9 +270,6 @@ startup$(OEXT) : $(CPU_TARGET)/startup.s
|
||||
# Base Units (System, $(STRINGSUNIT), os-dependent-base-unit)
|
||||
#
|
||||
|
||||
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) $(INC)/softfpu.pp
|
||||
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(SYSTEMUNIT).pp @system.cfg $(REDIR)
|
||||
|
||||
consoleio$(PPUEXT) : consoleio.pp $(SYSTEMUNIT)$(PPUEXT)
|
||||
$(COMPILER) $<
|
||||
|
||||
|
@ -80,12 +80,6 @@ exceptn$(OEXT) : exceptn.as
|
||||
|
||||
fpu$(OEXT) : fpu.as
|
||||
$(AS) -o $(UNITTARGETDIRPREFIX)fpu$(OEXT) $<
|
||||
#
|
||||
# System Units (System, Objpas, Strings)
|
||||
#
|
||||
system$(PPUEXT) : system.pp $(SYSDEPS)
|
||||
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp
|
||||
$(EXECPPAS)
|
||||
|
||||
#
|
||||
# System Dependent Units
|
||||
|
@ -44,7 +44,7 @@ endif
|
||||
|
||||
# Paths
|
||||
|
||||
FPC_SYSTEM_OPT=@rtl.cfg
|
||||
override FPC_SYSTEM_OPT += @rtl.cfg
|
||||
|
||||
[rules]
|
||||
.NOTPARALLEL:
|
||||
|
@ -76,9 +76,6 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
|
||||
# Base Units (System, strings, os-dependent-base-unit)
|
||||
#
|
||||
|
||||
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS)
|
||||
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(SYSTEMUNIT).pp $(REDIR)
|
||||
|
||||
buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(HEAPTRCUNIT)$(PPUEXT)
|
||||
buildrtl$(PPUEXT): buildrtl.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(HEAPTRCUNIT)$(PPUEXT)
|
||||
$(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -Fu$(AMIINC) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
main=rtl
|
||||
[target]
|
||||
#loaders=prt0s prt0t prt0m prt0c prt0l prt0h # exceptn fpu
|
||||
units=system si_prc $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(STRINGSUNIT) $(CHARSETUNIT) $(CPALLUNIT) \
|
||||
units=$(SYSTEMUNIT) si_prc $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(STRINGSUNIT) $(CHARSETUNIT) $(CPALLUNIT) \
|
||||
$(GETOPTSUNIT) $(EXEINFOUNIT) $(HEAPTRCUNIT)
|
||||
#$(UUCHARUNIT) $(OBJPASUNIT) $(STRINGSUNIT) $(DOSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(SYSCONSTUNIT) $(SYSUTILSUNIT) \
|
||||
# $(MATHUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(RTLCONSTSUNIT) $(TYPINFOUNIT) $(CPUUNIT) $(TYPESUNIT) \
|
||||
@ -62,7 +62,8 @@ SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
|
||||
include $(PROCINC)/makefile.cpu
|
||||
SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
|
||||
# Put system unit dependencies together.
|
||||
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
|
||||
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) $(INC)/tnyheaph.inc $(INC)/tinyheap.inc registers.inc
|
||||
|
||||
#
|
||||
# Loaders
|
||||
#
|
||||
@ -70,16 +71,9 @@ ifneq ($(findstring -dTEST_I8086_SMARTLINK_SECTIONS,$(FPCOPT)),)
|
||||
override NASM_OPT+=-D__I8086_SMARTLINK_SECTIONS__
|
||||
endif
|
||||
|
||||
#
|
||||
# System Units (System, Objpas, Strings)
|
||||
#
|
||||
system$(PPUEXT) : system.pp $(SYSDEPS) $(INC)/tnyheaph.inc $(INC)/tinyheap.inc registers.inc
|
||||
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp
|
||||
$(EXECPPAS)
|
||||
|
||||
#
|
||||
# Other system-dependent RTL Units
|
||||
#
|
||||
|
||||
si_prc$(PPUEXT) : system$(PPUEXT)
|
||||
si_prc$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT)
|
||||
$(COMPILER) si_prc.pp
|
||||
|
@ -7,8 +7,8 @@ main=rtl
|
||||
|
||||
[target]
|
||||
loaders=
|
||||
#units=system $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) buildrtl $(LINEINFOUNIT) $(LNFODWRFUNIT)
|
||||
units=system $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(CPALLUNIT) buildrtl
|
||||
#units=$(SYSTEMUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) buildrtl $(LINEINFOUNIT) $(LNFODWRFUNIT)
|
||||
units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(CPALLUNIT) buildrtl
|
||||
implicitunits=ndk ndkutils ddk \
|
||||
$(CTYPESUNIT) $(STRINGSUNIT) \
|
||||
# $(HEAPTRCUNIT)
|
||||
@ -104,9 +104,6 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
|
||||
# Unit specific rules
|
||||
#
|
||||
|
||||
system$(PPUEXT) : system.pp $(SYSDEPS)
|
||||
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp
|
||||
|
||||
buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
|
||||
buildrtl$(PPUEXT): buildrtl.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
|
||||
$(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -I$(OBJPASDIR) -Fi$(DDKINC) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl
|
||||
|
||||
|
@ -64,7 +64,7 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
|
||||
|
||||
# Put system unit dependencies together.
|
||||
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) $(INC)/softfpu.pp
|
||||
|
||||
override FPC_SYSTEM_OPT += @rtl.cfg
|
||||
|
||||
#
|
||||
# Loaders
|
||||
@ -82,10 +82,3 @@ cprt07$(OEXT) : cprt07.as
|
||||
cprt09$(OEXT) : cprt09.as
|
||||
$(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)cprt09$(OEXT) cprt09.as
|
||||
|
||||
#
|
||||
# Base Units (System, strings, os-dependent-base-unit)
|
||||
#
|
||||
|
||||
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) $(INC)/softfpu.pp
|
||||
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg @rtl.cfg $(SYSTEMUNIT).pp $(REDIR)
|
||||
|
||||
|
@ -100,8 +100,8 @@ include $(PROCINC)/makefile.cpu
|
||||
SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
|
||||
|
||||
# Put system unit dependencies together.
|
||||
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
|
||||
|
||||
SYSDEPS = sysconst.inc systypes.inc syscalls.inc $(SYSINCDEPS) $(SYSCPUDEPS)
|
||||
SYSTEMDIR = $(BSDINC)
|
||||
|
||||
#
|
||||
# Loaders
|
||||
@ -116,10 +116,3 @@ cprt0$(OEXT) : $(CPU_TARGET)/cprt0.as
|
||||
dllprt0$(OEXT) : $(CPU_TARGET)/dllprt0.as
|
||||
$(AS) -o $(UNITTARGETDIRPREFIX)dllprt0$(OEXT) $(CPU_TARGET)/dllprt0.as
|
||||
|
||||
#
|
||||
# System Units (System, Objpas, Strings)
|
||||
#
|
||||
|
||||
$(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp sysconst.inc systypes.inc syscalls.inc $(SYSDEPS)
|
||||
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp
|
||||
|
||||
|
@ -83,7 +83,7 @@ include $(PROCINC)/makefile.cpu
|
||||
SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
|
||||
|
||||
# Put system unit dependencies together.
|
||||
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
|
||||
SYSDEPS = libc.pp $(SYSINCDEPS) $(SYSCPUDEPS)
|
||||
|
||||
copyimpfiles:
|
||||
$(COPY) $(IMPFILES) $(COMPILER_UNITTARGETDIR)
|
||||
@ -100,7 +100,7 @@ copyimpfiles:
|
||||
|
||||
# for now use the gcc pre
|
||||
nwplibc$(OEXT) :
|
||||
cp pre/libcpre.gcc.o $(UNITTARGETDIRPREFIX)nwplibc$(OEXT)
|
||||
cp pre/libcpre.gcc.o $(UNITTARGETDIRPREFIX)nwplibc$(OEXT)
|
||||
|
||||
nwl_main$(OEXT) : nwl_main.as
|
||||
$(AS) -o $(UNITTARGETDIRPREFIX)nwl_main$(OEXT) nwl_main.as
|
||||
@ -108,14 +108,6 @@ nwl_main$(OEXT) : nwl_main.as
|
||||
nwl_dlle$(OEXT) : nwl_dlle.as
|
||||
$(AS) -o $(UNITTARGETDIRPREFIX)nwl_dlle$(OEXT) nwl_dlle.as
|
||||
|
||||
#
|
||||
# System Units (System, Objpas, Strings)
|
||||
#
|
||||
|
||||
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp libc.pp $(SYSDEPS)
|
||||
$(COPY) $(IMPFILES) $(COMPILER_UNITTARGETDIR)
|
||||
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(SYSTEMUNIT).pp
|
||||
|
||||
#
|
||||
# System Dependent Units
|
||||
#
|
||||
|
@ -108,8 +108,8 @@ include $(PROCINC)/makefile.cpu
|
||||
SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
|
||||
|
||||
# Put system unit dependencies together.
|
||||
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
|
||||
|
||||
SYSDEPS= sysconst.inc systypes.inc syscalls.inc $(SYSINCDEPS) $(SYSCPUDEPS)
|
||||
SYSTEMDIR = $(BSDINC)
|
||||
|
||||
#
|
||||
# Loaders
|
||||
@ -135,10 +135,3 @@ si_g$(PPUEXT) : si_g.pp si_intf.inc si_impl.inc $(ARCH)/openbsd_ident.inc $(ARCH
|
||||
$(COMPILER) $<
|
||||
|
||||
|
||||
#
|
||||
# System Units (System, Objpas, Strings)
|
||||
#
|
||||
|
||||
$(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp sysconst.inc systypes.inc syscalls.inc $(SYSDEPS)
|
||||
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp
|
||||
|
||||
|
@ -75,7 +75,7 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
|
||||
|
||||
# Put system unit dependencies together.
|
||||
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
|
||||
|
||||
override FPC_SYSTEM_OPT += @rtl.cfg
|
||||
|
||||
#
|
||||
# Loaders
|
||||
@ -89,9 +89,6 @@ $(PRT0)$(OEXT) : $(CPU_TARGET)/$(PRT0).as
|
||||
# System Units (System, Objpas, Strings)
|
||||
#
|
||||
|
||||
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS)
|
||||
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg @rtl.cfg $(SYSTEMUNIT).pp
|
||||
|
||||
si_prc$(PPUEXT): si_prc.pp palmos.inc $(SYSTEMUNIT)$(PPUEXT)
|
||||
|
||||
#
|
||||
|
@ -7,7 +7,7 @@ main=rtl
|
||||
|
||||
[target]
|
||||
loaders=cprt0 crti crtn
|
||||
units=system $(UUCHARUNIT) $(DOSUNIT) $(OBJPASUNIT) $(STRINGSUNIT) \
|
||||
units=$(SYSTEMUNIT) $(UUCHARUNIT) $(DOSUNIT) $(OBJPASUNIT) $(STRINGSUNIT) \
|
||||
$(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) \
|
||||
$(CPUUNIT) $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) posix
|
||||
rsts=$(MATHUNIT) $(TYPINFOUNIT)
|
||||
@ -78,16 +78,9 @@ func$(OEXT) : $(CPU_TARGET)/func.as
|
||||
dllprt$(OEXT) : $(CPU_TARGET)/dllprt.as
|
||||
$(AS) -o dllprt$(OEXT) $(CPU_TARGET)/dllprt.as
|
||||
|
||||
#
|
||||
# system Units (system, Objpas, Strings)
|
||||
#
|
||||
|
||||
system$(PPUEXT) : system.pp $(SYSDEPS)
|
||||
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp
|
||||
|
||||
#
|
||||
# Other system-dependent RTL Units
|
||||
#
|
||||
|
||||
posix$(PPUEXT) : posix.pp \
|
||||
errno.inc osposix.inc osposixh.inc signal.inc system$(PPUEXT)
|
||||
errno.inc osposix.inc osposixh.inc signal.inc $(SYSTEMUNIT)$(PPUEXT)
|
||||
|
@ -59,16 +59,13 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
|
||||
|
||||
# Put system unit dependencies together.
|
||||
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) qdos.inc qdosh.inc qdosfuncs.inc sms.inc
|
||||
|
||||
override FPC_SYSTEM_OPT += @rtl.cfg
|
||||
|
||||
#
|
||||
# Base Units (System, strings, os-dependent-base-unit)
|
||||
#
|
||||
|
||||
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS)
|
||||
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg @rtl.cfg $(SYSTEMUNIT).pp $(REDIR)
|
||||
|
||||
buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
|
||||
buildrtl$(PPUEXT): buildrtl.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
|
||||
$(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(CPU_TARGET) -Fu$(PROCINC) -Fu$(AMIINC) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl
|
||||
|
||||
#fpextres$(PPUEXT) : $(INC)/fpextres.pp $(SYSTEMUNIT)$(PPUEXT)
|
||||
|
@ -102,11 +102,3 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
|
||||
# Put system unit dependencies together.
|
||||
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
|
||||
|
||||
|
||||
#
|
||||
# System Units (System, Objpas, Strings)
|
||||
#
|
||||
|
||||
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS)
|
||||
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(SYSTEMUNIT).pp
|
||||
|
||||
|
@ -82,6 +82,6 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
|
||||
# System Units (System, Objpas, Strings)
|
||||
#
|
||||
|
||||
buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) # $(MACPASUNIT)$(PPUEXT)
|
||||
buildrtl$(PPUEXT): buildrtl.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) # $(MACPASUNIT)$(PPUEXT)
|
||||
$(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -I$(OBJPASDIR) -I$(INC) -I$(SYMBIANINC) -I$(UIQINC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl
|
||||
|
||||
|
@ -48,7 +48,7 @@ ifdef NO_EXCEPTIONS_IN_SYSTEM
|
||||
override FPCOPT+=-dNO_EXCEPTIONS_IN_SYSTEM
|
||||
endif
|
||||
|
||||
FPC_SYSTEM_OPT=-Fiwasiinc
|
||||
override FPC_SYSTEM_OPT += -Fiwasiinc
|
||||
|
||||
DOS_DEPS_OS=$(WASIAPIUNIT)$(PPUEXT) $(WASIUTILUNIT)$(PPUEXT)
|
||||
|
||||
|
@ -38,7 +38,7 @@ COMMON=$(RTL)/common
|
||||
PROCINC=$(RTL)/$(CPU_TARGET)
|
||||
UNITPREFIX=rtl
|
||||
SYSTEMUNIT=system
|
||||
override FPC_SYSTEM_OPT+=@rtl.cfg
|
||||
override FPC_SYSTEM_OPT += @rtl.cfg
|
||||
|
||||
ifdef RELEASE
|
||||
override FPCOPT+=-Ur
|
||||
|
@ -5,7 +5,7 @@
|
||||
main=rtl
|
||||
[target]
|
||||
loaders=prt0s prt0m prt0c prt0l prt0h
|
||||
units=system $(UUCHARUNIT) $(OBJPASUNIT) $(STRINGSUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(DOSUNIT) \
|
||||
units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(STRINGSUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(DOSUNIT) \
|
||||
$(WINTYPESUNIT) $(WINPROCSUNIT) $(WIN31UNIT) $(PORTSUNIT) $(DYNLIBSUNIT) $(SORTBASEUNIT) \
|
||||
$(SYSCONSTUNIT) $(RTLCONSTSUNIT) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(FGLUNIT) \
|
||||
$(CLASSESUNIT) $(CHARSETUNIT) $(CPUUNIT) $(GETOPTSUNIT) $(CPALLUNIT) \
|
||||
@ -57,7 +57,10 @@ SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
|
||||
include $(PROCINC)/makefile.cpu
|
||||
SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
|
||||
# Put system unit dependencies together.
|
||||
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
|
||||
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) wintypes.inc winprocsh.inc winprocs.inc \
|
||||
glbheap.inc glbheaph.inc locheap.inc locheaph.inc \
|
||||
sysdl.inc sysdlh.inc
|
||||
|
||||
#
|
||||
# Loaders
|
||||
#
|
||||
@ -76,12 +79,4 @@ prt0l$(OEXT) : prt0l.asm prt0comn.asm
|
||||
prt0h$(OEXT) : prt0h.asm prt0comn.asm
|
||||
$(MAKE) $(COMPILER_UNITTARGETDIR)
|
||||
$(NASM) -f obj -o $(UNITTARGETDIRPREFIX)prt0h$(OEXT) prt0h.asm
|
||||
#
|
||||
# System Units (System, Objpas, Strings)
|
||||
#
|
||||
system$(PPUEXT) : system.pp $(SYSDEPS) wintypes.inc winprocsh.inc winprocs.inc \
|
||||
glbheap.inc glbheaph.inc locheap.inc locheaph.inc \
|
||||
sysdl.inc sysdlh.inc
|
||||
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp
|
||||
$(EXECPPAS)
|
||||
|
||||
|
@ -7,7 +7,7 @@ main=rtl
|
||||
|
||||
[target]
|
||||
loaders=$(LOADERS)
|
||||
units=system $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(WINDOWSUNIT) $(SYSUTILSUNIT) buildrtl $(CHARSETUNIT) $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT)
|
||||
units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(WINDOWSUNIT) $(SYSUTILSUNIT) buildrtl $(CHARSETUNIT) $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT)
|
||||
implicitunits=sysinitpas sysinitcyg sysinitgprof $(INITCUNIT) $(EXTPASUNIT) $(HEAPTRCUNIT) \
|
||||
$(WINSYSUTUNIT) $(CTYPESUNIT) $(STRINGSUNIT) \
|
||||
$(DOSUNIT) $(MESSAGESUNIT) \
|
||||
@ -46,7 +46,6 @@ COMMON=$(RTL)/common
|
||||
PROCINC=$(RTL)/$(CPU_TARGET)
|
||||
WININC=../win/wininc
|
||||
WINDIR=../win
|
||||
OSDIR=win32
|
||||
NSOSDIR=$(NSDIR)/windows
|
||||
|
||||
UNITPREFIX=rtl
|
||||
@ -55,7 +54,7 @@ DLLS=fpcmemdll
|
||||
CPU_UNITS=$(CPUUNIT) $(SIGNALSUNIT) $(MMXUNIT)
|
||||
# Paths
|
||||
OBJPASDIR=$(RTL)/objpas
|
||||
FPC_SYSTEM_OPT=-Fu$(WINDIR)
|
||||
override FPC_SYSTEM_OPT += -Fu$(WINDIR)
|
||||
SYSUTILSDIR=$(WINDIR)
|
||||
SYSUTILS_OPT=-Fi$(WINDIR)
|
||||
SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) $(WINDIRSUNIT)$(PPUEXT)
|
||||
@ -106,7 +105,7 @@ endif
|
||||
# Unit specific rules
|
||||
#
|
||||
|
||||
BUILDRTL_DEPS=buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINDOWSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
|
||||
BUILDRTL_DEPS=buildrtl.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINDOWSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
|
||||
$(BUILDRTL_DEPS_OS) $(BUILDRTL_DEPS_CPU)
|
||||
|
||||
buildrtl$(PPUEXT) : $(BUILDRTL_DEPS)
|
||||
|
@ -7,7 +7,7 @@ main=rtl
|
||||
|
||||
[target]
|
||||
loaders=$(LOADERS)
|
||||
units=system $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(WINDOWSUNIT) $(SYSUTILSUNIT) buildrtl $(CHARSETUNIT) $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT)
|
||||
units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(WINDOWSUNIT) $(SYSUTILSUNIT) buildrtl $(CHARSETUNIT) $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT)
|
||||
implicitunits=sysinit $(EXTPASUNIT) $(HEAPTRCUNIT) $(FPINTRESUNIT) \
|
||||
$(CTYPESUNIT) $(STRINGSUNIT) \
|
||||
$(DOSUNIT) $(MESSAGESUNIT) \
|
||||
@ -48,7 +48,6 @@ COMMON=$(RTL)/common
|
||||
PROCINC=$(RTL)/$(CPU_TARGET)
|
||||
WININC=../win/wininc
|
||||
WINDIR=../win
|
||||
OSDIR=win64
|
||||
NSOSDIR=$(NSDIR)/windows
|
||||
SYSUTILSDIR=$(WINDIR)
|
||||
SYSUTILS_OPT=-Fi../win
|
||||
@ -83,7 +82,7 @@ OBJPASDIR=$(RTL)/objpas
|
||||
#include $(WININC)/makefile.inc
|
||||
|
||||
WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES)))
|
||||
FPC_SYSTEM_OPT=-Fi../win
|
||||
override FPC_SYSTEM_OPT += -Fi../win
|
||||
EXEINFO_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
|
||||
FPWIDESTRING_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
|
||||
TYPES_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
|
||||
@ -120,7 +119,7 @@ endif
|
||||
# Unit specific rules
|
||||
#
|
||||
|
||||
BUILDRTL_DEPS=buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINDOWSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
|
||||
BUILDRTL_DEPS=buildrtl.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINDOWSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
|
||||
$(BUILDRTL_DEPS_OS) $(BUILDRTL_DEPS_CPU)
|
||||
|
||||
buildrtl$(PPUEXT) : $(BUILDRTL_DEPS)
|
||||
|
@ -106,9 +106,9 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) winres.inc
|
||||
|
||||
WINMESSAGESDIR=$(OSDIR)
|
||||
|
||||
sharemem$(PPUEXT) : $(WINDIR)/sharemem.pp system$(PPUEXT)
|
||||
sharemem$(PPUEXT) : $(WINDIR)/sharemem.pp $(SYSTEMUNIT)$(PPUEXT)
|
||||
$(COMPILER) $(WINDIR)/sharemem.pp
|
||||
|
||||
fpcmemdll.dll : $(WINDIR)/fpcmemdll.pp system$(PPUEXT)
|
||||
fpcmemdll.dll : $(WINDIR)/fpcmemdll.pp $(SYSTEMUNIT)$(PPUEXT)
|
||||
$(COMPILER) $(WINDIR)/fpcmemdll.pp
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
main=rtl
|
||||
[target]
|
||||
loaders=
|
||||
units=system si_prc
|
||||
units=$(SYSTEMUNIT) si_prc
|
||||
|
||||
[require]
|
||||
nortl=y
|
||||
@ -50,11 +50,8 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
|
||||
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
|
||||
|
||||
#
|
||||
# System Units (System, Objpas, Strings)
|
||||
# Loaders
|
||||
#
|
||||
system$(PPUEXT) : system.pp $(SYSDEPS)
|
||||
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp
|
||||
$(EXECPPAS)
|
||||
|
||||
si_prc$(PPUEXT) : system$(PPUEXT)
|
||||
si_prc$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT)
|
||||
$(COMPILER) si_prc.pp
|
||||
|
Loading…
Reference in New Issue
Block a user