|
@@ -369,7 +369,7 @@ endif
|
|
endif
|
|
endif
|
|
override PACKAGE_NAME=rtl
|
|
override PACKAGE_NAME=rtl
|
|
PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
|
|
PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
|
|
-ifdef FPC_DOTTEDRTL
|
|
|
|
|
|
+ifdef FPC_DOTTEDUNITS
|
|
AIOUNIT=NetWareApi.Aio
|
|
AIOUNIT=NetWareApi.Aio
|
|
ALLWINNER_A20UNIT=Embedded.Allwinner_a20
|
|
ALLWINNER_A20UNIT=Embedded.Allwinner_a20
|
|
ANDROIDR14UNIT=AndroidAPI.AndroidR14
|
|
ANDROIDR14UNIT=AndroidAPI.AndroidR14
|
|
@@ -377,7 +377,7 @@ ATHREADSUNIT=AmigaApi.AThreads
|
|
BASEUNIXUNIT=UnixApi.Base
|
|
BASEUNIXUNIT=UnixApi.Base
|
|
BETHREADSUNIT=BeosApi.Bethreads
|
|
BETHREADSUNIT=BeosApi.Bethreads
|
|
BLOCKRTLUNIT=CApi.BlockRtl
|
|
BLOCKRTLUNIT=CApi.BlockRtl
|
|
-BSDUNIT=BSDApi.BSD
|
|
|
|
|
|
+BSDUNIT=BsdApi
|
|
CHARACTERUNIT=System.Character
|
|
CHARACTERUNIT=System.Character
|
|
CHARSETUNIT=System.CharSet
|
|
CHARSETUNIT=System.CharSet
|
|
CLASSESUNIT=System.Classes
|
|
CLASSESUNIT=System.Classes
|
|
@@ -522,8 +522,8 @@ NWPREUNIT=NetWareApi.Nwpre
|
|
NWPROTUNIT=NetWareApi.Nwprot
|
|
NWPROTUNIT=NetWareApi.Nwprot
|
|
NWSERVUNIT=NetWareApi.Nwserv
|
|
NWSERVUNIT=NetWareApi.Nwserv
|
|
NWSNUTUNIT=NetWareApi.Nwsnut
|
|
NWSNUTUNIT=NetWareApi.Nwsnut
|
|
-OBJCUNIT=System.ObjC
|
|
|
|
-OBJCBASEUNIT=System.ObjCBase
|
|
|
|
|
|
+OBJCUNIT=objc
|
|
|
|
+OBJCBASEUNIT=objcbase
|
|
OS2DEFUNIT=OS2Api.Os2def
|
|
OS2DEFUNIT=OS2Api.Os2def
|
|
PAGEMEMUNIT=System.PageMem
|
|
PAGEMEMUNIT=System.PageMem
|
|
PILOTUNIT=PalmApi.Pilot
|
|
PILOTUNIT=PalmApi.Pilot
|
|
@@ -579,7 +579,7 @@ SYMBIANUNIT=SymbianApi.Symbian
|
|
SYSALLUNIT=PalmApi.Sysall
|
|
SYSALLUNIT=PalmApi.Sysall
|
|
SYSCALLUNIT=UnixApi.SysCall
|
|
SYSCALLUNIT=UnixApi.SysCall
|
|
SYSCONSTUNIT=System.SysConst
|
|
SYSCONSTUNIT=System.SysConst
|
|
-SYSCTLUNIT=BSDApi.Sysctl
|
|
|
|
|
|
+SYSCTLUNIT=BsdApi.SysCtl
|
|
SYSEMXUNIT=DOSApi.Sysemx
|
|
SYSEMXUNIT=DOSApi.Sysemx
|
|
SYSOS2UNIT=OS2Api.Sysos2
|
|
SYSOS2UNIT=OS2Api.Sysos2
|
|
SYSTRAPSUNIT=PalmApi.Systraps
|
|
SYSTRAPSUNIT=PalmApi.Systraps
|
|
@@ -854,7 +854,7 @@ WINTYPESUNIT=wintypes
|
|
X86UNIT=x86
|
|
X86UNIT=x86
|
|
XMC4500UNIT=xmc4500
|
|
XMC4500UNIT=xmc4500
|
|
endif
|
|
endif
|
|
-ifdef FPC_DOTTEDRTL
|
|
|
|
|
|
+ifdef FPC_DOTTEDUNITS
|
|
NS_SYSTEM=System.
|
|
NS_SYSTEM=System.
|
|
NS_CPUNITS=System.CodePages.
|
|
NS_CPUNITS=System.CodePages.
|
|
NSDIR=$(RTL)/namespaced
|
|
NSDIR=$(RTL)/namespaced
|
|
@@ -879,6 +879,7 @@ EXEINFO_DEPS_OS=$(DLUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEX
|
|
SYSUTILS_DEPS_OS=$(LINUXUNIT)$(PPUEXT)
|
|
SYSUTILS_DEPS_OS=$(LINUXUNIT)$(PPUEXT)
|
|
UNITPREFIX=rtl
|
|
UNITPREFIX=rtl
|
|
NSOSDIR=$(NSDIR)/linux
|
|
NSOSDIR=$(NSDIR)/linux
|
|
|
|
+UNIX_DEPS_OS=$(SYSCALLS)$(PPU)
|
|
CPU_UNITS=
|
|
CPU_UNITS=
|
|
SYSINIT_UNITS=
|
|
SYSINIT_UNITS=
|
|
LOADERS=prt0 dllprt0 cprt0 gprt0
|
|
LOADERS=prt0 dllprt0 cprt0 gprt0
|
|
@@ -2779,6 +2780,13 @@ endif
|
|
ifndef NSCLASSESDIR
|
|
ifndef NSCLASSESDIR
|
|
NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR)
|
|
NSCLASSESDIR=$(NSDIR)/$(CLASSESDIR)
|
|
endif
|
|
endif
|
|
|
|
+ifndef NSBSDDIR
|
|
|
|
+NSBSDDIR=$(NSDIR)/bsd
|
|
|
|
+endif
|
|
|
|
+ifdef FPC_DOTTEDUNITS
|
|
|
|
+MACPAS_OPT:=$(MACPAS_OPT) -dFPC_DOTTEDUNITS
|
|
|
|
+EXTPAS_OPT:=$(EXTPAS_OPT) -dFPC_DOTTEDUNITS
|
|
|
|
+endif
|
|
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS)
|
|
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS)
|
|
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $<
|
|
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $<
|
|
UUCHAR_DEPS=$(INC)/uuchar.pp \
|
|
UUCHAR_DEPS=$(INC)/uuchar.pp \
|
|
@@ -2929,7 +2937,7 @@ SYSUTILS_DEPS=$(SYSUTILSDIR)/sysutils.pp $(wildcard $(OBJPASDIR)/$(SYSUTILSUNIT)
|
|
sysutils$(PPUEXT) : $(SYSUTILS_DEPS)
|
|
sysutils$(PPUEXT) : $(SYSUTILS_DEPS)
|
|
$(COMPILER) -Fi$(OBJPASDIR)/$(SYSUTILSUNIT) $<
|
|
$(COMPILER) -Fi$(OBJPASDIR)/$(SYSUTILSUNIT) $<
|
|
System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS)
|
|
System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS)
|
|
- $(COMPILER) -Fi$(OBJPASDIR)/sysutils $<
|
|
|
|
|
|
+ $(COMPILER) $(SYSUTILS_OPT) -Fi$(OBJPASDIR)/sysutils $<
|
|
CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/$(CLASSESUNIT)/*.inc) \
|
|
CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/$(CLASSESUNIT)/*.inc) \
|
|
$(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
|
|
$(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
|
|
$(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \
|
|
$(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \
|
|
@@ -2987,7 +2995,7 @@ RTLCONSTS_DEPS=$(OBJPASDIR)/rtlconsts.pp \
|
|
rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
|
|
rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
|
|
$(COMPILER) $(RTLCONSTS_OPT) $<
|
|
$(COMPILER) $(RTLCONSTS_OPT) $<
|
|
System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
|
|
System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
|
|
- $(COMPILER) $(RTLCONSTS_OPT) $<
|
|
|
|
|
|
+ $(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
|
|
ifneq ($(findstring $(ARCH),x86_64 i386),)
|
|
ifneq ($(findstring $(ARCH),x86_64 i386),)
|
|
CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
|
|
CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
|
|
endif
|
|
endif
|
|
@@ -3041,6 +3049,14 @@ lnfodwrf$(PPUEXT) : $(LNFODWRF_DEPS)
|
|
$(COMPILER) $(LNFODWRF_OPT) $<
|
|
$(COMPILER) $(LNFODWRF_OPT) $<
|
|
System.LineInfo.Dwarf$(PPUEXT) : $(NSINC)/System.LineInfo.Dwarf.pp $(LNFODWRF_DEPS)
|
|
System.LineInfo.Dwarf$(PPUEXT) : $(NSINC)/System.LineInfo.Dwarf.pp $(LNFODWRF_DEPS)
|
|
$(COMPILER) $(LNFODWRF_OPT) $<
|
|
$(COMPILER) $(LNFODWRF_OPT) $<
|
|
|
|
+LNFOGDB_DEPS=$(UNIXINC)/lnfogdb.pp \
|
|
|
|
+ $(SYSTEMUNIT)$(PPUEXT) $(STRINGSUNIT)$(PPUEXT) $(LINEINFOUNIT)$(PPUEXT) \
|
|
|
|
+ $(SYSUTILSUNIT)$(PPUEXT) $(EXEINFOUNIT)$(PPUEXT) \
|
|
|
|
+ $(LNFOGDB_DEPS_OS) $(LNFOGDB_DEPS_CPU)
|
|
|
|
+lnfogdb$(PPUEXT) : $(LNFOGDB_DEPS)
|
|
|
|
+ $(COMPILER) $(LNFOGDB_OPT) $<
|
|
|
|
+System.LineInfo.Gdb$(PPUEXT) : $(NSINC)/System.LineInfo.Gdb.pp $(LNFOGDB_DEPS)
|
|
|
|
+ $(COMPILER) $(LNFOGDB_OPT) $<
|
|
CHARSET_DEPS=$(INC)/charset.pp \
|
|
CHARSET_DEPS=$(INC)/charset.pp \
|
|
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
|
|
$(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
|
|
$(CHARSET_DEPS_OS) $(CHARSET_DEPS_CPU)
|
|
$(CHARSET_DEPS_OS) $(CHARSET_DEPS_CPU)
|
|
@@ -3092,7 +3108,7 @@ UnixApi.Base$(PPUEXT): $(NSINC)/UnixApi.Base.pp $(BASEUNIX_DEPS)
|
|
$(COMPILER) $(BASEUNIX_OPT) $<
|
|
$(COMPILER) $(BASEUNIX_OPT) $<
|
|
UNIX_DEPS=$(UNIXINC)/unix.pp \
|
|
UNIX_DEPS=$(UNIXINC)/unix.pp \
|
|
$(STRINGSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
|
|
$(STRINGSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
|
|
- $(SYSCALLUNIT)$(PPUEXT) $(UNIXUTILUNIT)$(PPUEXT) \
|
|
|
|
|
|
+ $(UNIXUTILUNIT)$(PPUEXT) \
|
|
$(INC)/textrec.inc $(INC)/filerec.inc $(UNIXINC)/timezone.inc \
|
|
$(INC)/textrec.inc $(INC)/filerec.inc $(UNIXINC)/timezone.inc \
|
|
$(OSDIR)/unxconst.inc $(OSDIR)/unxfunc.inc \
|
|
$(OSDIR)/unxconst.inc $(OSDIR)/unxfunc.inc \
|
|
$(UNIX_DEPS_OS) $(UNIX_DEPS_CPU)
|
|
$(UNIX_DEPS_OS) $(UNIX_DEPS_CPU)
|
|
@@ -3160,26 +3176,46 @@ ctypes$(PPUEXT) : $(CTYPES_DEPS)
|
|
System.CTypes$(PPUEXT) : $(NSINC)/System.CTypes.pp $(CTYPES_DEPS)
|
|
System.CTypes$(PPUEXT) : $(NSINC)/System.CTypes.pp $(CTYPES_DEPS)
|
|
$(COMPILER) $(CTYPES_OPT) $<
|
|
$(COMPILER) $(CTYPES_OPT) $<
|
|
OBJC_DEPS=$(INC)/objc.pp $(INC)/objc.pp $(INC)/objc1.inc $(INC)/objcnf.inc \
|
|
OBJC_DEPS=$(INC)/objc.pp $(INC)/objc.pp $(INC)/objc1.inc $(INC)/objcnf.inc \
|
|
- $(SYSTEMUNIT)$(PPUEXT) ctypes$(PPUEXT) unixtype$(PPUEXT) \
|
|
|
|
|
|
+ $(SYSTEMUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) \
|
|
$(OBJC_DEPS_OS) $(OBJC_DEPS_CPU)
|
|
$(OBJC_DEPS_OS) $(OBJC_DEPS_CPU)
|
|
objc$(PPUEXT) : $(OBJC_DEPS)
|
|
objc$(PPUEXT) : $(OBJC_DEPS)
|
|
$(COMPILER) $(OBJC_OPT) $<
|
|
$(COMPILER) $(OBJC_OPT) $<
|
|
-System.ObjC$(PPUEXT) : $(NSINC)/System.ObjC.pp $(OBJC_DEPS)
|
|
|
|
- $(COMPILER) $(OBJC_OPT) $<
|
|
|
|
OBJCBASE_DEPS=$(INC)/objcbase.pp \
|
|
OBJCBASE_DEPS=$(INC)/objcbase.pp \
|
|
$(SYSTEMUNIT)$(PPUEXT) $(OBJCUNIT)$(PPUEXT) \
|
|
$(SYSTEMUNIT)$(PPUEXT) $(OBJCUNIT)$(PPUEXT) \
|
|
$(OBJCBASE_DEPS_OS) $(OBJCBASE_DEPS_CPU)
|
|
$(OBJCBASE_DEPS_OS) $(OBJCBASE_DEPS_CPU)
|
|
objcbase$(PPUEXT) : $(OBJCBASE_DEPS)
|
|
objcbase$(PPUEXT) : $(OBJCBASE_DEPS)
|
|
$(COMPILER) $(OBJCBASE_OPT) $<
|
|
$(COMPILER) $(OBJCBASE_OPT) $<
|
|
-System.ObjCBase$(PPUEXT) : $(NSINC)/System.ObjCBase.pp $(OBJCBASE_DEPS)
|
|
|
|
- $(COMPILER) $(OBJCBASE_OPT) $<
|
|
|
|
BLOCKRTL_DEPS=$(INC)/blockrtl.pp \
|
|
BLOCKRTL_DEPS=$(INC)/blockrtl.pp \
|
|
- $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) initc$(PPUEXT) ctypes$(PPUEXT) \
|
|
|
|
|
|
+ $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(INITCUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
|
|
$(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU)
|
|
$(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU)
|
|
blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS)
|
|
blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS)
|
|
$(COMPILER) $(BLOCKRTL_OPT) $<
|
|
$(COMPILER) $(BLOCKRTL_OPT) $<
|
|
-System.BlockRtl$(PPUEXT) : $(NSINC)/System.BlockRtl.pp $(BLOCKRTL_DEPS)
|
|
|
|
|
|
+CApi.BlockRtl$(PPUEXT) : $(NSINC)/CApi.BlockRtl.pp $(BLOCKRTL_DEPS)
|
|
$(COMPILER) $(BLOCKRTL_OPT) $<
|
|
$(COMPILER) $(BLOCKRTL_OPT) $<
|
|
|
|
+WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \
|
|
|
|
+ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU)
|
|
|
|
+windows$(PPUEXT): $(WINDOWS_DEPS)
|
|
|
|
+ $(COMPILER) $(WINDOWS_OPT) $<
|
|
|
|
+WinApi.Windows$(PPUEXT): $(NSOSDIR)/WinApi.Windows.pp $(WINDOWS_DEPS)
|
|
|
|
+ $(COMPILER) -Fi$(WININC) -Fi$(WINDIR) $(WINDOWS_OPT) $<
|
|
|
|
+WINDIRS_DEPS=windirs.pp $(WINDOWSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
|
|
|
|
+ $(WINDIRS_DEPS_OS) $(WINDIRS_DEPS_CPU)
|
|
|
|
+windirs$(PPUEXT): $(WINDIRS_DEPS)
|
|
|
|
+ $(COMPILER) $(WINDIRS_OPT) $<
|
|
|
|
+WinApi.WinDirs$(PPUEXT): $(NSOSDIR)/WinApi.WinDirs.pp $(WINDIRS_DEPS)
|
|
|
|
+ $(COMPILER) -Fi$(WININC) -Fi$(WINDIR) $(WINDIRS_OPT) $<
|
|
|
|
+SYSCTL_DEPS=$(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) \
|
|
|
|
+ $(SYSCTL_DEPS_OS) $(SYSCTL_DEPS_CPU)
|
|
|
|
+sysctl$(PPUEXT) : $(SYSCTL_DEPS)
|
|
|
|
+ $(COMPILER) $(SYSCTL_OPT) $<
|
|
|
|
+BsdApi.SysCtl$(PPUEXT) : $(NSBSDDIR)/BsdApi.SysCtl.pp $(SYSCTL_DEPS)
|
|
|
|
+ $(COMPILER) $(BSD_OPT) $<
|
|
|
|
+BSD_DEPS=$(BSDINC)/bsd.pas $(INITCUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) \
|
|
|
|
+ $(BSD_DEPS_OS) $(BSD_DEPS_CPU)
|
|
|
|
+bsd$(PPUEXT): $(BSD_DEPS)
|
|
|
|
+ $(COMPILER) $(BSD_OPT) $<
|
|
|
|
+BsdApi$(PPUEXT): $(NSBSDDIR)/BsdApi.pp $(BSD_DEPS)
|
|
|
|
+ $(COMPILER) $(BSD_OPT) $<
|
|
include $(INC)/makefile.inc
|
|
include $(INC)/makefile.inc
|
|
SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
|
|
SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
|
|
include $(PROCINC)/makefile.cpu
|
|
include $(PROCINC)/makefile.cpu
|