paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-18 16:09:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Regenerate Makefile's after changes for DOTTED support

Browse Source
This commit is contained in:
Pierre Muller 2023-09-27 17:46:39 +02:00
parent eea13aadd4
commit c69bfcace2
3 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
rtl/go32v2/Makefile
View File

@ -892,7 +892,7 @@ ifndef FPC_DOTTEDUNITS
RTLCONSTSUNIT=rtlconst RTLCONSTSUNIT=rtlconst
endif endif
INITC_DEPS_OS=$(DPMIEXCPUNIT)$(PPUEXT) INITC_DEPS_OS=$(DPMIEXCPUNIT)$(PPUEXT)
SYSUTILS_DEPS_OS = $(DOSUNIT)$(PPUEXT) go32$(PPUEXT) SYSUTILS_DEPS_OS = $(DOSUNIT)$(PPUEXT) $(GO32UNIT)$(PPUEXT)
OBJPASDIR=$(RTL)/objpas OBJPASDIR=$(RTL)/objpas
ifdef EXCEPTIONS_IN_SYSTEM ifdef EXCEPTIONS_IN_SYSTEM
override FPCOPT+=-dEXCEPTIONS_IN_SYSTEM override FPCOPT+=-dEXCEPTIONS_IN_SYSTEM
@ -901,7 +901,7 @@ ifdef NO_EXCEPTIONS_IN_SYSTEM
override FPCOPT+=-dNO_EXCEPTIONS_IN_SYSTEM override FPCOPT+=-dNO_EXCEPTIONS_IN_SYSTEM
endif endif
ifeq ($(CPU_OS_TARGET),i386-go32v2) ifeq ($(CPU_OS_TARGET),i386-go32v2)
override TARGET_UNITS+=system $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) go32 dpmiexcp $(INITCUNIT) $(PORTSUNIT) profile dxetype dxeload emu387 $(DOSUNIT) $(CMEMUNIT) $(SORTBASEUNIT) $(SYSUTILSUNIT) $(CLASSESUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(CPUUNIT) $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(CTYPESUNIT) $(FGLUNIT) $(MSMOUSEUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(UNICODEDATAUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(GO32UNIT) $(DPMIEXCPUNIT) $(INITCUNIT) $(PORTSUNIT) $(PROFILEUNIT) $(DXETYPEUNIT) $(DXELOADUNIT) $(EMU387UNIT) $(DOSUNIT) $(CMEMUNIT) $(SORTBASEUNIT) $(SYSUTILSUNIT) $(CLASSESUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(CPUUNIT) $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(CTYPESUNIT) $(FGLUNIT) $(MSMOUSEUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(UNICODEDATAUNIT) $(TYPESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT)
endif endif
ifeq ($(CPU_OS_TARGET),i386-go32v2) ifeq ($(CPU_OS_TARGET),i386-go32v2)
override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS)
@ -2926,26 +2926,42 @@ include $(PROCINC)/makefile.cpu
SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
prt0$(OEXT) : v2prt0.as prt0$(OEXT) : v2prt0.as
$(AS) -o $(UNITTARGETDIRPREFIX)prt0$(OEXT) v2prt0.as $(AS) -o $(UNITTARGETDIRPREFIX)prt0$(OEXT) $<
exceptn$(OEXT) : exceptn.as
$(AS) -o $(UNITTARGETDIRPREFIX)exceptn$(OEXT) $<
fpu$(OEXT) : fpu.as
$(AS) -o $(UNITTARGETDIRPREFIX)fpu$(OEXT) $<
system$(PPUEXT) : system.pp $(SYSDEPS) system$(PPUEXT) : system.pp $(SYSDEPS)
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp
$(EXECPPAS) $(EXECPPAS)
go32$(PPUEXT) : go32.pp system$(PPUEXT) GO32_DEPS = go32.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) go32.pp go32$(PPUEXT) : $(GO32_DEPS)
$(EXECPPAS) $(COMPILER) $<
dpmiexcp$(PPUEXT) : dpmiexcp.pp exceptn$(OEXT) system$(PPUEXT) DOSApi.GO32$(PPUEXT) : $(NSOSINC)/DOSApi.GO32.pp $(GO32_DEPS)
$(COMPILER) -Sg dpmiexcp.pp $(COMPILER) -Sg $(GO32_OPT) $<
$(EXECPPAS) DPMIEXCP_DEPS = dpmiexcp.pp exceptn$(OEXT) $(SYSTEMUNIT)$(PPUEXT)
profile$(PPUEXT) : profile.pp dpmiexcp$(PPUEXT) go32$(PPUEXT) dpmiexcp$(PPUEXT) : $(DPMIEXCP_DEPS)
$(COMPILER) profile.pp $(COMPILER) -Sg $(DPMIEXCP_OPT) $<
$(EXECPPAS) DOSApi.dpmiexcp$(PPUEXT) : $(NSOSINC)/DOSApi.dpmiexcp.pp $(DPMIEXCP_DEPS)
dxetype$(PPUEXT) : dxetype.pp system$(PPUEXT) $(COMPILER) -Sg $(DPMIEXCP_OPT) $<
$(COMPILER) dxetype.pp PROFILE_DEPS = profile.pp $(DPMIEXCPUNIT)$(PPUEXT) $(GO32UNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(EXECPPAS) profile$(PPUEXT) : $(PROFILE_DEPS)
dxeload$(PPUEXT) : dxeload.pp dxetype$(PPUEXT) system$(PPUEXT) $(COMPILER) $(PROFILE_OPT) $<
$(COMPILER) dxeload.pp DOSApi.profile$(PPUEXT) : $(NSOSINC)/DOSApi.profile.pp $(PROFILE_DEPS)
$(EXECPPAS) $(COMPILER) $(PROFILE_OPT) $<
emu387$(PPUEXT) : emu387.pp fpu$(OEXT) strings$(PPUEXT) dxeload$(PPUEXT) \ DXETYPE_DEPS = dxetype.pp $(SYSTEMUNIT)$(PPUEXT)
dpmiexcp$(PPUEXT) dxetype$(PPUEXT) : $(DXETYPE_DEPS)
$(COMPILER) emu387.pp $(COMPILER) $(DXETYPE_OPT) $<
$(EXECPPAS) DOSApi.dxetype$(PPUEXT) : $(NSOSINC)/DOSApi.dxetype.pp $(DXETYPE_DEPS)
$(COMPILER) $(DXETYPE_OPT) $<
DXELOAD_DEPS = dxeload.pp $(DXETYPEUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
dxeload$(PPUEXT) : $(DXELOAD_DEPS)
$(COMPILER) $(DXELOAD_OPT) $<
DOSApi.dxeload$(PPUEXT) : $(NSOSINC)/DOSApi.dxeload.pp $(DXELOAD_DEPS)
$(COMPILER) $(DXELOAD_OPT) $<
EMU387_DEPS = emu387.pp fpu$(OEXT) $(STRINGSUNIT)$(PPUEXT) $(DXELOADUNIT)$(PPUEXT) \
$(DPMIEXCPUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
emu387$(PPUEXT) : $(EMU387_DEPS)
$(COMPILER) $(EMU387_OPT) $<
DOSApi.EMU387$(PPUEXT) : $(NSOSINC)/DOSApi.EMU387.pp $(EMU387_DEPS)
$(COMPILER) $(EMU387_OPT) $<

2
rtl/go32v2/Makefile.fpc
View File

@ -75,7 +75,7 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
prt0$(OEXT) : v2prt0.as prt0$(OEXT) : v2prt0.as
$(AS) -o $(UNITTARGETDIRPREFIX)prt0$(OEXT) $< $(AS) -o $(UNITTARGETDIRPREFIX)prt0$(OEXT) $<
exceptn$(OEXT) : exception.as exceptn$(OEXT) : exceptn.as
$(AS) -o $(UNITTARGETDIRPREFIX)exceptn$(OEXT) $< $(AS) -o $(UNITTARGETDIRPREFIX)exceptn$(OEXT) $<
fpu$(OEXT) : fpu.as fpu$(OEXT) : fpu.as

16
rtl/watcom/Makefile
View File

@ -898,7 +898,7 @@ override FPCOPT+=-dEXCEPTIONS_IN_SYSTEM
endif endif
override FPCOPT+=-dNO_EXCEPTIONS_IN_SYSTEM override FPCOPT+=-dNO_EXCEPTIONS_IN_SYSTEM
ifeq ($(CPU_OS_TARGET),i386-watcom) ifeq ($(CPU_OS_TARGET),i386-watcom)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) watcom $(DOSUNIT) $(SYSUTILSUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CPUUNIT) $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(FPWIDESTRINGUNIT) $(CHARACTERUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SPFU128UNIT) $(UFLOAT128UNIT) override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) $(WATCOMUNIT) $(DOSUNIT) $(SYSUTILSUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CPUUNIT) $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(FPWIDESTRINGUNIT) $(CHARACTERUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SPFU128UNIT) $(UFLOAT128UNIT)
endif endif
ifeq ($(CPU_OS_TARGET),i386-watcom) ifeq ($(CPU_OS_TARGET),i386-watcom)
override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT) override TARGET_IMPLICITUNITS+=$(EXEINFOUNIT) $(CP_UNITS) $(UNICODEDATAUNIT)
@ -907,7 +907,7 @@ ifeq ($(CPU_OS_TARGET),i386-watcom)
override TARGET_LOADERS+=prt0 override TARGET_LOADERS+=prt0
endif endif
ifeq ($(CPU_OS_TARGET),i386-watcom) ifeq ($(CPU_OS_TARGET),i386-watcom)
override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) pmhelp $(CLASSESUNIT) $(SYSCONSTUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) override TARGET_RSTS+=$(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT) $(MATHUNIT) $(TYPINFOUNIT) $(CLASSESUNIT) $(SYSCONSTUNIT)
endif endif
override INSTALL_FPCPACKAGE=y y override INSTALL_FPCPACKAGE=y y
ifeq ($(CPU_OS_TARGET),i386-watcom) ifeq ($(CPU_OS_TARGET),i386-watcom)
@ -2925,10 +2925,8 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
prt0$(OEXT) : prt0.as prt0$(OEXT) : prt0.as
wasm prt0.as -fo=prt0$(OEXT) -bt=dos -5s -fp5 -ms -zq wasm prt0.as -fo=prt0$(OEXT) -bt=dos -5s -fp5 -ms -zq
$(COPY) prt0$(OEXT) $(UNITTARGETDIRPREFIX)prt0$(OEXT) $(COPY) prt0$(OEXT) $(UNITTARGETDIRPREFIX)prt0$(OEXT)
watcom$(PPUEXT) : watcom.pp system$(PPUEXT) WATCOM_DEPS = watcom.pp $(SYSTEMUNIT)$(PPUEXT)
dpmiexcp$(PPUEXT) : dpmiexcp.pp exceptn$(OEXT) system$(PPUEXT) watcom$(PPUEXT) : $(WATCOM_DEPS)
$(COMPILER) -Sg dpmiexcp.pp $(COMPILER) $(WATCOM_OPT) $<
profile$(PPUEXT) : profile.pp dpmiexcp$(PPUEXT) watcom$(PPUEXT) WatcomApi.WatCom.pp$(PPUEXT) : $(NSOSINC)/WatcomApi.WatCom.pp $(WATCOM_DEPS)
dxeload$(PPUEXT) : dxeload.pp system$(PPUEXT) $(COMPILER) $(WATCOM_OPT) $<
emu387$(PPUEXT) : emu387.pp fpu$(OEXT) strings$(PPUEXT) dxeload$(PPUEXT) \
dpmiexcp$(PPUEXT)