diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile index 62a988e605..31c2ca8f98 100644 --- a/rtl/win32/Makefile +++ b/rtl/win32/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v1.00 [2000/10/01] +# Makefile generated by fpcmake v1.00 [2000/10/12] # defaultrule: all @@ -125,8 +125,10 @@ UNITPREFIX=rtl ifeq ($(findstring 1.0.,$(FPC_VERSION)),) SYSTEMUNIT=system +PRT0=wprt0 else SYSTEMUNIT=syswin32 +PRT0=wprt0_10 endif # Paths @@ -1275,8 +1277,8 @@ vpath %$(PASEXT) $(INC) $(PROCINC) override AS=asw -wprt0$(OEXT) : wprt0.as - $(AS) -o wprt0$(OEXT) wprt0.as +wprt0$(OEXT) : $(PRT0).as + $(AS) -o wprt0$(OEXT) $(PRT0).as wdllprt0$(OEXT) : wdllprt0.as $(AS) -o wdllprt0$(OEXT) wdllprt0.as diff --git a/rtl/win32/Makefile.fpc b/rtl/win32/Makefile.fpc index 37f6eeaedc..006a1e172b 100644 --- a/rtl/win32/Makefile.fpc +++ b/rtl/win32/Makefile.fpc @@ -3,7 +3,7 @@ # [targets] -loaders=$(PRT0) wdllprt0 +loaders=wprt0 wdllprt0 units=$(SYSTEMUNIT) objpas strings \ windows ole2 opengl32 os_types winsock initc \ dos crt objects graph \ @@ -82,8 +82,8 @@ vpath %$(PASEXT) $(INC) $(PROCINC) override AS=asw -wprt0$(OEXT) : wprt0.as - $(AS) -o wprt0$(OEXT) wprt0.as +wprt0$(OEXT) : $(PRT0).as + $(AS) -o wprt0$(OEXT) $(PRT0).as wdllprt0$(OEXT) : wdllprt0.as $(AS) -o wdllprt0$(OEXT) wdllprt0.as