Regenerate Makefile's after change to inc/Makefile.rtl

This commit is contained in:
Pierre Muller 2023-09-25 20:13:24 +02:00
parent b12932c7f8
commit ececf26d87
40 changed files with 1322 additions and 350 deletions

View File

@ -889,6 +889,7 @@ OSPROCINC=$(RTL)/aix/$(CPU_TARGET)
UNIXINC=$(RTL)/unix
UNITPREFIX=rtl
CPU_UNITS=
CWSTRING_DEPS_OS=$(UNIXINC)/cwstraix.inc
DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
DYNLIBSINCDIR=$(UNIXINC)
DL_DEPS_OS=$(DLUNIT)aix.inc
@ -907,10 +908,10 @@ endif
override FPCOPT+=-dFPC_USE_LIBC
OBJPASDIR=$(RTL)/objpas
ifeq ($(CPU_OS_TARGET),powerpc-aix)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(STRINGSUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) $(HEAPTRCUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(TERMIOUNIT) $(UNIXUNIT) $(INITCUNIT) $(CMEMUNIT) $(LNFOGDBUNIT) sysutils typinfo $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(UNIXCPUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) types $(SYSCONSTUNIT) $(RTLCONSTSUNIT) $(CTHREADSUNIT) dos cwstring $(FPWIDESTRINGUNIT) $(FPINTRESUNIT) $(CPU_UNITS) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(STRINGSUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) $(HEAPTRCUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(TERMIOUNIT) $(UNIXUNIT) $(INITCUNIT) $(CMEMUNIT) $(LNFOGDBUNIT) sysutils $(TYPINFOUNIT) $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(UNIXCPUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) $(CTHREADSUNIT) dos $(CWSTRINGUNIT) $(FPWIDESTRINGUNIT) $(FPINTRESUNIT) $(CPU_UNITS) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
ifeq ($(CPU_OS_TARGET),powerpc64-aix)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(STRINGSUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) $(HEAPTRCUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(TERMIOUNIT) $(UNIXUNIT) $(INITCUNIT) $(CMEMUNIT) $(LNFOGDBUNIT) sysutils typinfo $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(UNIXCPUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) types $(SYSCONSTUNIT) $(RTLCONSTSUNIT) $(CTHREADSUNIT) dos cwstring $(FPWIDESTRINGUNIT) $(FPINTRESUNIT) $(CPU_UNITS) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(STRINGSUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) $(HEAPTRCUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(TERMIOUNIT) $(UNIXUNIT) $(INITCUNIT) $(CMEMUNIT) $(LNFOGDBUNIT) sysutils $(TYPINFOUNIT) $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(UNIXCPUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) $(CTHREADSUNIT) dos $(CWSTRINGUNIT) $(FPWIDESTRINGUNIT) $(FPINTRESUNIT) $(CPU_UNITS) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
ifeq ($(CPU_OS_TARGET),powerpc-aix)
override TARGET_IMPLICITUNITS+=$(CP_UNITS) $(UNICODEDATAUNIT)
@ -919,10 +920,10 @@ ifeq ($(CPU_OS_TARGET),powerpc64-aix)
override TARGET_IMPLICITUNITS+=$(CP_UNITS) $(UNICODEDATAUNIT)
endif
ifeq ($(CPU_OS_TARGET),powerpc-aix)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),powerpc64-aix)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
override INSTALL_FPCPACKAGE=y y
ifeq ($(CPU_OS_TARGET),powerpc-aix)
@ -2579,10 +2580,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2676,7 +2681,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2739,6 +2748,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif
@ -2896,13 +2923,9 @@ sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.in
$(OBJPASUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) $(ERRORSUNIT)$(PPUEXT) $(SYSCONSTUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp
classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
sysutils$(PPUEXT) typinfo$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) types$(PPUEXT) \
sysutils$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \
$(SYSTEMUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) sortbase$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp
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
ifeq ($(ARCH),x86_64)
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT)
$(COMPILER) $(PROCINC)/cpu.pp
@ -2910,6 +2933,4 @@ else
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(PROCINC)/cpu.pp
endif
cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT)
$(COMPILER) $(UNIXINC)/cwstring.pp
gpm$(PPUEXT): gpm.pp $(UNIXUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) sockets$(PPUEXT)

View File

@ -924,10 +924,10 @@ ifeq ($(CPU_OS_TARGET),powerpc-amiga)
override TARGET_LOADERS+=$(LOADERS)
endif
ifeq ($(CPU_OS_TARGET),m68k-amiga)
override TARGET_RSTS+=$(MATHUNIT) $(RTLCONSTSUNIT) typinfo classes $(SYSCONSTUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(RTLCONSTSUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT)
endif
ifeq ($(CPU_OS_TARGET),powerpc-amiga)
override TARGET_RSTS+=$(MATHUNIT) $(RTLCONSTSUNIT) typinfo classes $(SYSCONSTUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(RTLCONSTSUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT)
endif
override INSTALL_FPCPACKAGE=y y
ifeq ($(CPU_OS_TARGET),m68k-amiga)
@ -2611,10 +2611,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2708,7 +2712,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2771,6 +2779,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -896,6 +896,7 @@ PTHREADINCDIR=$(LINUXINC)
PTYPESINCDIR=$(LINUXINC)
SYSCALL_DEPS_OS=$(LINUXINC)/$(ARCH)/syscallh.inc $(LINUXINC)/$(ARCH)/sysnr.inc
SYSUTILS_DEPS_OS=$(DLUNIT)$(PPUEXT)
CWSTRINGDIR=$(OSDIR)
UNITPREFIX=rtl
CPU_UNITS=
SYSINIT_UNITS=
@ -912,22 +913,22 @@ override FPCOPT+=-Ur
endif
OBJPASDIR=$(RTL)/objpas
ifeq ($(CPU_OS_TARGET),i386-android)
override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(BASEUNIXUNIT) $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(SYSCALLUNIT) $(UNIXUTILUNIT) $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(TERMIOUNIT) $(UNIXUNIT) $(LINUXUNIT) $(INITCUNIT) $(CMEMUNIT) $(LINUXVCSUNIT) sysutils typinfo $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) types $(SYSCONSTUNIT) $(CTHREADSUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(RTLCONSTSUNIT) dos cwstring $(FPCYLIXUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(BASEUNIXUNIT) $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(SYSCALLUNIT) $(UNIXUTILUNIT) $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(TERMIOUNIT) $(UNIXUNIT) $(LINUXUNIT) $(INITCUNIT) $(CMEMUNIT) $(LINUXVCSUNIT) sysutils $(TYPINFOUNIT) $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(RTLCONSTSUNIT) dos $(CWSTRINGUNIT) $(FPCYLIXUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
ifeq ($(CPU_OS_TARGET),x86_64-android)
override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(BASEUNIXUNIT) $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(SYSCALLUNIT) $(UNIXUTILUNIT) $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(TERMIOUNIT) $(UNIXUNIT) $(LINUXUNIT) $(INITCUNIT) $(CMEMUNIT) $(LINUXVCSUNIT) sysutils typinfo $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) types $(SYSCONSTUNIT) $(CTHREADSUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(RTLCONSTSUNIT) dos cwstring $(FPCYLIXUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(BASEUNIXUNIT) $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(SYSCALLUNIT) $(UNIXUTILUNIT) $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(TERMIOUNIT) $(UNIXUNIT) $(LINUXUNIT) $(INITCUNIT) $(CMEMUNIT) $(LINUXVCSUNIT) sysutils $(TYPINFOUNIT) $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(RTLCONSTSUNIT) dos $(CWSTRINGUNIT) $(FPCYLIXUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
ifeq ($(CPU_OS_TARGET),arm-android)
override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(BASEUNIXUNIT) $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(SYSCALLUNIT) $(UNIXUTILUNIT) $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(TERMIOUNIT) $(UNIXUNIT) $(LINUXUNIT) $(INITCUNIT) $(CMEMUNIT) $(LINUXVCSUNIT) sysutils typinfo $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) types $(SYSCONSTUNIT) $(CTHREADSUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(RTLCONSTSUNIT) dos cwstring $(FPCYLIXUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(BASEUNIXUNIT) $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(SYSCALLUNIT) $(UNIXUTILUNIT) $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(TERMIOUNIT) $(UNIXUNIT) $(LINUXUNIT) $(INITCUNIT) $(CMEMUNIT) $(LINUXVCSUNIT) sysutils $(TYPINFOUNIT) $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(RTLCONSTSUNIT) dos $(CWSTRINGUNIT) $(FPCYLIXUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
ifeq ($(CPU_OS_TARGET),mipsel-android)
override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(BASEUNIXUNIT) $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(SYSCALLUNIT) $(UNIXUTILUNIT) $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(TERMIOUNIT) $(UNIXUNIT) $(LINUXUNIT) $(INITCUNIT) $(CMEMUNIT) $(LINUXVCSUNIT) sysutils typinfo $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) types $(SYSCONSTUNIT) $(CTHREADSUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(RTLCONSTSUNIT) dos cwstring $(FPCYLIXUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(BASEUNIXUNIT) $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(SYSCALLUNIT) $(UNIXUTILUNIT) $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(TERMIOUNIT) $(UNIXUNIT) $(LINUXUNIT) $(INITCUNIT) $(CMEMUNIT) $(LINUXVCSUNIT) sysutils $(TYPINFOUNIT) $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(RTLCONSTSUNIT) dos $(CWSTRINGUNIT) $(FPCYLIXUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
ifeq ($(CPU_OS_TARGET),jvm-android)
override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(BASEUNIXUNIT) $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(SYSCALLUNIT) $(UNIXUTILUNIT) $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(TERMIOUNIT) $(UNIXUNIT) $(LINUXUNIT) $(INITCUNIT) $(CMEMUNIT) $(LINUXVCSUNIT) sysutils typinfo $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) types $(SYSCONSTUNIT) $(CTHREADSUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(RTLCONSTSUNIT) dos cwstring $(FPCYLIXUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(BASEUNIXUNIT) $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(SYSCALLUNIT) $(UNIXUTILUNIT) $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(TERMIOUNIT) $(UNIXUNIT) $(LINUXUNIT) $(INITCUNIT) $(CMEMUNIT) $(LINUXVCSUNIT) sysutils $(TYPINFOUNIT) $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(RTLCONSTSUNIT) dos $(CWSTRINGUNIT) $(FPCYLIXUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
ifeq ($(CPU_OS_TARGET),aarch64-android)
override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(BASEUNIXUNIT) $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(SYSCALLUNIT) $(UNIXUTILUNIT) $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(TERMIOUNIT) $(UNIXUNIT) $(LINUXUNIT) $(INITCUNIT) $(CMEMUNIT) $(LINUXVCSUNIT) sysutils typinfo $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) types $(SYSCONSTUNIT) $(CTHREADSUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(RTLCONSTSUNIT) dos cwstring $(FPCYLIXUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(CPU_UNITS) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(BASEUNIXUNIT) $(STRINGSUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(SYSCALLUNIT) $(UNIXUTILUNIT) $(FPINTRESUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(TERMIOUNIT) $(UNIXUNIT) $(LINUXUNIT) $(INITCUNIT) $(CMEMUNIT) $(LINUXVCSUNIT) sysutils $(TYPINFOUNIT) $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(RTLCONSTSUNIT) dos $(CWSTRINGUNIT) $(FPCYLIXUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
ifeq ($(CPU_OS_TARGET),i386-android)
override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT)
@ -966,22 +967,22 @@ ifeq ($(CPU_OS_TARGET),aarch64-android)
override TARGET_LOADERS+=$(LOADERS)
endif
ifeq ($(CPU_OS_TARGET),i386-android)
override TARGET_RSTS+=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),x86_64-android)
override TARGET_RSTS+=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),arm-android)
override TARGET_RSTS+=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),mipsel-android)
override TARGET_RSTS+=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),jvm-android)
override TARGET_RSTS+=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),aarch64-android)
override TARGET_RSTS+=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),i386-android)
override CLEAN_UNITS+=$(LINUXUNIT)
@ -1056,7 +1057,7 @@ endif
ifeq ($(CPU_OS_TARGET),aarch64-android)
override COMPILER_TARGETDIR+=.
endif
override SHARED_LIBUNITS=$(SYSTEMUNIT) $(OBJPASUNIT) $(STRINGSUNIT) dos $(UNIXUNIT) $(BASEUNIXUNIT) $(UNIXTYPEUNIT) $(UNIXUTILUNIT) sysutils typinfo $(MATHUNIT) $(CPU_UNITS) $(GETOPTSUNIT) $(ERRORSUNIT) sockets $(SORTBASEUNIT) classes $(FGLUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override SHARED_LIBUNITS=$(SYSTEMUNIT) $(OBJPASUNIT) $(STRINGSUNIT) dos $(UNIXUNIT) $(BASEUNIXUNIT) $(UNIXTYPEUNIT) $(UNIXUTILUNIT) sysutils $(TYPINFOUNIT) $(MATHUNIT) $(CPU_UNITS) $(GETOPTSUNIT) $(ERRORSUNIT) sockets $(SORTBASEUNIT) classes $(FGLUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
ifdef REQUIRE_UNITSDIR
override UNITSDIR+=$(REQUIRE_UNITSDIR)
endif
@ -2726,10 +2727,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2823,7 +2828,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2886,6 +2895,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif
@ -3059,17 +3086,11 @@ sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.in
$(OBJPASUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) $(ERRORSUNIT)$(PPUEXT) $(SYSCONSTUNIT)$(PPUEXT) $(DLUNIT)$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp
classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
sysutils$(PPUEXT) typinfo$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) sortbase$(PPUEXT)
sysutils$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) sortbase$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp
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
ifneq ($(findstring $(ARCH),x86_64 i386),)
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT)
else
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
endif
$(COMPILER) $(PROCINC)/cpu.pp
cwstring$(PPUEXT) : cwstring.pp $(SYSTEMUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT)
$(COMPILER) cwstring.pp

View File

@ -2626,10 +2626,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2723,7 +2727,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2786,6 +2794,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -2581,10 +2581,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2678,7 +2682,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2741,6 +2749,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -909,7 +909,7 @@ ifeq ($(CPU_OS_TARGET),i386-beos)
override TARGET_LOADERS+=prt0 cprt0 func dllprt
endif
ifeq ($(CPU_OS_TARGET),i386-beos)
override TARGET_RSTS+=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
override INSTALL_FPCPACKAGE=y y
ifeq ($(CPU_OS_TARGET),i386-beos)
@ -2590,10 +2590,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2687,7 +2691,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2750,6 +2758,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -972,34 +972,34 @@ ifeq ($(CPU_OS_TARGET),aarch64-ios)
override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT)
endif
ifeq ($(CPU_OS_TARGET),i386-darwin)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),i386-iphonesim)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),powerpc-darwin)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),x86_64-darwin)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),x86_64-iphonesim)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),arm-ios)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),powerpc64-darwin)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),aarch64-darwin)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),aarch64-iphonesim)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),aarch64-ios)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
override INSTALL_FPCPACKAGE=y y
ifeq ($(CPU_OS_TARGET),i386-darwin)
@ -2704,10 +2704,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2801,7 +2805,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2864,6 +2872,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -906,7 +906,7 @@ override FPCOPT+=-Ur
endif
OBJPASDIR=$(RTL)/objpas
ifeq ($(CPU_OS_TARGET),x86_64-dragonfly)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTLUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(CHARACTERUNIT) $(UNIXUNIT) $(RTLCONSTSUNIT) $(INITCUNIT) $(CMEMUNIT) $(DLUNIT) $(TERMIOUNIT) sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(CONSOLEUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTLUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(CHARACTERUNIT) $(UNIXUNIT) $(RTLCONSTSUNIT) $(INITCUNIT) $(CMEMUNIT) $(DLUNIT) $(TERMIOUNIT) sysutils $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(CONSOLEUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) dos $(CWSTRINGUNIT) $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
ifeq ($(CPU_OS_TARGET),x86_64-dragonfly)
override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT)
@ -915,7 +915,7 @@ ifeq ($(CPU_OS_TARGET),x86_64-dragonfly)
override TARGET_LOADERS+=prt0 cprt0 gprt0 dllprt0
endif
ifeq ($(CPU_OS_TARGET),x86_64-dragonfly)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT)
endif
override INSTALL_FPCPACKAGE=y y y
ifeq ($(CPU_OS_TARGET),x86_64-dragonfly)
@ -2593,10 +2593,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2690,7 +2694,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2753,6 +2761,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif
@ -2917,15 +2943,10 @@ sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.in
$(OBJPASUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) $(ERRORSUNIT)$(PPUEXT) $(SYSCONSTUNIT)$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp
classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
sysutils$(PPUEXT) typinfo$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) sortbase$(PPUEXT)
sysutils$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) sortbase$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp
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)
$(COMPILER) $(OBJPASDIR)/types.pp
ifneq ($(findstring $(ARCH),x86_64 i386),)
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT)
else
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
endif
cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT)

View File

@ -1041,7 +1041,7 @@ $(error No CPUs enabled for given SUBARCH, pass either a SUBARCH or set CPU_UNIT
endif
endif
ifeq ($(ARCH),riscv32)
CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT)
CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT)
ifeq ($(SUBARCH),rv32ec)
override FPCOPT+=-Cprv32ec
CPU_UNITS=CH32VxBootstrap
@ -2960,10 +2960,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -3057,7 +3061,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -3120,6 +3128,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -2590,10 +2590,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2687,7 +2691,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2750,6 +2758,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -912,13 +912,13 @@ override FPCOPT+=-Ur
endif
OBJPASDIR=$(RTL)/objpas
ifeq ($(CPU_OS_TARGET),i386-freebsd)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTLUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(CHARACTERUNIT) $(UNIXUNIT) $(RTLCONSTSUNIT) $(INITCUNIT) $(CMEMUNIT) $(DLUNIT) $(TERMIOUNIT) sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) freebsd $(CONSOLEUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTLUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(CHARACTERUNIT) $(UNIXUNIT) $(RTLCONSTSUNIT) $(INITCUNIT) $(CMEMUNIT) $(DLUNIT) $(TERMIOUNIT) sysutils $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) freebsd $(CONSOLEUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) dos $(CWSTRINGUNIT) $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
ifeq ($(CPU_OS_TARGET),x86_64-freebsd)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTLUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(CHARACTERUNIT) $(UNIXUNIT) $(RTLCONSTSUNIT) $(INITCUNIT) $(CMEMUNIT) $(DLUNIT) $(TERMIOUNIT) sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) freebsd $(CONSOLEUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTLUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(CHARACTERUNIT) $(UNIXUNIT) $(RTLCONSTSUNIT) $(INITCUNIT) $(CMEMUNIT) $(DLUNIT) $(TERMIOUNIT) sysutils $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) freebsd $(CONSOLEUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) dos $(CWSTRINGUNIT) $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
ifeq ($(CPU_OS_TARGET),aarch64-freebsd)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTLUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(CHARACTERUNIT) $(UNIXUNIT) $(RTLCONSTSUNIT) $(INITCUNIT) $(CMEMUNIT) $(DLUNIT) $(TERMIOUNIT) sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) freebsd $(CONSOLEUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTLUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(CHARACTERUNIT) $(UNIXUNIT) $(RTLCONSTSUNIT) $(INITCUNIT) $(CMEMUNIT) $(DLUNIT) $(TERMIOUNIT) sysutils $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) freebsd $(CONSOLEUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) dos $(CWSTRINGUNIT) $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
ifeq ($(CPU_OS_TARGET),i386-freebsd)
override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT)
@ -939,13 +939,13 @@ ifeq ($(CPU_OS_TARGET),aarch64-freebsd)
override TARGET_LOADERS+=prt0 cprt0 gprt0 dllprt0
endif
ifeq ($(CPU_OS_TARGET),i386-freebsd)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT)
endif
ifeq ($(CPU_OS_TARGET),x86_64-freebsd)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT)
endif
ifeq ($(CPU_OS_TARGET),aarch64-freebsd)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT)
endif
override INSTALL_FPCPACKAGE=y y y
ifeq ($(CPU_OS_TARGET),i386-freebsd)
@ -2635,10 +2635,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2732,7 +2736,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2795,6 +2803,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif
@ -2960,13 +2986,9 @@ sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.in
$(OBJPASUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) $(ERRORSUNIT)$(PPUEXT) $(SYSCONSTUNIT)$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp
classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
sysutils$(PPUEXT) typinfo$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) \
sysutils$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) \
sortbase$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp
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)
$(COMPILER) $(OBJPASDIR)/types.pp
ifneq ($(findstring $(ARCH),x86_64 i386),)
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT)
$(COMPILER) $<
@ -2974,5 +2996,3 @@ else
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
endif
cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT)
$(COMPILER) $<

View File

@ -905,7 +905,7 @@ CPU_SPECIFIC_COMMON_UNITS=
DOSDIR=.
DOS_DEPS_OS=objpas$(PPUEXT)
ifeq ($(ARCH),arm)
CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT)
CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT)
ifeq ($(SUBARCH),armv7m)
CPU_UNITS=stm32f103xe cortexm3 cortexm4 # thumb2_bare
CPU_UNITS_DEFINED=1
@ -1005,7 +1005,7 @@ endif
endif
endif
ifeq ($(ARCH),i386)
CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT)
CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT)
CPU_UNITS=multiboot
CPU_UNITS_DEFINED=1
ifeq ($(CPU_UNITS_DEFINED),)
@ -1013,13 +1013,13 @@ $(error No CPUs enabled for given SUBARCH, pass either a SUBARCH or set CPU_UNIT
endif
endif
ifeq ($(ARCH),x86_64)
CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT)
CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT)
endif
ifeq ($(ARCH),m68k)
CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT)
endif
ifeq ($(ARCH),mipsel)
CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT)
CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT)
ifeq ($(SUBARCH),pic32mx)
CPU_UNITS=pic32mx1xxfxxxb pic32mx2xxfxxxb pic32mx1xxfxxxc pic32mx2xxfxxxc pic32mx1xxfxxxd pic32mx2xxfxxxd pic32mx7x5fxxxl pic32mx7x5fxxxh
CPU_UNITS_DEFINED=1
@ -1029,7 +1029,7 @@ $(error No CPUs enabled for given SUBARCH, pass either a SUBARCH or set CPU_UNIT
endif
endif
ifeq ($(ARCH),riscv32)
CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT)
CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT)
ifeq ($(SUBARCH),rv32imc)
override FPCOPT+=-Cprv32imc
CPU_UNITS=esp32c3 esp32c3idf_50000
@ -1040,7 +1040,7 @@ $(error No CPUs enabled for given SUBARCH, pass either a SUBARCH or set CPU_UNIT
endif
endif
ifeq ($(ARCH),riscv64)
CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT)
CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT)
CPU_UNITS=
CPU_UNITS_DEFINED=1
ifeq ($(CPU_UNITS_DEFINED),)
@ -1048,7 +1048,7 @@ $(error No CPUs enabled for given SUBARCH, pass either a SUBARCH or set CPU_UNIT
endif
endif
ifeq ($(ARCH),xtensa)
CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) typinfo types $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT)
CPU_SPECIFIC_COMMON_UNITS=sysutils $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT)
ifeq ($(SUBARCH),lx6)
CPU_UNITS=esp32 espidf_40100 espidf_40200 espidf_40400
CPU_UNITS_DEFINED=1
@ -2777,10 +2777,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2874,7 +2878,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2937,6 +2945,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -2579,10 +2579,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2676,7 +2680,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2739,6 +2747,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -903,7 +903,7 @@ ifdef NO_EXCEPTIONS_IN_SYSTEM
override FPCOPT+=-dNO_EXCEPTIONS_IN_SYSTEM
endif
ifeq ($(CPU_OS_TARGET),i386-go32v2)
override TARGET_UNITS+=system $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) go32 dpmiexcp $(INITCUNIT) $(PORTSUNIT) profile dxetype dxeload emu387 dos $(CMEMUNIT) $(SORTBASEUNIT) sysutils classes $(MATHUNIT) typinfo cpu $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(CTYPESUNIT) $(FGLUNIT) msmouse $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(UNICODEDATAUNIT) types $(SYSCONSTUNIT) $(RTLCONSTSUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
override TARGET_UNITS+=system $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) go32 dpmiexcp $(INITCUNIT) $(PORTSUNIT) profile dxetype dxeload emu387 dos $(CMEMUNIT) $(SORTBASEUNIT) sysutils classes $(MATHUNIT) $(TYPINFOUNIT) cpu $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(CTYPESUNIT) $(FGLUNIT) msmouse $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(UNICODEDATAUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
ifeq ($(CPU_OS_TARGET),i386-go32v2)
override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS)
@ -912,7 +912,7 @@ ifeq ($(CPU_OS_TARGET),i386-go32v2)
override TARGET_LOADERS+=prt0 exceptn fpu
endif
ifeq ($(CPU_OS_TARGET),i386-go32v2)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT)
endif
override INSTALL_FPCPACKAGE=y y
ifeq ($(CPU_OS_TARGET),i386-go32v2)
@ -2590,10 +2590,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2687,7 +2691,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2750,6 +2758,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif
@ -2931,15 +2957,9 @@ sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \
$(COMPILER) -Fi$(OBJPASDIR)/sysutils sysutils.pp
$(EXECPPAS)
classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
sysutils$(PPUEXT) typinfo$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) types$(PPUEXT) $(FGLUNIT)$(PPUEXT) \
sysutils$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) \
sortbase$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp
typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT)
$(COMPILER) -Sg -Fi$(OBJPASDIR) $(OBJPASDIR)/typinfo.pp
$(EXECPPAS)
types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/types.pp
$(EXECPPAS)
cpu$(PPUEXT) : $(PROCINC)/cpu.pp system$(PPUEXT)
$(COMPILER) $(PROCINC)/cpu.pp
$(EXECPPAS)

View File

@ -2621,10 +2621,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2718,7 +2722,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2781,6 +2789,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -2549,10 +2549,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2646,7 +2650,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2709,6 +2717,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -1132,58 +1132,58 @@ ifeq ($(CPU_OS_TARGET),loongarch64-linux)
override TARGET_LOADERS+=$(LOADERS)
endif
ifeq ($(CPU_OS_TARGET),i386-linux)
override TARGET_RSTS+=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),m68k-linux)
override TARGET_RSTS+=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),powerpc-linux)
override TARGET_RSTS+=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),sparc-linux)
override TARGET_RSTS+=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),x86_64-linux)
override TARGET_RSTS+=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),arm-linux)
override TARGET_RSTS+=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),powerpc64-linux)
override TARGET_RSTS+=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),armeb-linux)
override TARGET_RSTS+=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),mips-linux)
override TARGET_RSTS+=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),mipsel-linux)
override TARGET_RSTS+=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),mips64-linux)
override TARGET_RSTS+=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),mips64el-linux)
override TARGET_RSTS+=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),aarch64-linux)
override TARGET_RSTS+=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),sparc64-linux)
override TARGET_RSTS+=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),riscv32-linux)
override TARGET_RSTS+=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),riscv64-linux)
override TARGET_RSTS+=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),xtensa-linux)
override TARGET_RSTS+=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),loongarch64-linux)
override TARGET_RSTS+=$(MATHUNIT) typinfo $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),i386-linux)
override CLEAN_UNITS+=$(LINUXUNIT)
@ -3190,10 +3190,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -3287,7 +3291,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -3350,6 +3358,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -2570,10 +2570,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2667,7 +2671,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2730,6 +2738,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -2553,10 +2553,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2650,7 +2654,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2713,6 +2721,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -2581,10 +2581,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2678,7 +2682,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2741,6 +2749,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -2550,10 +2550,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2647,7 +2651,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2710,6 +2718,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif
@ -2873,17 +2899,11 @@ sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \
$(COMPILER) -Fi$(OBJPASDIR)/sysutils sysutils.pp
$(EXECPPAS)
classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
sysutils$(PPUEXT) typinfo$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
types$(PPUEXT) $(FGLUNIT)$(PPUEXT) sortbase$(PPUEXT) \
sysutils$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
$(TYPESUNIT)$(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) $(RTLCONSTSUNIT)$(PPUEXT) system$(PPUEXT)
$(COMPILER) -Sg -Fi$(OBJPASDIR) $(OBJPASDIR)/typinfo.pp
$(EXECPPAS)
types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEXT) system$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/types.pp
$(EXECPPAS)
cpu$(PPUEXT) : $(PROCINC)/cpu.pp sysutils$(PPUEXT) system$(PPUEXT)
$(COMPILER) $(PROCINC)/cpu.pp
$(EXECPPAS)

View File

@ -903,10 +903,10 @@ ifeq ($(CPU_OS_TARGET),i386-nativent)
override TARGET_UNITS+=system $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(CPALLUNIT) buildrtl
endif
ifeq ($(CPU_OS_TARGET),i386-nativent)
override TARGET_IMPLICITUNITS+=ndk ndkutils ddk $(CTYPESUNIT) $(STRINGSUNIT) dos $(RTLCONSTSUNIT) $(SYSCONSTUNIT) sysutils $(MATHUNIT) types typinfo $(FGLUNIT) classes $(CPU_UNITS) $(CHARSETUNIT) $(GETOPTSUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) $(CP_UNITS)
override TARGET_IMPLICITUNITS+=ndk ndkutils ddk $(CTYPESUNIT) $(STRINGSUNIT) dos $(RTLCONSTSUNIT) $(SYSCONSTUNIT) sysutils $(MATHUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(FGLUNIT) classes $(CPU_UNITS) $(CHARSETUNIT) $(GETOPTSUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) $(CP_UNITS)
endif
ifeq ($(CPU_OS_TARGET),i386-nativent)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT)
endif
override INSTALL_FPCPACKAGE=y y
ifeq ($(CPU_OS_TARGET),i386-nativent)
@ -2557,10 +2557,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2654,7 +2658,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2717,6 +2725,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -2579,10 +2579,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2676,7 +2680,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2739,6 +2747,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -910,22 +910,22 @@ ifeq ($(ARCH),i386)
CPU_UNITS=$(X86UNIT) $(PORTSUNIT) cpu $(MMXUNIT)
endif
ifeq ($(CPU_OS_TARGET),i386-netbsd)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTLUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(CHARACTERUNIT) $(UNIXUNIT) $(RTLCONSTSUNIT) $(INITCUNIT) $(CMEMUNIT) $(DLUNIT) $(TERMIOUNIT) sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTLUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(CHARACTERUNIT) $(UNIXUNIT) $(RTLCONSTSUNIT) $(INITCUNIT) $(CMEMUNIT) $(DLUNIT) $(TERMIOUNIT) sysutils $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) dos $(CWSTRINGUNIT) $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
ifeq ($(CPU_OS_TARGET),m68k-netbsd)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTLUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(CHARACTERUNIT) $(UNIXUNIT) $(RTLCONSTSUNIT) $(INITCUNIT) $(CMEMUNIT) $(DLUNIT) $(TERMIOUNIT) sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTLUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(CHARACTERUNIT) $(UNIXUNIT) $(RTLCONSTSUNIT) $(INITCUNIT) $(CMEMUNIT) $(DLUNIT) $(TERMIOUNIT) sysutils $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) dos $(CWSTRINGUNIT) $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
ifeq ($(CPU_OS_TARGET),powerpc-netbsd)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTLUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(CHARACTERUNIT) $(UNIXUNIT) $(RTLCONSTSUNIT) $(INITCUNIT) $(CMEMUNIT) $(DLUNIT) $(TERMIOUNIT) sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTLUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(CHARACTERUNIT) $(UNIXUNIT) $(RTLCONSTSUNIT) $(INITCUNIT) $(CMEMUNIT) $(DLUNIT) $(TERMIOUNIT) sysutils $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) dos $(CWSTRINGUNIT) $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
ifeq ($(CPU_OS_TARGET),sparc-netbsd)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTLUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(CHARACTERUNIT) $(UNIXUNIT) $(RTLCONSTSUNIT) $(INITCUNIT) $(CMEMUNIT) $(DLUNIT) $(TERMIOUNIT) sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTLUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(CHARACTERUNIT) $(UNIXUNIT) $(RTLCONSTSUNIT) $(INITCUNIT) $(CMEMUNIT) $(DLUNIT) $(TERMIOUNIT) sysutils $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) dos $(CWSTRINGUNIT) $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
ifeq ($(CPU_OS_TARGET),x86_64-netbsd)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTLUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(CHARACTERUNIT) $(UNIXUNIT) $(RTLCONSTSUNIT) $(INITCUNIT) $(CMEMUNIT) $(DLUNIT) $(TERMIOUNIT) sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTLUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(CHARACTERUNIT) $(UNIXUNIT) $(RTLCONSTSUNIT) $(INITCUNIT) $(CMEMUNIT) $(DLUNIT) $(TERMIOUNIT) sysutils $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) dos $(CWSTRINGUNIT) $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
ifeq ($(CPU_OS_TARGET),arm-netbsd)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTLUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(CHARACTERUNIT) $(UNIXUNIT) $(RTLCONSTSUNIT) $(INITCUNIT) $(CMEMUNIT) $(DLUNIT) $(TERMIOUNIT) sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) dos cwstring $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTLUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(CHARACTERUNIT) $(UNIXUNIT) $(RTLCONSTSUNIT) $(INITCUNIT) $(CMEMUNIT) $(DLUNIT) $(TERMIOUNIT) sysutils $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) dos $(CWSTRINGUNIT) $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
ifeq ($(CPU_OS_TARGET),i386-netbsd)
override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT)
@ -964,22 +964,22 @@ ifeq ($(CPU_OS_TARGET),arm-netbsd)
override TARGET_LOADERS+=prt0 cprt0 dllprt0
endif
ifeq ($(CPU_OS_TARGET),i386-netbsd)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT)
endif
ifeq ($(CPU_OS_TARGET),m68k-netbsd)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT)
endif
ifeq ($(CPU_OS_TARGET),powerpc-netbsd)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT)
endif
ifeq ($(CPU_OS_TARGET),sparc-netbsd)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT)
endif
ifeq ($(CPU_OS_TARGET),x86_64-netbsd)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT)
endif
ifeq ($(CPU_OS_TARGET),arm-netbsd)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT)
endif
override INSTALL_FPCPACKAGE=y y y
ifeq ($(CPU_OS_TARGET),i386-netbsd)
@ -2687,10 +2687,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2784,7 +2788,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2847,6 +2855,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif
@ -3010,13 +3036,9 @@ sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.in
objpas$(PPUEXT) $(UNIXUNIT)$(PPUEXT) $(ERRORSUNIT)$(PPUEXT) $(SYSCONSTUNIT)$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp
classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
sysutils$(PPUEXT) typinfo$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) \
sysutils$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) \
sortbase$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp
typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT)
$(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp
types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/types.pp
ifneq ($(findstring $(ARCH),x86_64 i386),)
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT)
else
@ -3025,7 +3047,5 @@ endif
$(COMPILER) $<
fpmkunit$(PPUEXT) : $(COMMON)/fpmkunit.pp classes$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
variants$(PPUEXT) : $(INC)/variants.pp sysutils$(PPUEXT) $(SYSCONSTUNIT)$(PPUEXT) varutils$(PPUEXT) typinfo$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEXT)
variants$(PPUEXT) : $(INC)/variants.pp sysutils$(PPUEXT) $(SYSCONSTUNIT)$(PPUEXT) varutils$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEXT)
$(COMPILER) -Fi$(INC) $(INC)/variants.pp
cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT)
$(COMPILER) $<

View File

@ -2595,10 +2595,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2692,7 +2696,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2755,6 +2763,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -895,7 +895,7 @@ CREATESMART=1
OBJPASDIR=$(RTL)/objpas
override BINUTILSPREFIX=$(CPU_TARGET)-netware-
ifeq ($(CPU_OS_TARGET),i386-netwlibc)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(HEAPTRCUNIT) nwsnut libc dos $(SYSCONSTUNIT) $(INITCUNIT) sysutils types typinfo $(SORTBASEUNIT) $(FGLUNIT) classes cpu $(MMXUNIT) $(GETOPTSUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(RTLCONSTSUNIT) $(MATHUNIT) $(DYNLIBSUNIT) $(CMEMUNIT) $(CTYPESUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(HEAPTRCUNIT) nwsnut libc dos $(SYSCONSTUNIT) $(INITCUNIT) sysutils $(TYPESUNIT) $(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes cpu $(MMXUNIT) $(GETOPTSUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(RTLCONSTSUNIT) $(MATHUNIT) $(DYNLIBSUNIT) $(CMEMUNIT) $(CTYPESUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
ifeq ($(CPU_OS_TARGET),i386-netwlibc)
override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS)
@ -904,7 +904,7 @@ ifeq ($(CPU_OS_TARGET),i386-netwlibc)
override TARGET_LOADERS+=nwplibc nwl_main nwl_dlle
endif
ifeq ($(CPU_OS_TARGET),i386-netwlibc)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT) system
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT) system
endif
override INSTALL_FPCPACKAGE=y y
ifeq ($(CPU_OS_TARGET),i386-netwlibc)
@ -2582,10 +2582,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2679,7 +2683,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2742,6 +2750,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif
@ -2910,14 +2936,10 @@ sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \
$(OBJPASUNIT)$(PPUEXT) dos$(PPUEXT) libc.pp $(SYSCONSTUNIT)$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/sysutils sysutils.pp
classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
sysutils$(PPUEXT) typinfo$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
$(SYSCONSTUNIT)$(PPUEXT) types$(PPUEXT) sortbase$(PPUEXT) \
sysutils$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
$(SYSCONSTUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) sortbase$(PPUEXT) \
tthread.inc $(FGLUNIT)$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp
typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT)
$(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp
types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/types.pp
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
aio$(PPUEXT) : aio.pp $(SYSTEMUNIT)$(PPUEXT)
override INSTALLPPUFILES+=$(IMPFILES)

View File

@ -915,10 +915,10 @@ CPU_UNITS=$(X86UNIT) $(PORTSUNIT) cpu $(MMXUNIT)
endif
OBJPASDIR=$(RTL)/objpas
ifeq ($(CPU_OS_TARGET),i386-openbsd)
override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(INITCUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(BASEUNIXUNIT) $(LINUXUNIT) $(UNIXTYPEUNIT) $(UNIXUTILUNIT) $(UNIXUNIT) $(CTYPESUNIT) $(BSDUNIT) $(CPU_UNITS) dos $(RTLCONSTSUNIT) sysutils $(SORTBASEUNIT) $(FGLUNIT) classes typinfo $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(ERRORSUNIT) types $(SYSCTLUNIT) $(SYSCONSTUNIT) $(FPINTRESUNIT) $(DYNLIBSUNIT) cwstring $(CMEMUNIT) $(DLUNIT) $(TERMIOUNIT) $(CTHREADSUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(INITCUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(BASEUNIXUNIT) $(LINUXUNIT) $(UNIXTYPEUNIT) $(UNIXUTILUNIT) $(UNIXUNIT) $(CTYPESUNIT) $(BSDUNIT) $(CPU_UNITS) dos $(RTLCONSTSUNIT) sysutils $(SORTBASEUNIT) $(FGLUNIT) classes $(TYPINFOUNIT) $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(ERRORSUNIT) $(TYPESUNIT) $(SYSCTLUNIT) $(SYSCONSTUNIT) $(FPINTRESUNIT) $(DYNLIBSUNIT) $(CWSTRINGUNIT) $(CMEMUNIT) $(DLUNIT) $(TERMIOUNIT) $(CTHREADSUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
ifeq ($(CPU_OS_TARGET),x86_64-openbsd)
override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(INITCUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(BASEUNIXUNIT) $(LINUXUNIT) $(UNIXTYPEUNIT) $(UNIXUTILUNIT) $(UNIXUNIT) $(CTYPESUNIT) $(BSDUNIT) $(CPU_UNITS) dos $(RTLCONSTSUNIT) sysutils $(SORTBASEUNIT) $(FGLUNIT) classes typinfo $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(ERRORSUNIT) types $(SYSCTLUNIT) $(SYSCONSTUNIT) $(FPINTRESUNIT) $(DYNLIBSUNIT) cwstring $(CMEMUNIT) $(DLUNIT) $(TERMIOUNIT) $(CTHREADSUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(INITCUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(BASEUNIXUNIT) $(LINUXUNIT) $(UNIXTYPEUNIT) $(UNIXUTILUNIT) $(UNIXUNIT) $(CTYPESUNIT) $(BSDUNIT) $(CPU_UNITS) dos $(RTLCONSTSUNIT) sysutils $(SORTBASEUNIT) $(FGLUNIT) classes $(TYPINFOUNIT) $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(ERRORSUNIT) $(TYPESUNIT) $(SYSCTLUNIT) $(SYSCONSTUNIT) $(FPINTRESUNIT) $(DYNLIBSUNIT) $(CWSTRINGUNIT) $(CMEMUNIT) $(DLUNIT) $(TERMIOUNIT) $(CTHREADSUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
ifeq ($(CPU_OS_TARGET),i386-openbsd)
override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT)
@ -933,10 +933,10 @@ ifeq ($(CPU_OS_TARGET),x86_64-openbsd)
override TARGET_LOADERS+=$(LOADERS)
endif
ifeq ($(CPU_OS_TARGET),i386-openbsd)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT)
endif
ifeq ($(CPU_OS_TARGET),x86_64-openbsd)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT)
endif
override INSTALL_FPCPACKAGE=y y y
ifeq ($(CPU_OS_TARGET),i386-openbsd)
@ -2620,10 +2620,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2717,7 +2721,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2780,6 +2788,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif
@ -2947,14 +2973,8 @@ sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.in
$(OBJPASUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) $(ERRORSUNIT)$(PPUEXT) $(SYSCONSTUNIT)$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp
classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
sysutils$(PPUEXT) typinfo$(PPUEXT) $(FGLUNIT)$(PPUEXT) sortbase$(PPUEXT)
sysutils$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) sortbase$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp
typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp $(OBJPASUNIT)$(PPUEXT)
$(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp
types$(PPUEXT) : $(OBJPASDIR)/types.pp $(OBJPASUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/types.pp
cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT)
$(COMPILER) $<
ifneq ($(findstring $(ARCH),x86_64 i386),)
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT)
$(COMPILER) $<

View File

@ -2589,10 +2589,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2686,7 +2690,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2749,6 +2757,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -2592,10 +2592,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2689,7 +2693,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2752,6 +2760,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif
@ -2906,8 +2932,6 @@ $(PRT0)$(OEXT) : $(CPU_TARGET)/$(PRT0).as
$(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)
types$(PPUEXT) : $(OBJPASDIR)/types.pp objpas$(PPUEXT) $(MATHUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/types.pp
systraps$(PPUEXT) : systraps.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) systraps.pp
pilot$(PPUEXT) : pilot.pp $(SYSTEMUNIT)$(PPUEXT) systraps$(PPUEXT)

View File

@ -903,7 +903,7 @@ ifeq ($(CPU_OS_TARGET),m68k-sinclairql)
override TARGET_LOADERS+=$(LOADERS)
endif
ifeq ($(CPU_OS_TARGET),m68k-sinclairql)
override TARGET_RSTS+=$(MATHUNIT) $(RTLCONSTSUNIT) typinfo classes $(SYSCONSTUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(RTLCONSTSUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT)
endif
override INSTALL_FPCPACKAGE=y y
ifeq ($(CPU_OS_TARGET),m68k-sinclairql)
@ -2581,10 +2581,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2678,7 +2682,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2741,6 +2749,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -906,13 +906,13 @@ endif
override FPCOPT+=-dFPC_USE_LIBC
OBJPASDIR=$(RTL)/objpas
ifeq ($(CPU_OS_TARGET),i386-solaris)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(STRINGSUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(UNIXCPUNIT) $(TERMIOUNIT) $(UNIXUNIT) $(INITCUNIT) $(CMEMUNIT) sysutils typinfo $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) types $(SYSCONSTUNIT) $(CHARACTERUNIT) $(RTLCONSTSUNIT) $(CTHREADSUNIT) dos $(FPWIDESTRINGUNIT) cwstring $(FPINTRESUNIT) $(CPU_UNITS) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(STRINGSUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(UNIXCPUNIT) $(TERMIOUNIT) $(UNIXUNIT) $(INITCUNIT) $(CMEMUNIT) sysutils $(TYPINFOUNIT) $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CHARACTERUNIT) $(RTLCONSTSUNIT) $(CTHREADSUNIT) dos $(FPWIDESTRINGUNIT) $(CWSTRINGUNIT) $(FPINTRESUNIT) $(CPU_UNITS) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
ifeq ($(CPU_OS_TARGET),sparc-solaris)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(STRINGSUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(UNIXCPUNIT) $(TERMIOUNIT) $(UNIXUNIT) $(INITCUNIT) $(CMEMUNIT) sysutils typinfo $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) types $(SYSCONSTUNIT) $(CHARACTERUNIT) $(RTLCONSTSUNIT) $(CTHREADSUNIT) dos $(FPWIDESTRINGUNIT) cwstring $(FPINTRESUNIT) $(CPU_UNITS) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(STRINGSUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(UNIXCPUNIT) $(TERMIOUNIT) $(UNIXUNIT) $(INITCUNIT) $(CMEMUNIT) sysutils $(TYPINFOUNIT) $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CHARACTERUNIT) $(RTLCONSTSUNIT) $(CTHREADSUNIT) dos $(FPWIDESTRINGUNIT) $(CWSTRINGUNIT) $(FPINTRESUNIT) $(CPU_UNITS) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
ifeq ($(CPU_OS_TARGET),x86_64-solaris)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(STRINGSUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(UNIXCPUNIT) $(TERMIOUNIT) $(UNIXUNIT) $(INITCUNIT) $(CMEMUNIT) sysutils typinfo $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) types $(SYSCONSTUNIT) $(CHARACTERUNIT) $(RTLCONSTSUNIT) $(CTHREADSUNIT) dos $(FPWIDESTRINGUNIT) cwstring $(FPINTRESUNIT) $(CPU_UNITS) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(STRINGSUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(MACPASUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(BASEUNIXUNIT) $(UNIXUTILUNIT) $(UNIXCPUNIT) $(TERMIOUNIT) $(UNIXUNIT) $(INITCUNIT) $(CMEMUNIT) sysutils $(TYPINFOUNIT) $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CHARACTERUNIT) $(RTLCONSTSUNIT) $(CTHREADSUNIT) dos $(FPWIDESTRINGUNIT) $(CWSTRINGUNIT) $(FPINTRESUNIT) $(CPU_UNITS) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
ifeq ($(CPU_OS_TARGET),i386-solaris)
override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT)
@ -924,13 +924,13 @@ ifeq ($(CPU_OS_TARGET),x86_64-solaris)
override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT)
endif
ifeq ($(CPU_OS_TARGET),i386-solaris)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),sparc-solaris)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
ifeq ($(CPU_OS_TARGET),x86_64-solaris)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT)
endif
override INSTALL_FPCPACKAGE=y y
ifeq ($(CPU_OS_TARGET),i386-solaris)
@ -2593,10 +2593,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2690,7 +2694,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2753,6 +2761,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif
@ -2910,13 +2936,9 @@ sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.in
$(OBJPASUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) $(ERRORSUNIT)$(PPUEXT) $(SYSCONSTUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp
classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
sysutils$(PPUEXT) typinfo$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) types$(PPUEXT) \
sysutils$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \
$(SYSTEMUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) sortbase$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp
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
ifneq ($(findstring $(ARCH),x86_64 i386),)
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
$(COMPILER) $(PROCINC)/cpu.pp
@ -2924,5 +2946,3 @@ else
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
$(COMPILER) $(PROCINC)/cpu.pp
endif
cwstring$(PPUEXT) : $(UNIXINC)/cwstring.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) $(DYNLIBSUNIT)$(PPUEXT)
$(COMPILER) $(UNIXINC)/cwstring.pp

View File

@ -2572,10 +2572,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2669,7 +2673,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2732,6 +2740,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -2555,10 +2555,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2652,7 +2656,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2715,6 +2723,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -910,7 +910,7 @@ ifeq ($(CPU_OS_TARGET),i386-watcom)
override TARGET_LOADERS+=prt0
endif
ifeq ($(CPU_OS_TARGET),i386-watcom)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) pmhelp $(CLASSESUNIT) $(SYSCONSTUNIT) $(MATHUNIT) typinfo classes $(SYSCONSTUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) pmhelp $(CLASSESUNIT) $(SYSCONSTUNIT) $(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT)
endif
override INSTALL_FPCPACKAGE=y y
ifeq ($(CPU_OS_TARGET),i386-watcom)
@ -2588,10 +2588,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2685,7 +2689,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2748,6 +2756,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -2548,10 +2548,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2645,7 +2649,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2708,6 +2716,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -888,6 +888,7 @@ COMMON=$(RTL)/common
PROCINC=../$(CPU_TARGET)
UNITPREFIX=rtl
SYSTEMUNIT=system
TYPES_DEPS_OS=$(WINTYPESUNIT)$(PPUEXT)
OBJPASDIR=$(RTL)/objpas
ifdef EXCEPTIONS_IN_SYSTEM
override FPCOPT+=-dEXCEPTIONS_IN_SYSTEM
@ -896,7 +897,7 @@ ifdef NO_EXCEPTIONS_IN_SYSTEM
override FPCOPT+=-dNO_EXCEPTIONS_IN_SYSTEM
endif
ifeq ($(CPU_OS_TARGET),i8086-win16)
override TARGET_UNITS+=system $(UUCHARUNIT) $(OBJPASUNIT) $(STRINGSUNIT) $(ISO7185UNIT) $(EXTPASUNIT) dos wintypes winprocs win31 $(PORTSUNIT) $(DYNLIBSUNIT) $(SORTBASEUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) sysutils $(MATHUNIT) types typinfo $(FGLUNIT) classes $(CHARSETUNIT) cpu $(GETOPTSUNIT) $(CPALLUNIT) $(UNICODEDATAUNIT) $(CHARACTERUNIT) $(CTYPESUNIT)
override TARGET_UNITS+=system $(UUCHARUNIT) $(OBJPASUNIT) $(STRINGSUNIT) $(ISO7185UNIT) $(EXTPASUNIT) dos $(WINTYPESUNIT) $(WINPROCSUNIT) $(WIN31UNIT) $(PORTSUNIT) $(DYNLIBSUNIT) $(SORTBASEUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) sysutils $(MATHUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(FGLUNIT) classes $(CHARSETUNIT) cpu $(GETOPTSUNIT) $(CPALLUNIT) $(UNICODEDATAUNIT) $(CHARACTERUNIT) $(CTYPESUNIT)
endif
ifeq ($(CPU_OS_TARGET),i8086-win16)
override TARGET_IMPLICITUNITS+=$(CP_UNITS)
@ -2580,10 +2581,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2677,7 +2682,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2740,6 +2749,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif
@ -2907,37 +2934,22 @@ system$(PPUEXT) : system.pp $(SYSDEPS) wintypes.inc winprocsh.inc winprocs.inc \
sysdl.inc sysdlh.inc
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp
$(EXECPPAS)
wintypes$(PPUEXT) : wintypes.pp wintypes.inc system$(PPUEXT)
$(COMPILER) wintypes.pp
$(EXECPPAS)
winprocs$(PPUEXT) : winprocs.pp winprocsh.inc winprocs.inc system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) wintypes$(PPUEXT)
$(COMPILER) winprocs.pp
$(EXECPPAS)
win31$(PPUEXT) : win31.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) wintypes$(PPUEXT)
$(COMPILER) win31.pp
$(EXECPPAS)
dos$(PPUEXT) : dos.pp registers.inc \
$(INC)/dosh.inc $(INC)/dos.inc $(INC)/fexpand.inc \
strings$(PPUEXT) wintypes$(PPUEXT) winprocs$(PPUEXT) system$(PPUEXT)
strings$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) $(WINPROCSUNIT)$(PPUEXT) system$(PPUEXT)
$(COMPILER) dos.pp
$(EXECPPAS)
sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \
$(OBJPASUNIT)$(PPUEXT) dos$(PPUEXT) $(SYSCONSTUNIT)$(PPUEXT) \
wintypes$(PPUEXT) winprocs$(PPUEXT) system$(PPUEXT)
$(WINTYPESUNIT)$(PPUEXT) $(WINPROCSUNIT)$(PPUEXT) system$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/sysutils sysutils.pp
$(EXECPPAS)
classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
sysutils$(PPUEXT) typinfo$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
types$(PPUEXT) $(FGLUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \
winprocs$(PPUEXT) wintypes$(PPUEXT) sortbase$(PPUEXT) system$(PPUEXT)
sysutils$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
$(TYPESUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \
$(WINPROCSUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) sortbase$(PPUEXT) system$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp
$(EXECPPAS)
typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp sysutils$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) system$(PPUEXT)
$(COMPILER) -Sg -Fi$(OBJPASDIR) $(OBJPASDIR)/typinfo.pp
$(EXECPPAS)
types$(PPUEXT) : $(OBJPASDIR)/types.pp $(MATHUNIT)$(PPUEXT) wintypes$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) system$(PPUEXT)
$(COMPILER) $(OBJPASDIR)/types.pp
$(EXECPPAS)
cpu$(PPUEXT) : $(PROCINC)/cpu.pp sysutils$(PPUEXT) system$(PPUEXT)
$(COMPILER) $(PROCINC)/cpu.pp
$(EXECPPAS)

View File

@ -905,6 +905,7 @@ WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES)))
EXEINFO_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
EXTPAS_DEPS_OS=buildrtl$(PPUEXT)
FPWIDESTRING_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
TYPES_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
ifeq ($(CPU_OS_TARGET),i386-win32)
override TARGET_UNITS+=system $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(WINDOWSUNIT) $(SYSUTILSUNIT) buildrtl $(CHARSETUNIT) $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT)
endif
@ -915,7 +916,7 @@ ifeq ($(CPU_OS_TARGET),i386-win32)
override TARGET_LOADERS+=$(LOADERS)
endif
ifeq ($(CPU_OS_TARGET),i386-win32)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT)
endif
override INSTALL_BUILDUNIT=buildrtl
override INSTALL_FPCPACKAGE=y y
@ -2594,10 +2595,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2691,7 +2696,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2754,6 +2763,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -908,6 +908,7 @@ WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES)))
FPC_SYSTEM_OPT=-Fi../win
EXEINFO_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
FPWIDESTRING_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
TYPES_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
ifeq ($(CPU_OS_TARGET),x86_64-win64)
override TARGET_UNITS+=system $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(WINDOWSUNIT) $(SYSUTILSUNIT) buildrtl $(CHARSETUNIT) $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT)
endif
@ -927,10 +928,10 @@ ifeq ($(CPU_OS_TARGET),aarch64-win64)
override TARGET_LOADERS+=$(LOADERS)
endif
ifeq ($(CPU_OS_TARGET),x86_64-win64)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT)
endif
ifeq ($(CPU_OS_TARGET),aarch64-win64)
override TARGET_RSTS+=$(MATHUNIT) typinfo classes $(SYSCONSTUNIT)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT)
endif
override INSTALL_BUILDUNIT=buildrtl
override INSTALL_FPCPACKAGE=y y
@ -2615,10 +2616,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2712,7 +2717,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2775,6 +2784,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -908,6 +908,7 @@ SYSUTILSDIR=.
SYSUTILS_OPT=-Fi../win
SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
FPWIDESTRING_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
TYPES_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
ifeq ($(CPU_OS_TARGET),i386-wince)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(FPINTRESUNIT) $(CTYPESUNIT) objpas $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(CPU_UNITS) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(WINDOWSUNIT) $(MESSAGESUNIT) $(DYNLIBSUNIT) $(DOSUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(SYSUTILSUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(MATHUNIT) $(FPWIDESTRINGUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(CMEMUNIT) $(SHARMEMUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif
@ -2575,10 +2576,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2672,7 +2677,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2735,6 +2744,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif

View File

@ -2547,10 +2547,14 @@ System.CodePages.All$(PPUEXT): $(NSINC)/System.CodePages.All.pas $(CPALL_DEPS)
ifneq ($(UNIXINC),)
FPWIDESTRING_DEPS_OS:=$(FPWIDESTRING_DEPS_OS) $(UNIXCPUNIT)$(PPUEXT)
endif
ifeq ($(AMIINC),)
RTLDEFSINCDIR = $(OSDIR)
else
ifneq ($(AMIINC),)
RTLDEFSINCDIR=$(AMIINC)
else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
RTLDEFSINCDIR = $(OSDIR)
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
@ -2644,7 +2648,11 @@ cthreads$(PPUEXT) : $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
$(COMPILER) $(CTHREADS_OPT) $<
CWSTRING_DEPS=$(UNIXINC)/cwstring.pp \
ifndef CWSTRINGDIR
CWSTRINGDIR=$(UNIXINC)
CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
endif
CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
$(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
$(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \
@ -2707,6 +2715,24 @@ messages$(PPUEXT): $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) $<
WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS)
$(COMPILER) -Fi$(WINMESSAGESINCDIR) -Fi$(WINMMESSAGESDIR) $<
WINTYPES_DEPS = wintypes.pp wintypes.inc $(SYSTEMUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
wintypes$(PPUEXT) : $(WINTYPES_DEPS)
$(COMPILER) $<
WinApi.WinTypes$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinTypes.pp $(WINTYPES_DEPS)
$(COMPILER) $<
WINPROCS_DEPS = winprocs.pp winprocsh.inc winprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
winprocs$(PPUEXT) : $(WINPROCS_DEPS)
$(COMPILER) $<
WinApi.Winprocs$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.WinProcs.pp $(WINPROCS_DEPS)
$(COMPILER) $<
WIN31_DEPS = win31.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) \
$(WINTYPES_DEPS_OS) $(WINTYPES_DEPS_CPU)
win31$(PPUEXT) : $(WIN31_DEPS)
$(COMPILER) $<
WinApi.Win31$(PPUEXT) : $(NSWINDOWSDIR)/WinApi.Win31.pp $(WINPROCS_DEPS)
$(COMPILER) $<
ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSCTL_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT)
endif