mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-12 13:49:39 +02:00
Set DYNLIBSINCDIR to WINDIR for win32 and win64
This commit is contained in:
parent
0763ad74c2
commit
53de381d87
@ -821,7 +821,7 @@ System.Ports$(PPUEXT) : $(NSINC)/System.Ports.$(PORTSUNITEXT) $(PORTS_DEPS)
|
|||||||
#
|
#
|
||||||
# Dynlibs
|
# Dynlibs
|
||||||
#
|
#
|
||||||
DYNLIBS_DEPS=$(INC)/dynlibs.pas $(OSDIR)/dynlibs.inc \
|
DYNLIBS_DEPS=$(INC)/dynlibs.pas $(DYNLIBSINCDIR)/dynlibs.inc \
|
||||||
objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
|
objpas$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \
|
||||||
$(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
|
$(DYNLIBS_DEPS_OS) $(DYNLIBS_DEPS_CPU)
|
||||||
|
|
||||||
|
1
rtl/test-rtl-units.sh
Symbolic link
1
rtl/test-rtl-units.sh
Symbolic link
@ -0,0 +1 @@
|
|||||||
|
/home/muller/scripts/test-rtl-units.sh
|
@ -65,6 +65,7 @@ SYSUTILSDIR=$(WINDIR)
|
|||||||
SYSUTILS_OPT=-Fi$(WINDIR)
|
SYSUTILS_OPT=-Fi$(WINDIR)
|
||||||
SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) $(WINDIRSUNIT)$(PPUEXT)
|
SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) $(WINDIRSUNIT)$(PPUEXT)
|
||||||
WINDIRSDIR=$(WINDIR)
|
WINDIRSDIR=$(WINDIR)
|
||||||
|
DYNLIBSINCDIR=$(WINDIR)
|
||||||
|
|
||||||
# Files used by windows.pp
|
# Files used by windows.pp
|
||||||
include $(WININC)/makefile.inc
|
include $(WININC)/makefile.inc
|
||||||
|
@ -59,6 +59,7 @@ SYSUTILSDIR=$(WINDIR)
|
|||||||
SYSUTILS_OPT=-Fi../win
|
SYSUTILS_OPT=-Fi../win
|
||||||
SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) $(WINDIRSUNIT)$(PPUEXT)
|
SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) $(WINDIRSUNIT)$(PPUEXT)
|
||||||
WINDIRSDIR=$(WINDIR)
|
WINDIRSDIR=$(WINDIR)
|
||||||
|
DYNLIBSINCDIR=$(WINDIR)
|
||||||
|
|
||||||
UNITPREFIX=rtl
|
UNITPREFIX=rtl
|
||||||
SYSTEMUNIT=system
|
SYSTEMUNIT=system
|
||||||
|
Loading…
Reference in New Issue
Block a user