diff --git a/rtl/aix/Makefile b/rtl/aix/Makefile index 22915815d2..5dace4ac60 100644 --- a/rtl/aix/Makefile +++ b/rtl/aix/Makefile @@ -888,6 +888,7 @@ PROCINC=$(RTL)/$(CPU_TARGET) OSPROCINC=$(RTL)/aix/$(CPU_TARGET) UNIXINC=$(RTL)/unix UNITPREFIX=rtl +CLASSESDIR=$(UNIXINC) CPU_UNITS= CWSTRING_DEPS_OS=$(UNIXINC)/cwstraix.inc DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT) @@ -905,16 +906,13 @@ ifeq ($(ARCH),x86_64) CPU_UNITS=$(CPUUNIT) SYSINIT_UNITS= # si_prc si_c si_dll endif -ifdef RELEASE -override FPCOPT+=-Ur -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) $(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(UNIXCPUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(CWSTRINGUNIT) $(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) $(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(UNIXCPUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(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) $(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(UNIXCPUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(CWSTRINGUNIT) $(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) $(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(UNIXCPUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(CWSTRINGUNIT) $(FPWIDESTRINGUNIT) $(FPINTRESUNIT) $(CPU_UNITS) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),powerpc-aix) override TARGET_IMPLICITUNITS+=$(CP_UNITS) $(UNICODEDATAUNIT) @@ -923,10 +921,10 @@ ifeq ($(CPU_OS_TARGET),powerpc64-aix) override TARGET_IMPLICITUNITS+=$(CP_UNITS) $(UNICODEDATAUNIT) endif ifeq ($(CPU_OS_TARGET),powerpc-aix) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) endif ifeq ($(CPU_OS_TARGET),powerpc64-aix) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) endif override INSTALL_FPCPACKAGE=y y ifeq ($(CPU_OS_TARGET),powerpc-aix) @@ -2209,6 +2207,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2429,8 +2430,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) @@ -2919,7 +2920,3 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) $(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(SYSTEMUNIT).pp -classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ - $(SYSTEMUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) - $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp diff --git a/rtl/amiga/Makefile b/rtl/amiga/Makefile index 11265b442f..5efdf187f0 100644 --- a/rtl/amiga/Makefile +++ b/rtl/amiga/Makefile @@ -890,9 +890,6 @@ AMIINC=$(RTL)/amicommon UNITPREFIX=rtl LOADERS=prt0 SYSTEMUNIT=system -ifdef RELEASE -override FPCOPT+=-Ur -endif OBJPASDIR=$(RTL)/objpas ifeq ($(ARCH),m68k) override LOADERS= @@ -924,10 +921,10 @@ ifeq ($(CPU_OS_TARGET),powerpc-amiga) override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(CPU_OS_TARGET),m68k-amiga) -override TARGET_RSTS+=$(MATHUNIT) $(RTLCONSTSUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(RTLCONSTSUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) endif ifeq ($(CPU_OS_TARGET),powerpc-amiga) -override TARGET_RSTS+=$(MATHUNIT) $(RTLCONSTSUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(RTLCONSTSUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) endif override INSTALL_FPCPACKAGE=y y ifeq ($(CPU_OS_TARGET),m68k-amiga) @@ -2237,6 +2234,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2457,8 +2457,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) diff --git a/rtl/android/Makefile b/rtl/android/Makefile index 27c23b995e..727b66ec06 100644 --- a/rtl/android/Makefile +++ b/rtl/android/Makefile @@ -888,6 +888,7 @@ PROCINC=$(RTL)/$(ARCH) UNIXINC=$(RTL)/unix OSPROCINC=$(RTL)/linux/$(CPU_TARGET) LINUXINC=$(RTL)/linux +CLASSESDIR=$(UNIXINC) DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT) DYNLIBSINCDIR=$(UNIXINC) DL_DEPS_OS=dlandroid.inc @@ -914,22 +915,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) $(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(RTLCONSTSUNIT) $(DOSUNIT) $(CWSTRINGUNIT) $(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) $(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(SORTBASEUNIT) $(CLASSESUNIT) $(FGLUNIT) $(RTLCONSTSUNIT) $(DOSUNIT) $(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) $(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(RTLCONSTSUNIT) $(DOSUNIT) $(CWSTRINGUNIT) $(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) $(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(SORTBASEUNIT) $(CLASSESUNIT) $(FGLUNIT) $(RTLCONSTSUNIT) $(DOSUNIT) $(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) $(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(RTLCONSTSUNIT) $(DOSUNIT) $(CWSTRINGUNIT) $(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) $(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(SORTBASEUNIT) $(CLASSESUNIT) $(FGLUNIT) $(RTLCONSTSUNIT) $(DOSUNIT) $(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) $(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(RTLCONSTSUNIT) $(DOSUNIT) $(CWSTRINGUNIT) $(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) $(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(SORTBASEUNIT) $(CLASSESUNIT) $(FGLUNIT) $(RTLCONSTSUNIT) $(DOSUNIT) $(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) $(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(RTLCONSTSUNIT) $(DOSUNIT) $(CWSTRINGUNIT) $(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) $(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(SORTBASEUNIT) $(CLASSESUNIT) $(FGLUNIT) $(RTLCONSTSUNIT) $(DOSUNIT) $(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) $(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(RTLCONSTSUNIT) $(DOSUNIT) $(CWSTRINGUNIT) $(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) $(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(SORTBASEUNIT) $(CLASSESUNIT) $(FGLUNIT) $(RTLCONSTSUNIT) $(DOSUNIT) $(CWSTRINGUNIT) $(FPCYLIXUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),i386-android) override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT) @@ -1058,7 +1059,7 @@ endif ifeq ($(CPU_OS_TARGET),aarch64-android) override COMPILER_TARGETDIR+=. endif -override SHARED_LIBUNITS=$(SYSTEMUNIT) $(OBJPASUNIT) $(STRINGSUNIT) $(DOSUNIT) $(UNIXUNIT) $(BASEUNIXUNIT) $(UNIXTYPEUNIT) $(UNIXUTILUNIT) $(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) $(CPU_UNITS) $(GETOPTSUNIT) $(ERRORSUNIT) sockets $(SORTBASEUNIT) classes $(FGLUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) +override SHARED_LIBUNITS=$(SYSTEMUNIT) $(OBJPASUNIT) $(STRINGSUNIT) $(DOSUNIT) $(UNIXUNIT) $(BASEUNIXUNIT) $(UNIXTYPEUNIT) $(UNIXUTILUNIT) $(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) $(CPU_UNITS) $(GETOPTSUNIT) $(ERRORSUNIT) $(SORTBASEUNIT) $(CLASSESUNIT) $(FGLUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -2354,6 +2355,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2574,8 +2578,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) @@ -3080,6 +3084,3 @@ dllprt0$(OEXT) : dllprt0.as $(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)dllprt0$(OEXT) --defsym CPU$(CPUBITS)=1 dllprt0.as $(SYSTEMUNIT)$(PPUEXT) : $(LINUXINC)/$(SYSTEMUNIT).pp $(SYSDEPS) $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(LINUXINC)/$(SYSTEMUNIT).pp -classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) - $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp diff --git a/rtl/aros/Makefile b/rtl/aros/Makefile index 0415d9a914..11017dd85a 100644 --- a/rtl/aros/Makefile +++ b/rtl/aros/Makefile @@ -891,9 +891,6 @@ UNITPREFIX=rtl LOADERS=prt0 SYSTEMUNIT=system SYSINITUNITS=si_prc -ifdef RELEASE -override FPCOPT+=-Ur -endif OBJPASDIR=$(RTL)/objpas ifeq ($(ARCH),i386) CPU_UNITS=$(CPUUNIT) $(MMXUNIT) $(LINEINFOUNIT) @@ -2252,6 +2249,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2472,8 +2472,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) diff --git a/rtl/atari/Makefile b/rtl/atari/Makefile index bbb98f8446..671b2eca0b 100644 --- a/rtl/atari/Makefile +++ b/rtl/atari/Makefile @@ -889,9 +889,6 @@ PROCINC=$(RTL)/$(CPU_TARGET) UNITPREFIX=rtl LOADERS= SYSTEMUNIT=system -ifdef RELEASE -override FPCOPT+=-Ur -endif OBJPASDIR=$(RTL)/objpas ifeq ($(CPU_OS_TARGET),m68k-atari) override TARGET_UNITS+=$(SYSTEMUNIT) fpextres $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) buildrtl $(CPALLUNIT) @@ -2207,6 +2204,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2427,8 +2427,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) diff --git a/rtl/beos/Makefile b/rtl/beos/Makefile index 2f3fe3535b..1d7d80ae1c 100644 --- a/rtl/beos/Makefile +++ b/rtl/beos/Makefile @@ -894,9 +894,6 @@ RTLCONSTSUNIT=rtlconst endif DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT) DYNLIBSINCDIR=$(UNIXINC) -ifdef RELEASE -override FPCOPT+=-Ur -endif override FPCOPT+= -dHASUNIX -n -dFPC_USE_LIBC -Si OBJPASDIR=$(RTL)/objpas ifeq ($(CPU_OS_TARGET),i386-beos) @@ -2216,6 +2213,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2436,8 +2436,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) diff --git a/rtl/darwin/Makefile b/rtl/darwin/Makefile index 6d4124da51..b7b92b1cc1 100644 --- a/rtl/darwin/Makefile +++ b/rtl/darwin/Makefile @@ -906,9 +906,6 @@ EXEINFO_DEPS_OS=$(BASEUNIXUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) $(DLUNIT)$(PPUEX FPEXTRES_DEPS_OS=$(BASEUNIXUNIT)$(PPUEXT) DOS_DEPS_OS=$(BASEUNIXUNIT)$(PPUEXT) $(UNIXUTILUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) SYSTEMUNIT=system -ifdef RELEASE -override FPCOPT+=-Ur -endif override FPCOPT+=-dFPC_USE_LIBC OBJPASDIR=$(RTL)/objpas ifeq ($(CPU_OS_TARGET),i386-darwin) @@ -972,34 +969,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) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) endif ifeq ($(CPU_OS_TARGET),i386-iphonesim) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) endif ifeq ($(CPU_OS_TARGET),powerpc-darwin) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) endif ifeq ($(CPU_OS_TARGET),x86_64-darwin) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) endif ifeq ($(CPU_OS_TARGET),x86_64-iphonesim) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) endif ifeq ($(CPU_OS_TARGET),arm-ios) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) endif ifeq ($(CPU_OS_TARGET),powerpc64-darwin) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) endif ifeq ($(CPU_OS_TARGET),aarch64-darwin) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) endif ifeq ($(CPU_OS_TARGET),aarch64-iphonesim) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) endif ifeq ($(CPU_OS_TARGET),aarch64-ios) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) endif override INSTALL_FPCPACKAGE=y y ifeq ($(CPU_OS_TARGET),i386-darwin) @@ -2330,6 +2327,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2550,8 +2550,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) diff --git a/rtl/dragonfly/Makefile b/rtl/dragonfly/Makefile index 6a76e250e2..d0dd45683b 100644 --- a/rtl/dragonfly/Makefile +++ b/rtl/dragonfly/Makefile @@ -892,6 +892,7 @@ UNIXINC=$(RTL)/unix UNITPREFIX=rtl CPU_UNITS= BSD_DEPS_OS=$(SYSCALLUNIT)$(PPUEXT) +CLASSESDIR=$(UNIXINC) DOSDIR=$(UNIXINC) DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT) DYNLIBSINCDIR=$(UNIXINC) @@ -904,12 +905,9 @@ loaders+=gprt0 ifeq ($(ARCH),x86_64) CPU_UNITS=$(X86UNIT) $(PORTSUNIT) $(CPUUNIT) endif -ifdef RELEASE -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) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(CONSOLEUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(CWSTRINGUNIT) $(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) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) $(CLASSESUNIT) $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(CONSOLEUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(CWSTRINGUNIT) $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),x86_64-dragonfly) override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT) @@ -918,7 +916,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) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) endif override INSTALL_FPCPACKAGE=y y y ifeq ($(CPU_OS_TARGET),x86_64-dragonfly) @@ -2222,6 +2220,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2442,8 +2443,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) @@ -2940,6 +2941,3 @@ dllprt0$(OEXT) : $(CPU_TARGET)/dllprt0.as $(AS) -o $(UNITTARGETDIRPREFIX)dllprt0$(OEXT) $(CPU_TARGET)/dllprt0.as $(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp unxconst.inc $(SYSDEPS) $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp -classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) - $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp diff --git a/rtl/embedded/Makefile b/rtl/embedded/Makefile index 3a0e7d21ac..69ff87c322 100644 --- a/rtl/embedded/Makefile +++ b/rtl/embedded/Makefile @@ -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=$(SYSUTILSUNIT) $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=$(SYSUTILSUNIT) $(MATHUNIT) $(CLASSESUNIT) $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT) ifeq ($(SUBARCH),rv32ec) override FPCOPT+=-Cprv32ec CPU_UNITS=CH32VxBootstrap @@ -2586,6 +2586,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2806,8 +2809,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) diff --git a/rtl/emx/Makefile b/rtl/emx/Makefile index a0bbac3808..2ae6bebfbe 100644 --- a/rtl/emx/Makefile +++ b/rtl/emx/Makefile @@ -895,9 +895,6 @@ SYSTEMUNIT=system ifndef FPC_DOTTEDUNITS RTLCONSTSUNIT=rtlconst endif -ifdef RELEASE -override FPCOPT+=-Ur -endif OBJPASDIR=$(RTL)/objpas SYSTEMUNITEXT=pas DOSUNITEXT=pas @@ -2216,6 +2213,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2436,8 +2436,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) diff --git a/rtl/freebsd/Makefile b/rtl/freebsd/Makefile index c500ac0853..09a7e7ed83 100644 --- a/rtl/freebsd/Makefile +++ b/rtl/freebsd/Makefile @@ -894,6 +894,7 @@ UNITPREFIX=rtl CPU_UNITS= BASEUNIX_DEPS_OS=$(SYSCTLUNIT)$(PPUEXT) BSD_DEPS_OS=$(SYSCALLUNIT)$(PPUEXT) +CLASSESDIR=$(UNIXINC) DOSDIR=$(UNIXINC) DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT) DYNLIBSINCDIR=$(UNIXINC) @@ -910,18 +911,15 @@ ifeq ($(ARCH),x86_64) CPU_UNITS=$(X86UNIT) $(PORTSUNIT) $(CPUUNIT) ASTARGET=--64 endif -ifdef RELEASE -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) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) freebsd $(CONSOLEUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(CWSTRINGUNIT) $(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) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) $(CLASSESUNIT) $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(FREEBSDUNIT) $(CONSOLEUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(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) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) freebsd $(CONSOLEUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(CWSTRINGUNIT) $(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) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) $(CLASSESUNIT) $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(FREEBSDUNIT) $(CONSOLEUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(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) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) freebsd $(CONSOLEUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(CWSTRINGUNIT) $(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) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) $(CLASSESUNIT) $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(FREEBSDUNIT) $(CONSOLEUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(CWSTRINGUNIT) $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),i386-freebsd) override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT) @@ -942,13 +940,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) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) endif ifeq ($(CPU_OS_TARGET),x86_64-freebsd) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) endif ifeq ($(CPU_OS_TARGET),aarch64-freebsd) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) endif override INSTALL_FPCPACKAGE=y y y ifeq ($(CPU_OS_TARGET),i386-freebsd) @@ -2264,6 +2262,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2484,8 +2485,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) @@ -2982,7 +2983,14 @@ dllprt0$(OEXT) : $(CPU_TARGET)/dllprt0.as $(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)dllprt0$(OEXT) $(CPU_TARGET)/dllprt0.as $(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp unxconst.inc $(SYSDEPS) $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp -classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) \ - $(SORTBASEUNIT)$(PPUEXT) - $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp +ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),) + FREEBSD_DEPS_OS+=$(SYSCALLUNIT)$(PPUEXT) +else + FREEBSD_DEPS_OS+=$(INITCUNIT)$(PPUEXT) +endif +FREEBSD_DEPS = freebsd.pas $(SYSTEMUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) $(SYSCTLUNIT)$(PPUEXT) \ + $(FREEBSD_DEPS_OS) $(FREEBSD_DEPS_CPU) +freebsd$(PPUEXT): $(FREEBSD_DEPS) + $(COMPILER) $(FREEBSD_OPT) $< +FreeBSDApi.FreeBSD$(PPUEXT): $(NSFREEBSDDIR)/FreeBSDApi.FreeBSD.pas $(FREEBSD_DEPS) + $(COMPILER) $(FREEBSD_OPT) $< diff --git a/rtl/freertos/Makefile b/rtl/freertos/Makefile index 7c1bdaa79c..bd774c3366 100644 --- a/rtl/freertos/Makefile +++ b/rtl/freertos/Makefile @@ -905,7 +905,7 @@ CPU_SPECIFIC_COMMON_UNITS= DOSDIR=. DOS_DEPS_OS=$(OBJPASUNIT)$(PPUEXT) ifeq ($(ARCH),arm) -CPU_SPECIFIC_COMMON_UNITS=$(SYSUTILSUNIT) $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=$(SYSUTILSUNIT) $(MATHUNIT) $(CLASSESUNIT) $(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=$(SYSUTILSUNIT) $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=$(SYSUTILSUNIT) $(MATHUNIT) $(CLASSESUNIT) $(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=$(SYSUTILSUNIT) $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=$(SYSUTILSUNIT) $(MATHUNIT) $(CLASSESUNIT) $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT) endif ifeq ($(ARCH),m68k) CPU_SPECIFIC_COMMON_UNITS=$(SYSUTILSUNIT) $(MATHUNIT) endif ifeq ($(ARCH),mipsel) -CPU_SPECIFIC_COMMON_UNITS=$(SYSUTILSUNIT) $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=$(SYSUTILSUNIT) $(MATHUNIT) $(CLASSESUNIT) $(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=$(SYSUTILSUNIT) $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=$(SYSUTILSUNIT) $(MATHUNIT) $(CLASSESUNIT) $(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=$(SYSUTILSUNIT) $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=$(SYSUTILSUNIT) $(MATHUNIT) $(CLASSESUNIT) $(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=$(SYSUTILSUNIT) $(MATHUNIT) classes $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT) +CPU_SPECIFIC_COMMON_UNITS=$(SYSUTILSUNIT) $(MATHUNIT) $(CLASSESUNIT) $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT) ifeq ($(SUBARCH),lx6) CPU_UNITS=esp32 espidf_40100 espidf_40200 espidf_40400 CPU_UNITS_DEFINED=1 @@ -2403,6 +2403,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2623,8 +2626,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) diff --git a/rtl/gba/Makefile b/rtl/gba/Makefile index 7f199608af..f93375fa5a 100644 --- a/rtl/gba/Makefile +++ b/rtl/gba/Makefile @@ -889,9 +889,6 @@ PROCINC=$(RTL)/$(CPU_TARGET) UNITPREFIX=rtl SYSTEMUNIT=system LOADERS=prt0 cprt0 -ifdef RELEASE -override FPCOPT+=-Ur -endif OBJPASDIR=$(RTL)/objpas SYSUTILS_DEPS_OS=$(DOSUNIT)$(PPUEXT) ifeq ($(CPU_OS_TARGET),arm-gba) @@ -2205,6 +2202,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2425,8 +2425,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) @@ -2917,41 +2917,3 @@ prt0$(OEXT) : prt0.as $(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)prt0$(OEXT) prt0.as cprt0$(OEXT) : cprt0.as $(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)cprt0$(OEXT) cprt0.as -exec$(PPUEXT) : exec.pp execf.inc execd.inc - $(COMPILER) exec.pp -timer$(PPUEXT) : timer.pp timerd.inc timerf.inc - $(COMPILER) timer.pp -utility$(PPUEXT) : utility.pp exec$(PPUEXT) utilf.inc utild1.inc utild2.inc - $(COMPILER) utility.pp -doslib$(PPUEXT) : doslib.pp exec$(PPUEXT) timer$(PPUEXT) doslibd.inc doslibf.inc - $(COMPILER) doslib.pp -hardware$(PPUEXT): hardware.pas exec$(PPUEXT) - $(COMPILER) hardware.pas -inputevent$(PPUEXT): inputevent.pas exec$(PPUEXT) timer$(PPUEXT) utility$(PPUEXT) - $(COMPILER) inputevent.pas -graphics$(PPUEXT): graphics.pas exec$(PPUEXT) utility$(PPUEXT) hardware$(PPUEXT) - $(COMPILER) graphics.pas -layers$(PPUEXT) : layers.pas exec$(PPUEXT) graphics$(PPUEXT) utility$(PPUEXT) - $(COMPILER) layers.pas -intuition$(PPUEXT): intuition.pas exec$(PPUEXT) graphics$(PPUEXT) utility$(PPUEXT) \ - inputevent$(PPUEXT) timer$(PPUEXT) layers$(PPUEXT) - $(COMPILER) intuition.pas -aboxlib$(PPUEXT): aboxlib.pas - $(COMPILER) aboxlib.pas -clipboard$(PPUEXT): clipboard.pas exec$(PPUEXT) - $(COMPILER) clipboard.pas -datatype$(PPUEXT): datatypes.pas exec$(PPUEXT) doslib$(PPUEXT) intuition$(PPUEXT) \ - utility$(PPUEXT) graphics$(PPUEXT) - $(COMPILER) datatypes.pas -asl$(PPUEXT): asl.pas exec$(PPUEXT) graphics$(PPUEXT) utility$(PPUEXT) - $(COMPILER) asl.pas -ahi$(PPUEXT): ahi.pas exec$(PPUEXT) utility$(PPUEXT) - $(COMPILER) ahi.pas -mui$(PPUEXT): mui.pas exec$(PPUEXT) utility$(PPUEXT) intuition$(PPUEXT) graphics$(PPUEXT) - $(COMPILER) mui.pas -tinygl$(PPUEXT): tinygl.pp exec$(PPUEXT) - $(COMPILER) tinygl.pp -get9$(PPUEXT): get9.pas exec$(PPUEXT) - $(COMPILER) get9.pas -muihelper$(PPUEXT): muihelper.pas intuition$(PPUEXT) mui$(PPUEXT) doslib$(PPUEXT) utility$(PPUEXT) - $(COMPILER) muihelper.pas diff --git a/rtl/go32v2/Makefile b/rtl/go32v2/Makefile index 6341e72e89..2b6e71dde7 100644 --- a/rtl/go32v2/Makefile +++ b/rtl/go32v2/Makefile @@ -893,9 +893,6 @@ RTLCONSTSUNIT=rtlconst endif INITC_DEPS_OS=$(DPMIEXCPUNIT)$(PPUEXT) SYSUTILS_DEPS_OS = $(DOSUNIT)$(PPUEXT) go32$(PPUEXT) -ifdef RELEASE -override FPCOPT+=-Ur -endif OBJPASDIR=$(RTL)/objpas ifdef EXCEPTIONS_IN_SYSTEM override FPCOPT+=-dEXCEPTIONS_IN_SYSTEM @@ -904,7 +901,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 $(DOSUNIT) $(CMEMUNIT) $(SORTBASEUNIT) $(SYSUTILSUNIT) classes $(MATHUNIT) $(TYPINFOUNIT) $(CPUUNIT) $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(CTYPESUNIT) $(FGLUNIT) $(MSMOUSEUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(UNICODEDATAUNIT) $(TYPESUNIT) $(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 $(DOSUNIT) $(CMEMUNIT) $(SORTBASEUNIT) $(SYSUTILSUNIT) $(CLASSESUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(CPUUNIT) $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(CTYPESUNIT) $(FGLUNIT) $(MSMOUSEUNIT) $(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) @@ -913,7 +910,7 @@ ifeq ($(CPU_OS_TARGET),i386-go32v2) override TARGET_LOADERS+=prt0 exceptn fpu endif ifeq ($(CPU_OS_TARGET),i386-go32v2) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) endif override INSTALL_FPCPACKAGE=y y ifeq ($(CPU_OS_TARGET),i386-go32v2) @@ -2217,6 +2214,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2437,8 +2437,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) @@ -2949,13 +2949,3 @@ emu387$(PPUEXT) : emu387.pp fpu$(OEXT) strings$(PPUEXT) dxeload$(PPUEXT) \ dpmiexcp$(PPUEXT) $(COMPILER) emu387.pp $(EXECPPAS) -classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) \ - $(SORTBASEUNIT)$(PPUEXT) - $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp -matrix$(PPUEXT) : $(INC)/matrix.pp $(SYSTEMUNIT)$(PPUEXT) - $(COMPILER) $(INC)/matrix.pp - $(EXECPPAS) -ucomplex$(PPUEXT) : $(INC)/ucomplex.pp $(MATHUNIT)$(PPUEXT) system$(PPUEXT) - $(COMPILER) $(INC)/ucomplex.pp - $(EXECPPAS) diff --git a/rtl/haiku/Makefile b/rtl/haiku/Makefile index 0ac91ec5de..00f8d49b74 100644 --- a/rtl/haiku/Makefile +++ b/rtl/haiku/Makefile @@ -891,6 +891,7 @@ SYSINITUNITS=si_c si_dllc UNITPREFIX=rtl DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT) DYNLIBSINCDIR=$(UNIXINC) +TTHREADINCDIR=$(UNIXINC) ifeq ($(ARCH),i386) LOADERS=cprt0 dllcprt0 CPU_UNITS=$(CPUUNIT) $(MMXUNIT) @@ -902,9 +903,6 @@ endif ifneq ($(findstring $(ARCH),x86_64 i386),) CPU_DEP_CPUS=$(SYSUTILSUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) endif -ifdef RELEASE -override FPCOPT+=-Ur -endif override FPCOPT+=-dFPC_USE_LIBC OBJPASDIR=$(RTL)/objpas SYSTEMUNIT=system @@ -2247,6 +2245,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2467,8 +2468,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) diff --git a/rtl/java/Makefile b/rtl/java/Makefile index db89c1f181..1e9e16fe29 100644 --- a/rtl/java/Makefile +++ b/rtl/java/Makefile @@ -2175,6 +2175,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2395,8 +2398,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile index 73cc2811c5..96d6800a4f 100644 --- a/rtl/linux/Makefile +++ b/rtl/linux/Makefile @@ -2816,6 +2816,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -3036,8 +3039,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) diff --git a/rtl/macos/Makefile b/rtl/macos/Makefile index 9f3a868467..54a156150a 100644 --- a/rtl/macos/Makefile +++ b/rtl/macos/Makefile @@ -891,9 +891,6 @@ DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT) DYNLIBSINCDIR=$(UNIXINC) UNITPREFIX=rtl SYSTEMUNIT=system -ifdef RELEASE -override FPCOPT+=-Ur -endif OBJPASDIR=$(RTL)/objpas DOS_DEPS_OS=$(UNIXUTILUNIT)$(PPUEXT) $(MACUTILSUNIT)$(PPUEXT) SYSUTILS_DEPS_OS=$(DOSUNIT)$(PPUEXT) @@ -2196,6 +2193,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2416,8 +2416,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) diff --git a/rtl/morphos/Makefile b/rtl/morphos/Makefile index 1697115898..472f0226b1 100644 --- a/rtl/morphos/Makefile +++ b/rtl/morphos/Makefile @@ -890,9 +890,6 @@ AMIINC=$(RTL)/amicommon UNITPREFIX=rtl SYSTEMUNIT=system SYSINITUNITS=si_prc -ifdef RELEASE -override FPCOPT+=-Ur -endif OBJPASDIR=$(RTL)/objpas ifeq ($(CPU_OS_TARGET),powerpc-morphos) override TARGET_UNITS+=$(SYSTEMUNIT) $(HEAPTRCUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) buildrtl $(CPALLUNIT) @@ -2179,6 +2176,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2399,8 +2399,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) diff --git a/rtl/msdos/Makefile b/rtl/msdos/Makefile index f63dc6f477..643303f906 100644 --- a/rtl/msdos/Makefile +++ b/rtl/msdos/Makefile @@ -2207,6 +2207,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2427,8 +2430,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) diff --git a/rtl/msxdos/Makefile b/rtl/msxdos/Makefile index b2d9e179df..8484322843 100644 --- a/rtl/msxdos/Makefile +++ b/rtl/msxdos/Makefile @@ -2177,6 +2177,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2397,8 +2400,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) @@ -2890,11 +2893,5 @@ endif system$(PPUEXT) : system.pp $(SYSDEPS) $(INC)/tnyheaph.inc $(INC)/tinyheap.inc registers.inc $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp $(EXECPPAS) -classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ - $(TYPESUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ - $(OBJPASUNIT)$(PPUEXT) system$(PPUEXT) - $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp - $(EXECPPAS) si_prc$(PPUEXT) : system$(PPUEXT) $(COMPILER) si_prc.pp diff --git a/rtl/nativent/Makefile b/rtl/nativent/Makefile index b1d6fd7494..4529a57be8 100644 --- a/rtl/nativent/Makefile +++ b/rtl/nativent/Makefile @@ -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) $(DOSUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(FGLUNIT) classes $(CPU_UNITS) $(CHARSETUNIT) $(GETOPTSUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) $(CP_UNITS) +override TARGET_IMPLICITUNITS+=ndk ndkutils ddk $(CTYPESUNIT) $(STRINGSUNIT) $(DOSUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(FGLUNIT) $(CLASSESUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(GETOPTSUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) $(CP_UNITS) endif ifeq ($(CPU_OS_TARGET),i386-nativent) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) endif override INSTALL_FPCPACKAGE=y y ifeq ($(CPU_OS_TARGET),i386-nativent) @@ -2183,6 +2183,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2403,8 +2406,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) diff --git a/rtl/nds/Makefile b/rtl/nds/Makefile index 67900fec6c..86e6a5d42c 100644 --- a/rtl/nds/Makefile +++ b/rtl/nds/Makefile @@ -2205,6 +2205,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2425,8 +2428,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) @@ -2923,23 +2926,3 @@ cprt09$(OEXT) : cprt09.as $(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)cprt09$(OEXT) cprt09.as $(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) $(INC)/softfpu.pp $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg @rtl.cfg $(SYSTEMUNIT).pp $(REDIR) -exec$(PPUEXT) : exec.pp execf.inc execd.inc -timer$(PPUEXT) : timer.pp timerd.inc timerf.inc -utility$(PPUEXT) : utility.pp exec$(PPUEXT) utilf.inc utild1.inc utild2.inc -doslib$(PPUEXT) : doslib.pp exec$(PPUEXT) timer$(PPUEXT) doslibd.inc doslibf.inc -hardware$(PPUEXT): hardware.pas exec$(PPUEXT) -inputevent$(PPUEXT): inputevent.pas exec$(PPUEXT) timer$(PPUEXT) utility$(PPUEXT) -graphics$(PPUEXT): graphics.pas exec$(PPUEXT) utility$(PPUEXT) hardware$(PPUEXT) -layers$(PPUEXT) : layers.pas exec$(PPUEXT) graphics$(PPUEXT) utility$(PPUEXT) -intuition$(PPUEXT): intuition.pas exec$(PPUEXT) graphics$(PPUEXT) utility$(PPUEXT) \ - inputevent$(PPUEXT) timer$(PPUEXT) layers$(PPUEXT) -aboxlib$(PPUEXT): aboxlib.pas -clipboard$(PPUEXT): clipboard.pas exec$(PPUEXT) -datatype$(PPUEXT): datatypes.pas exec$(PPUEXT) doslib$(PPUEXT) intuition$(PPUEXT) \ - utility$(PPUEXT) graphics$(PPUEXT) -asl$(PPUEXT): asl.pas exec$(PPUEXT) graphics$(PPUEXT) utility$(PPUEXT) -ahi$(PPUEXT): ahi.pas exec$(PPUEXT) utility$(PPUEXT) -mui$(PPUEXT): mui.pas exec$(PPUEXT) utility$(PPUEXT) intuition$(PPUEXT) graphics$(PPUEXT) -tinygl$(PPUEXT): tinygl.pp exec$(PPUEXT) -get9$(PPUEXT): get9.pas exec$(PPUEXT) -muihelper$(PPUEXT): muihelper.pas intuition$(PPUEXT) mui$(PPUEXT) doslib$(PPUEXT) utility$(PPUEXT) diff --git a/rtl/netbsd/Makefile b/rtl/netbsd/Makefile index c6c86484ed..6ab31fd8f4 100644 --- a/rtl/netbsd/Makefile +++ b/rtl/netbsd/Makefile @@ -893,6 +893,7 @@ UNITPREFIX=rtl TARGETPROCINC=$(RTL)/netbsd/$(CPU_TARGET) BASEUNIX_DEPS_OS=$(SYSCTLUNIT)$(PPUEXT) BSD_DEPS_OS=$(SYSCALLUNIT)$(PPUEXT) +CLASSESDIR=$(UNIXINC) DOSDIR=$(UNIXINC) DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT) DYNLIBSINCDIR=$(UNIXINC) @@ -902,9 +903,6 @@ SYSUTILS_DEPS_OS = $(UNIXUNIT)$(PPUEXT) $(ERRORSUNIT)$(PPUEXT) SYSTEMUNIT=system LINUXUNIT= PRT0=prt0 -ifdef RELEASE -override FPCOPT+=-Ur -endif OBJPASDIR=$(RTL)/objpas ifeq ($(ARCH),x86_64) CPU_UNITS=$(X86UNIT) $(PORTSUNIT) $(CPUUNIT) @@ -913,22 +911,22 @@ ifeq ($(ARCH),i386) CPU_UNITS=$(X86UNIT) $(PORTSUNIT) $(CPUUNIT) $(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) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(CWSTRINGUNIT) $(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) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) $(CLASSESUNIT) $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(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) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(CWSTRINGUNIT) $(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) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) $(CLASSESUNIT) $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(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) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(CWSTRINGUNIT) $(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) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) $(CLASSESUNIT) $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(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) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(CWSTRINGUNIT) $(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) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) $(CLASSESUNIT) $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(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) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(CWSTRINGUNIT) $(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) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) $(CLASSESUNIT) $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(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) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(CWSTRINGUNIT) $(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) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(SORTBASEUNIT) $(CLASSESUNIT) $(FGLUNIT) $(DYNLIBSUNIT) $(CPU_UNITS) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(LINEINFOUNIT) $(ERRORSUNIT) $(BSDUNIT) $(SYSCONSTUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(CWSTRINGUNIT) $(FPINTRESUNIT) $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),i386-netbsd) override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT) @@ -967,22 +965,22 @@ ifeq ($(CPU_OS_TARGET),arm-netbsd) override TARGET_LOADERS+=prt0 cprt0 dllprt0 endif ifeq ($(CPU_OS_TARGET),i386-netbsd) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) endif ifeq ($(CPU_OS_TARGET),m68k-netbsd) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) endif ifeq ($(CPU_OS_TARGET),powerpc-netbsd) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) endif ifeq ($(CPU_OS_TARGET),sparc-netbsd) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) endif ifeq ($(CPU_OS_TARGET),x86_64-netbsd) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) endif ifeq ($(CPU_OS_TARGET),arm-netbsd) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) endif override INSTALL_FPCPACKAGE=y y y ifeq ($(CPU_OS_TARGET),i386-netbsd) @@ -2316,6 +2314,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2536,8 +2537,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) @@ -3032,11 +3033,3 @@ dllprt0$(OEXT) : $(CPU_TARGET)/dllprt0.as $(AS) -o $(UNITTARGETDIRPREFIX)dllprt0$(OEXT) $(CPU_TARGET)/dllprt0.as $(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp sysconst.inc systypes.inc syscalls.inc $(SYSDEPS) $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp -classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) \ - $(SORTBASEUNIT)$(PPUEXT) - $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp -fpmkunit$(PPUEXT) : $(COMMON)/fpmkunit.pp classes$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) - $(COMPILER) $< -variants$(PPUEXT) : $(INC)/variants.pp $(SYSUTILSUNIT)$(PPUEXT) $(SYSCONSTUNIT)$(PPUEXT) varutils$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(MATHUNIT)$(PPUEXT) - $(COMPILER) -Fi$(INC) $(INC)/variants.pp diff --git a/rtl/netware/Makefile b/rtl/netware/Makefile index c2966c3660..a8de31f82e 100644 --- a/rtl/netware/Makefile +++ b/rtl/netware/Makefile @@ -894,7 +894,6 @@ endif DOS_DEPS_OS=$(STRINGSUNIT)$(PPUEXT) SYSUTILS_DEPS_OS=$(DOSUNIT)$(PPUEXT) INITC_DEPS_OS=$(OSDIR)/nwsys.inc -override FPCOPT+=-Ur override FPCOPT+=-dMT CREATESMART=1 OBJPASDIR=$(RTL)/objpas @@ -2221,6 +2220,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2441,8 +2443,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) diff --git a/rtl/netwlibc/Makefile b/rtl/netwlibc/Makefile index 746b7eeb48..86c1dec7a1 100644 --- a/rtl/netwlibc/Makefile +++ b/rtl/netwlibc/Makefile @@ -890,13 +890,12 @@ IMPFILES=nwsnut.imp ws2_32.imp ws2nlm.imp libc.imp netware.imp \ libcclib.imp SYSTEMUNIT=system SYSUTILS_DEPS_OS = $(DOSUNIT)$(PPUEXT) libc.pp -override FPCOPT+=-Ur override FPCOPT+=-dMT 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 $(DOSUNIT) $(SYSCONSTUNIT) $(INITCUNIT) $(SYSUTILSUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes $(CPUUNIT) $(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 $(DOSUNIT) $(SYSCONSTUNIT) $(INITCUNIT) $(SYSUTILSUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(CPUUNIT) $(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) @@ -905,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) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT) system +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) system endif override INSTALL_FPCPACKAGE=y y ifeq ($(CPU_OS_TARGET),i386-netwlibc) @@ -2209,6 +2208,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2429,8 +2431,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) @@ -2932,11 +2934,6 @@ $(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp libc.pp $(SYSDEPS) netware$(PPUEXT) : netware.pp $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) -I$(WININC) netware.pp nwsnut$(PPUEXT) : nwsnut.pp ../netware/nwsnut.pp libc$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) -classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ - $(SYSCONSTUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ - tthread.inc $(FGLUNIT)$(PPUEXT) - $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp aio$(PPUEXT) : aio.pp $(SYSTEMUNIT)$(PPUEXT) override INSTALLPPUFILES+=$(IMPFILES) override CLEANPPUFILES+=$(addprefix $(COMPILER_UNITTARGETDIR)/,$(IMPFILES)) diff --git a/rtl/openbsd/Makefile b/rtl/openbsd/Makefile index f9483b8378..9d8c39d793 100644 --- a/rtl/openbsd/Makefile +++ b/rtl/openbsd/Makefile @@ -892,6 +892,7 @@ UNITPREFIX=rtl TARGETPROCINC=$(RTL)/openbsd/$(CPU_TARGET) BASEUNIX_DEPS_OS=$(SYSCTLUNIT)$(PPUEXT) BSD_DEPS_OS=$(SYSCALLUNIT)$(PPUEXT) +CLASSESDIR=$(UNIXINC) DOSDIR=$(UNIXINC) DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT) DYNLIBSINCDIR=$(UNIXINC) @@ -901,9 +902,6 @@ SYSUTILS_DEPS_OS = $(UNIXUNIT)$(PPUEXT) $(ERRORSUNIT)$(PPUEXT) SYSTEMUNIT=system LINUXUNIT= PRT0=prt0 -ifdef RELEASE -override FPCOPT+=-Ur -endif ifeq ($(FPC_USE_SYSCALL),) override FPCOPT+=-dFPC_USE_LIBC endif @@ -918,10 +916,10 @@ CPU_UNITS=$(X86UNIT) $(PORTSUNIT) $(CPUUNIT) $(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) $(DOSUNIT) $(RTLCONSTSUNIT) $(SYSUTILSUNIT) $(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) +override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(INITCUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(BASEUNIXUNIT) $(LINUXUNIT) $(UNIXTYPEUNIT) $(UNIXUTILUNIT) $(UNIXUNIT) $(CTYPESUNIT) $(BSDUNIT) $(CPU_UNITS) $(DOSUNIT) $(RTLCONSTSUNIT) $(SYSUTILSUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(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) $(DOSUNIT) $(RTLCONSTSUNIT) $(SYSUTILSUNIT) $(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) +override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(INITCUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(SYSCALLUNIT) $(BASEUNIXUNIT) $(LINUXUNIT) $(UNIXTYPEUNIT) $(UNIXUTILUNIT) $(UNIXUNIT) $(CTYPESUNIT) $(BSDUNIT) $(CPU_UNITS) $(DOSUNIT) $(RTLCONSTSUNIT) $(SYSUTILSUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(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) @@ -936,10 +934,10 @@ ifeq ($(CPU_OS_TARGET),x86_64-openbsd) override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(CPU_OS_TARGET),i386-openbsd) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) endif ifeq ($(CPU_OS_TARGET),x86_64-openbsd) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) endif override INSTALL_FPCPACKAGE=y y y ifeq ($(CPU_OS_TARGET),i386-openbsd) @@ -2249,6 +2247,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2469,8 +2470,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) @@ -2969,6 +2970,3 @@ si_g$(PPUEXT) : si_g.pp si_intf.inc si_impl.inc $(ARCH)/openbsd_ident.inc $(ARCH $(COMPILER) $< $(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp sysconst.inc systypes.inc syscalls.inc $(SYSDEPS) $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp -classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) - $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp diff --git a/rtl/os2/Makefile b/rtl/os2/Makefile index 9d65099f0e..a66fb1fd4e 100644 --- a/rtl/os2/Makefile +++ b/rtl/os2/Makefile @@ -897,9 +897,6 @@ SYSTEMUNIT=system ifndef FPC_DOTTEDUNITS RTLCONSTSUNIT=rtlconst endif -ifdef RELEASE -override FPCOPT+=-Ur -endif OBJPASDIR=$(RTL)/objpas ifeq ($(CPU_OS_TARGET),i386-os2) override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(PORTSUNIT) $(OS2DEFUNIT) $(DOSCALLSUNIT) $(DOSCALL2UNIT) $(KBDCALLSUNIT) $(MOUCALLSUNIT) $(VIOCALLSUNIT) $(SO32DLLUNIT) $(PMBITMAPUNIT) $(PMWINUNIT) $(PMGPIUNIT) $(PMSTDDLGUNIT) $(PMHELPUNIT) $(PMDEVUNIT) $(PMSPLUNIT) $(PMSHLUNIT) $(PMWPUNIT) $(PMWSOCKUNIT) $(PMBIDI) $(DOSUNIT) $(SUSITILSUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CPUNIT) $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(FPWIDESTRINGUNIT) $(CHARACTERUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SPFU128UNIT) $(UFLOAT128UNIT) @@ -2215,6 +2212,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2435,8 +2435,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) diff --git a/rtl/palmos/Makefile b/rtl/palmos/Makefile index 2d79550664..4164c9bde9 100644 --- a/rtl/palmos/Makefile +++ b/rtl/palmos/Makefile @@ -888,9 +888,6 @@ PROCINC=$(RTL)/$(CPU_TARGET) UNITPREFIX=rtl SYSTEMUNIT=system PRT0=prt0 -ifdef RELEASE -override FPCOPT+=-Ur -endif OBJPASDIR=$(RTL)/objpas ifeq ($(CPU_OS_TARGET),m68k-palmos) override TARGET_UNITS+=$(SYSTEMUNIT) si_prc $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(STRINGSUNIT) $(CTYPESUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(SYSCONSTUNIT) systraps pilot @@ -2218,6 +2215,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2438,8 +2438,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) @@ -2936,5 +2936,3 @@ systraps$(PPUEXT) : systraps.pp $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) systraps.pp pilot$(PPUEXT) : pilot.pp $(SYSTEMUNIT)$(PPUEXT) systraps$(PPUEXT) $(COMPILER) pilot.pp -fmtbcd$(PPUEXT) : $(OBJPASDIR)/fmtbcd.pp $(OBJPASUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) variants$(PPUEXT) classes$(PPUEXT) system$(PPUEXT) - $(COMPILER) $(OBJPASDIR)/fmtbcd.pp diff --git a/rtl/sinclairql/Makefile b/rtl/sinclairql/Makefile index 19f70b2907..c306ce8428 100644 --- a/rtl/sinclairql/Makefile +++ b/rtl/sinclairql/Makefile @@ -889,9 +889,6 @@ PROCINC=$(RTL)/$(CPU_TARGET) UNITPREFIX=rtl LOADERS= SYSTEMUNIT=system -ifdef RELEASE -override FPCOPT+=-Ur -endif OBJPASDIR=$(RTL)/objpas ifeq ($(CPU_OS_TARGET),m68k-sinclairql) override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) buildrtl $(CPALLUNIT) @@ -903,7 +900,7 @@ ifeq ($(CPU_OS_TARGET),m68k-sinclairql) override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(CPU_OS_TARGET),m68k-sinclairql) -override TARGET_RSTS+=$(MATHUNIT) $(RTLCONSTSUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(RTLCONSTSUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) endif override INSTALL_FPCPACKAGE=y y ifeq ($(CPU_OS_TARGET),m68k-sinclairql) @@ -2207,6 +2204,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2427,8 +2427,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) diff --git a/rtl/solaris/Makefile b/rtl/solaris/Makefile index 1d2a3eb742..da650dac89 100644 --- a/rtl/solaris/Makefile +++ b/rtl/solaris/Makefile @@ -888,6 +888,7 @@ PROCINC=$(RTL)/$(CPU_TARGET) OSPROCINC=$(RTL)/solaris/$(CPU_TARGET) UNIXINC=$(RTL)/unix UNITPREFIX=rtl +CLASSESDIR=$(UNIXINC) CPU_UNITS= DOSDIR=$(UNIXINC) DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT) @@ -903,19 +904,16 @@ ifeq ($(ARCH),x86_64) CPU_UNITS=$(CPUUNIT) SYSINIT_UNITS= # si_prc si_c si_dll endif -ifdef RELEASE -override FPCOPT+=-Ur -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) $(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CHARACTERUNIT) $(RTLCONSTSUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(FPWIDESTRINGUNIT) $(CWSTRINGUNIT) $(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) $(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CHARACTERUNIT) $(RTLCONSTSUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(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) $(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CHARACTERUNIT) $(RTLCONSTSUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(FPWIDESTRINGUNIT) $(CWSTRINGUNIT) $(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) $(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CHARACTERUNIT) $(RTLCONSTSUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(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) $(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CHARACTERUNIT) $(RTLCONSTSUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(FPWIDESTRINGUNIT) $(CWSTRINGUNIT) $(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) $(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(GETOPTSUNIT) $(ERRORSUNIT) $(DLUNIT) $(DYNLIBSUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(CHARACTERUNIT) $(RTLCONSTSUNIT) $(CTHREADSUNIT) $(DOSUNIT) $(FPWIDESTRINGUNIT) $(CWSTRINGUNIT) $(FPINTRESUNIT) $(CPU_UNITS) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) endif ifeq ($(CPU_OS_TARGET),i386-solaris) override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT) @@ -927,13 +925,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) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) endif ifeq ($(CPU_OS_TARGET),sparc-solaris) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) endif ifeq ($(CPU_OS_TARGET),x86_64-solaris) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) $(RTLCONSTSUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) endif override INSTALL_FPCPACKAGE=y y ifeq ($(CPU_OS_TARGET),i386-solaris) @@ -2222,6 +2220,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2442,8 +2443,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) @@ -2932,7 +2933,3 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) $(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(SYSTEMUNIT).pp -classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ - $(SYSTEMUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) - $(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp diff --git a/rtl/symbian/Makefile b/rtl/symbian/Makefile index 0a054dd621..294f31f0e1 100644 --- a/rtl/symbian/Makefile +++ b/rtl/symbian/Makefile @@ -2198,6 +2198,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2418,8 +2421,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) diff --git a/rtl/wasi/Makefile b/rtl/wasi/Makefile index 1b96ea11cc..305e3439c8 100644 --- a/rtl/wasi/Makefile +++ b/rtl/wasi/Makefile @@ -2181,6 +2181,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2401,8 +2404,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) diff --git a/rtl/watcom/Makefile b/rtl/watcom/Makefile index 92e6c4640c..5465e32936 100644 --- a/rtl/watcom/Makefile +++ b/rtl/watcom/Makefile @@ -892,9 +892,6 @@ RTLCONSTSUNIT=rtlconst endif DOS_DEPS_OS=$(STRINGSUNIT)$(PPUEXT) SYSUTILS_DEPS_OS=$(DOSUNIT)$(PPUEXT) -ifdef RELEASE -override FPCOPT+=-Ur -endif OBJPASDIR=$(RTL)/objpas ifdef EXCEPTIONS_IN_SYSTEM override FPCOPT+=-dEXCEPTIONS_IN_SYSTEM @@ -910,7 +907,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) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) pmhelp $(CLASSESUNIT) $(SYSCONSTUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) endif override INSTALL_FPCPACKAGE=y y ifeq ($(CPU_OS_TARGET),i386-watcom) @@ -2214,6 +2211,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2434,8 +2434,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) diff --git a/rtl/wii/Makefile b/rtl/wii/Makefile index 184edc20ae..257b67868f 100644 --- a/rtl/wii/Makefile +++ b/rtl/wii/Makefile @@ -2174,6 +2174,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2394,8 +2397,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) @@ -2882,41 +2885,3 @@ SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES)) include $(PROCINC)/makefile.cpu SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) $(INC)/softfpu.pp -exec$(PPUEXT) : exec.pp execf.inc execd.inc - $(COMPILER) exec.pp -timer$(PPUEXT) : timer.pp timerd.inc timerf.inc - $(COMPILER) timer.pp -utility$(PPUEXT) : utility.pp exec$(PPUEXT) utilf.inc utild1.inc utild2.inc - $(COMPILER) utility.pp -doslib$(PPUEXT) : doslib.pp exec$(PPUEXT) timer$(PPUEXT) doslibd.inc doslibf.inc - $(COMPILER) doslib.pp -hardware$(PPUEXT): hardware.pas exec$(PPUEXT) - $(COMPILER) hardware.pas -inputevent$(PPUEXT): inputevent.pas exec$(PPUEXT) timer$(PPUEXT) utility$(PPUEXT) - $(COMPILER) inputevent.pas -graphics$(PPUEXT): graphics.pas exec$(PPUEXT) utility$(PPUEXT) hardware$(PPUEXT) - $(COMPILER) graphics.pas -layers$(PPUEXT) : layers.pas exec$(PPUEXT) graphics$(PPUEXT) utility$(PPUEXT) - $(COMPILER) layers.pas -intuition$(PPUEXT): intuition.pas exec$(PPUEXT) graphics$(PPUEXT) utility$(PPUEXT) \ - inputevent$(PPUEXT) timer$(PPUEXT) layers$(PPUEXT) - $(COMPILER) intuition.pas -aboxlib$(PPUEXT): aboxlib.pas - $(COMPILER) aboxlib.pas -clipboard$(PPUEXT): clipboard.pas exec$(PPUEXT) - $(COMPILER) clipboard.pas -datatype$(PPUEXT): datatypes.pas exec$(PPUEXT) doslib$(PPUEXT) intuition$(PPUEXT) \ - utility$(PPUEXT) graphics$(PPUEXT) - $(COMPILER) datatypes.pas -asl$(PPUEXT): asl.pas exec$(PPUEXT) graphics$(PPUEXT) utility$(PPUEXT) - $(COMPILER) asl.pas -ahi$(PPUEXT): ahi.pas exec$(PPUEXT) utility$(PPUEXT) - $(COMPILER) ahi.pas -mui$(PPUEXT): mui.pas exec$(PPUEXT) utility$(PPUEXT) intuition$(PPUEXT) graphics$(PPUEXT) - $(COMPILER) mui.pas -tinygl$(PPUEXT): tinygl.pp exec$(PPUEXT) - $(COMPILER) tinygl.pp -get9$(PPUEXT): get9.pas exec$(PPUEXT) - $(COMPILER) get9.pas -muihelper$(PPUEXT): muihelper.pas intuition$(PPUEXT) mui$(PPUEXT) doslib$(PPUEXT) utility$(PPUEXT) - $(COMPILER) muihelper.pas diff --git a/rtl/win16/Makefile b/rtl/win16/Makefile index d70dc93372..2d8b4f29b0 100644 --- a/rtl/win16/Makefile +++ b/rtl/win16/Makefile @@ -891,6 +891,7 @@ SYSTEMUNIT=system TYPES_DEPS_OS=$(WINTYPESUNIT)$(PPUEXT) DOS_DEPS_OS = registers.inc $(INC)/dosh.inc $(INC)/dos.inc $(INC)/fexpand.inc SYSUTILS_DEPS_OS = $(DOSUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) $(WINPROCSUNIT)$(PPUEXT) +CLASSES_DEPS_OS = $(WINPROCSUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) OBJPASDIR=$(RTL)/objpas ifdef EXCEPTIONS_IN_SYSTEM override FPCOPT+=-dEXCEPTIONS_IN_SYSTEM @@ -899,7 +900,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) $(DOSUNIT) $(WINTYPESUNIT) $(WINPROCSUNIT) $(WIN31UNIT) $(PORTSUNIT) $(DYNLIBSUNIT) $(SORTBASEUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(FGLUNIT) classes $(CHARSETUNIT) $(CPUUNIT) $(GETOPTSUNIT) $(CPALLUNIT) $(UNICODEDATAUNIT) $(CHARACTERUNIT) $(CTYPESUNIT) +override TARGET_UNITS+=system $(UUCHARUNIT) $(OBJPASUNIT) $(STRINGSUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(DOSUNIT) $(WINTYPESUNIT) $(WINPROCSUNIT) $(WIN31UNIT) $(PORTSUNIT) $(DYNLIBSUNIT) $(SORTBASEUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(FGLUNIT) $(CLASSESUNIT) $(CHARSETUNIT) $(CPUUNIT) $(GETOPTSUNIT) $(CPALLUNIT) $(UNICODEDATAUNIT) $(CHARACTERUNIT) $(CTYPESUNIT) endif ifeq ($(CPU_OS_TARGET),i8086-win16) override TARGET_IMPLICITUNITS+=$(CP_UNITS) @@ -2209,6 +2210,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2429,8 +2433,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) @@ -2936,9 +2940,3 @@ system$(PPUEXT) : system.pp $(SYSDEPS) wintypes.inc winprocsh.inc winprocs.inc \ sysdl.inc sysdlh.inc $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp $(EXECPPAS) -classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ - $(TYPESUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ - $(WINPROCSUNIT)$(PPUEXT) $(WINTYPESUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) system$(PPUEXT) - $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp - $(EXECPPAS) diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile index cbd4c5d9f8..e8b538a4f9 100644 --- a/rtl/win32/Makefile +++ b/rtl/win32/Makefile @@ -900,6 +900,7 @@ SYSUTILS_OPT=-Fi$(WINDIR) SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) $(WINDIRSUNIT)$(PPUEXT) WINDIRSDIR=$(WINDIR) DYNLIBSINCDIR=$(WINDIR) +TTHREADINCDIR=$(WINDIR) include $(WININC)/makefile.inc WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES))) EXEINFO_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) @@ -916,7 +917,7 @@ ifeq ($(CPU_OS_TARGET),i386-win32) override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(CPU_OS_TARGET),i386-win32) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) endif override INSTALL_BUILDUNIT=buildrtl override INSTALL_FPCPACKAGE=y y @@ -2221,6 +2222,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2441,8 +2445,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) diff --git a/rtl/win64/Makefile b/rtl/win64/Makefile index e93b23210c..f2373af924 100644 --- a/rtl/win64/Makefile +++ b/rtl/win64/Makefile @@ -894,6 +894,7 @@ SYSUTILS_OPT=-Fi../win SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) $(WINDIRSUNIT)$(PPUEXT) WINDIRSDIR=$(WINDIR) DYNLIBSINCDIR=$(WINDIR) +TTHREADINCDIR=$(WINDIR) UNITPREFIX=rtl SYSTEMUNIT=system EXEINFO_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) @@ -928,10 +929,10 @@ ifeq ($(CPU_OS_TARGET),aarch64-win64) override TARGET_LOADERS+=$(LOADERS) endif ifeq ($(CPU_OS_TARGET),x86_64-win64) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) endif ifeq ($(CPU_OS_TARGET),aarch64-win64) -override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) classes $(SYSCONSTUNIT) +override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) endif override INSTALL_BUILDUNIT=buildrtl override INSTALL_FPCPACKAGE=y y @@ -2242,6 +2243,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2462,8 +2466,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) diff --git a/rtl/wince/Makefile b/rtl/wince/Makefile index 87979276f8..a3fc9ff0b1 100644 --- a/rtl/wince/Makefile +++ b/rtl/wince/Makefile @@ -895,9 +895,6 @@ CPU_UNITS=$(CPUUNIT) $(MMXUNIT) CPU_DEPS_CPU=$(SYSUTILSUNIT)$(PPUEXT) MMX_DEPS_CPU=$(CPUUNIT)$(PPUEXT) endif -ifdef RELEASE -override FPCOPT+=-Ur -endif OBJPASDIR=$(RTL)/objpas GRAPHDIR=$(INC)/graph include $(WININC)/makefile.inc @@ -909,6 +906,7 @@ SYSUTILS_OPT=-Fi../win SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) FPWIDESTRING_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) TYPES_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) +TTHREADINCDIR=$(WINDIR) ifeq ($(CPU_OS_TARGET),i386-wince) override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(FPINTRESUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(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 @@ -2202,6 +2200,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2422,8 +2423,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU) diff --git a/rtl/zxspectrum/Makefile b/rtl/zxspectrum/Makefile index 2eefd48136..1d6edcc8bb 100644 --- a/rtl/zxspectrum/Makefile +++ b/rtl/zxspectrum/Makefile @@ -2173,6 +2173,9 @@ endif ifndef CLASSESDIR CLASSESDIR=$(OSDIR) endif +ifndef TTHREADINCDIR +TTHREADINCDIR=$(CLASSESDIR) +endif ifndef NSCLASSESDIR NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR) endif @@ -2393,8 +2396,8 @@ sysutils$(PPUEXT) : $(SYSUTILS_DEPS) $(COMPILER) -Fi$(OBJPASDIR)/sysutils $< System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS) $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils -Fi$(SYSUTILSDIR) $< -CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \ - $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ +CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(TTHREADINCDIR)/tthread.inc $(wildcard $(OBJPASDIR)/classes/*.inc) \ + $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(CLASSES_DEPS_OS) $(CLASSES_DEPS_CPU)