Add WINDIRSDIR variable

This commit is contained in:
Pierre Muller 2023-08-02 12:58:02 +02:00
parent 2f97637b0f
commit 0d8d363de4
3 changed files with 5 additions and 3 deletions

View File

@ -1434,7 +1434,7 @@ WinApi.Windows$(PPUEXT): $(NSOSDIR)/WinApi.Windows.pp $(WINDOWS_DEPS)
#
# Windirs
#
WINDIRS_DEPS=windirs.pp $(WINDOWSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
WINDIRS_DEPS=$(WINDIRSDIR)/windirs.pp $(WINDOWSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
$(WINDIRS_DEPS_OS) $(WINDIRS_DEPS_CPU)
windirs$(PPUEXT): $(WINDIRS_DEPS)

View File

@ -60,10 +60,11 @@ DLLS=fpcmemdll
CPU_UNITS=$(CPUUNIT) $(SIGNALSUNIT) $(MMXUNIT)
# Paths
OBJPASDIR=$(RTL)/objpas
FPC_SYSTEM_OPT=-Fu../win
FPC_SYSTEM_OPT=-Fu$(WINDIR)
SYSUTILSDIR=$(WINDIR)
SYSUTILS_OPT=-Fi../win
SYSUTILS_OPT=-Fi$(WINDIR)
SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) $(WINDIRSUNIT)$(PPUEXT)
WINDIRSDIR=$(WINDIR)
# Files used by windows.pp
include $(WININC)/makefile.inc

View File

@ -58,6 +58,7 @@ NSOSDIR=$(NSDIR)/windows
SYSUTILSDIR=$(WINDIR)
SYSUTILS_OPT=-Fi../win
SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) $(WINDIRSUNIT)$(PPUEXT)
WINDIRSDIR=$(WINDIR)
UNITPREFIX=rtl
SYSTEMUNIT=system