Browse Source

Add tthread.inc dependency for classes unit using TTHREADINCDIR variable

Pierre Muller 1 year ago
parent
commit
a6353fecf0

+ 1 - 0
rtl/haiku/Makefile.fpc

@@ -57,6 +57,7 @@ SYSINITUNITS=si_c si_dllc
 UNITPREFIX=rtl
 DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
 DYNLIBSINCDIR=$(UNIXINC)
+TTHREADINCDIR=$(WINDIR)
 
 ifeq ($(ARCH),i386)
 LOADERS=cprt0 dllcprt0

+ 5 - 1
rtl/inc/Makefile.rtl

@@ -598,6 +598,10 @@ ifndef CLASSESDIR
 CLASSESDIR=$(OSDIR)
 endif
 
+ifndef TTHREADINCDIR
+TTHREADINCDIR=$(CLASSESDIR)
+endif
+
 ifndef NSCLASSESDIR
 NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR)
 endif
@@ -1005,7 +1009,7 @@ System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS)
 #
 # Classes
 #
-CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
+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) \

+ 0 - 1
rtl/netwlibc/Makefile.fpc

@@ -47,7 +47,6 @@ libcclib.imp
 # nwplibc.o
 
 SYSTEMUNIT=system
-CLASSES_DEPS_OS = tthread.inc
 SYSUTILS_DEPS_OS = $(DOSUNIT)$(PPUEXT) libc.pp
 
 # Use new feature from 1.0.5 version

+ 1 - 0
rtl/win32/Makefile.fpc

@@ -61,6 +61,7 @@ SYSUTILS_OPT=-Fi$(WINDIR)
 SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) $(WINDIRSUNIT)$(PPUEXT)
 WINDIRSDIR=$(WINDIR)
 DYNLIBSINCDIR=$(WINDIR)
+TTHREADINCDIR=$(WINDIR)
 
 # Files used by windows.pp
 include $(WININC)/makefile.inc

+ 1 - 0
rtl/win64/Makefile.fpc

@@ -55,6 +55,7 @@ SYSUTILS_OPT=-Fi../win
 SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) $(WINDIRSUNIT)$(PPUEXT)
 WINDIRSDIR=$(WINDIR)
 DYNLIBSINCDIR=$(WINDIR)
+TTHREADINCDIR=$(WINDIR)
 
 UNITPREFIX=rtl
 SYSTEMUNIT=system

+ 1 - 0
rtl/wince/Makefile.fpc

@@ -84,6 +84,7 @@ SYSUTILS_OPT=-Fi../win
 SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) 
 FPWIDESTRING_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
 TYPES_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT)
+TTHREADINCDIR=$(WINDIR)
 
 [rules]
 .NOTPARALLEL: