mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-06 10:07:54 +02:00
* rtl/macos/dos.pp: Remove unused unixutil in _USES clause of rtl/macos/dos.pp source.
* rtl/macos/Makefile.fpc: Update dependency list DOS_DEPS: remove unixutil and add missing macostp. * rtl/macos/Makefile: Regenerate.
This commit is contained in:
parent
19fe377455
commit
2c622e2fe6
@ -892,7 +892,7 @@ DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
|
|||||||
DYNLIBSINCDIR=$(UNIXINC)
|
DYNLIBSINCDIR=$(UNIXINC)
|
||||||
UNITPREFIX=rtl
|
UNITPREFIX=rtl
|
||||||
OBJPASDIR=$(RTL)/objpas
|
OBJPASDIR=$(RTL)/objpas
|
||||||
DOS_DEPS_OS=$(UNIXUTILUNIT)$(PPUEXT) $(MACUTILSUNIT)$(PPUEXT)
|
DOS_DEPS_OS=$(MACOSTPUNIT)$(PPUEXT) $(MACUTILSUNIT)$(PPUEXT)
|
||||||
SYSUTILS_DEPS_OS=$(DOSUNIT)$(PPUEXT)
|
SYSUTILS_DEPS_OS=$(DOSUNIT)$(PPUEXT)
|
||||||
ifeq ($(CPU_OS_TARGET),m68k-macosclassic)
|
ifeq ($(CPU_OS_TARGET),m68k-macosclassic)
|
||||||
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(STRINGSUNIT) $(MACPASUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(MACOSTPUNIT) $(MACUTILSUNIT) $(EXTPASUNIT) $(HEAPTRCUNIT) $(GETOPTSUNIT) $(UNIXUTILUNIT) $(DOSUNIT) $(CMEMUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CTYPESUNIT) $(SYSCONSTUNIT) $(SORTBASEUNIT) $(SYSUTILSUNIT) $(CLASSESUNIT) $(TYPINFOUNIT) $(FGLUNIT) $(TYPESUNIT) $(MATHUNIT) $(UFLOAT128UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(SFPUX80UNIT) $(SOFTFPUUNIT)
|
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(STRINGSUNIT) $(MACPASUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(MACOSTPUNIT) $(MACUTILSUNIT) $(EXTPASUNIT) $(HEAPTRCUNIT) $(GETOPTSUNIT) $(UNIXUTILUNIT) $(DOSUNIT) $(CMEMUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CTYPESUNIT) $(SYSCONSTUNIT) $(SORTBASEUNIT) $(SYSUTILSUNIT) $(CLASSESUNIT) $(TYPINFOUNIT) $(FGLUNIT) $(TYPESUNIT) $(MATHUNIT) $(UFLOAT128UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(SFPUX80UNIT) $(SOFTFPUUNIT)
|
||||||
|
@ -47,7 +47,7 @@ UNITPREFIX=rtl
|
|||||||
|
|
||||||
# Paths
|
# Paths
|
||||||
OBJPASDIR=$(RTL)/objpas
|
OBJPASDIR=$(RTL)/objpas
|
||||||
DOS_DEPS_OS=$(UNIXUTILUNIT)$(PPUEXT) $(MACUTILSUNIT)$(PPUEXT)
|
DOS_DEPS_OS=$(MACOSTPUNIT)$(PPUEXT) $(MACUTILSUNIT)$(PPUEXT)
|
||||||
SYSUTILS_DEPS_OS=$(DOSUNIT)$(PPUEXT)
|
SYSUTILS_DEPS_OS=$(DOSUNIT)$(PPUEXT)
|
||||||
|
|
||||||
[rules]
|
[rules]
|
||||||
|
@ -69,12 +69,10 @@ Implementation
|
|||||||
|
|
||||||
{$IFDEF FPC_DOTTEDUNITS}
|
{$IFDEF FPC_DOTTEDUNITS}
|
||||||
Uses
|
Uses
|
||||||
MacOSApi.MacUtils,
|
MacOSApi.MacUtils;
|
||||||
UnixApi.Utils {for FNMatch};
|
|
||||||
{$ELSE FPC_DOTTEDUNITS}
|
{$ELSE FPC_DOTTEDUNITS}
|
||||||
Uses
|
Uses
|
||||||
macutils,
|
macutils;
|
||||||
unixutil {for FNMatch};
|
|
||||||
{$ENDIF FPC_DOTTEDUNITS}
|
{$ENDIF FPC_DOTTEDUNITS}
|
||||||
|
|
||||||
{$UNDEF USE_FEXPAND_INC}
|
{$UNDEF USE_FEXPAND_INC}
|
||||||
|
Loading…
Reference in New Issue
Block a user