Browse Source

Set DYNLIBSINCDIR to WINDIR for win32 and win64

Pierre Muller 2 years ago
parent
commit
53de381d87
4 changed files with 4 additions and 1 deletions
  1. 1 1
      rtl/inc/Makefile.rtl
  2. 1 0
      rtl/test-rtl-units.sh
  3. 1 0
      rtl/win32/Makefile.fpc
  4. 1 0
      rtl/win64/Makefile.fpc

+ 1 - 1
rtl/inc/Makefile.rtl

@@ -821,7 +821,7 @@ System.Ports$(PPUEXT) :  $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
 #
 # Dynlibs
 #
-DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
+DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
              objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
              $(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
 

+ 1 - 0
rtl/test-rtl-units.sh

@@ -0,0 +1 @@
+/home/muller/scripts/test-rtl-units.sh

+ 1 - 0
rtl/win32/Makefile.fpc

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

+ 1 - 0
rtl/win64/Makefile.fpc

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