diff --git a/rtl/macos/Makefile b/rtl/macos/Makefile index 6f28bb2351..66fd7ce849 100644 --- a/rtl/macos/Makefile +++ b/rtl/macos/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-05-30 rev 36373] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017/08/12] # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 @@ -351,262 +351,256 @@ endif OBJPASDIR=$(RTL)/objpas GRAPHDIR=$(INC)/graph ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i386-android) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i386-aros) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),x86_64-dragonfly) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),arm-android) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),arm-aros) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),mips-linux) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),mipsel-embedded) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),mipsel-android) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),jvm-java) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),jvm-android) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),wasm-wasm) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),sparc64-linux) -override TARGET_UNITS+=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils unixutil dos cmem charset cpall ctypes +override TARGET_UNITS+=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils unixutil dos extpas cmem charset cpall ctypes endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u @@ -683,9 +677,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u -endif ifeq ($(FULL_TARGET),m68k-netbsd) override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u endif @@ -695,9 +686,6 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u -endif ifeq ($(FULL_TARGET),m68k-palmos) override TARGET_IMPLICITUNITS+=cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u endif @@ -942,9 +930,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -954,9 +939,6 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) -endif ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) endif @@ -1200,9 +1182,6 @@ endif ifeq ($(FULL_TARGET),m68k-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),m68k-netbsd) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -1212,9 +1191,6 @@ endif ifeq ($(FULL_TARGET),m68k-atari) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) -endif ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) endif @@ -2600,8 +2576,6 @@ macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) math$(PPUEXT) $(COMPILER) $(INC)/macpas.pp $(REDIR) dos$(PPUEXT) : $(DOSDEPS) unixutil$(PPUEXT) system$(PPUEXT) $(COMPILER) dos $(REDIR) -objects$(PPUEXT) : $(INC)/objects.pp system$(PPUEXT) - $(COMPILER) $(INC)/objects.pp $(REDIR) getopts$(PPUEXT) : $(INC)/getopts.pp strings$(PPUEXT) system$(PPUEXT) $(COMPILER) $(INC)/getopts.pp $(REDIR) heaptrc$(PPUEXT) : $(INC)/heaptrc.pp system$(PPUEXT) @@ -2613,3 +2587,5 @@ cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT) $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas cmem$(PPUEXT) : $(INC)/cmem.pp system$(PPUEXT) ctypes$(PPUEXT) : $(INC)/ctypes.pp system$(PPUEXT) +math$(PPUEXT): $(OBJPASDIR)/math.pp objpas$(PPUEXT) sysutils$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) + $(COMPILER) $(OBJPASDIR)/math.pp diff --git a/rtl/macos/Makefile.fpc b/rtl/macos/Makefile.fpc index aa60c9d27e..f16e51af00 100644 --- a/rtl/macos/Makefile.fpc +++ b/rtl/macos/Makefile.fpc @@ -7,8 +7,9 @@ main=rtl [target] loaders= -units=system uuchar strings objpas macpas iso7185 extpas heaptrc getopts macostp macutils \ - unixutil dos cmem charset cpall ctypes +units=system uuchar strings objpas iso7185 heaptrc getopts macostp macutils \ + unixutil dos extpas cmem charset cpall ctypes +# macpas \ # exec \ # printer \ # lineinfo lnfodwrf graph \ @@ -142,9 +143,6 @@ dos$(PPUEXT) : $(DOSDEPS) unixutil$(PPUEXT) system$(PPUEXT) #printer$(PPUEXT) : printer.pp system$(PPUEXT) # $(COMPILER) printer $(REDIR) -objects$(PPUEXT) : $(INC)/objects.pp system$(PPUEXT) - $(COMPILER) $(INC)/objects.pp $(REDIR) - # # Other system-independent RTL Units # @@ -166,3 +164,6 @@ cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) charset$(PPUEXT) cmem$(PPUEXT) : $(INC)/cmem.pp system$(PPUEXT) ctypes$(PPUEXT) : $(INC)/ctypes.pp system$(PPUEXT) + +math$(PPUEXT): $(OBJPASDIR)/math.pp objpas$(PPUEXT) sysutils$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) + $(COMPILER) $(OBJPASDIR)/math.pp diff --git a/rtl/macos/dos.pp b/rtl/macos/dos.pp index 89c7ab34ef..e8f40acb99 100644 --- a/rtl/macos/dos.pp +++ b/rtl/macos/dos.pp @@ -294,9 +294,10 @@ Procedure Exec (Const Path: PathStr; Const ComLine: ComStr); var s: AnsiString; err: OSErr; - wdpath: AnsiString; + wdpath: RawByteString; Begin + wdpath:=''; {Make ToolServers working directory in sync with our working directory} PathArgToFullPath(':', wdpath); wdpath:= 'Directory ''' + wdpath + ''''; @@ -389,9 +390,6 @@ End; --- Findfirst FindNext --- ******************************************************************************} -(* - {The one defined in Unixutils.pp is used instead} - function FNMatch (const Pattern, Name: string): Boolean; var @@ -468,7 +466,6 @@ End; FNMatch := DoFNMatch(1, 1); end; -*) function GetFileAttrFromPB (var paramBlock: CInfoPBRec): Word; @@ -760,8 +757,8 @@ End; if pathTranslation then NewDir := TranslatePathToMac(Copy(DirList, 1, P1 - 1), false) - else - NewDir := Copy(DirList, 1, P1 - 1); + else + NewDir := Copy(DirList, 1, P1 - 1); NewDir := ConcatMacPath(NewDir, Path); @@ -787,8 +784,9 @@ End; function FExpand (const path: pathstr): pathstr; var - fullpath: AnsiString; + fullpath: RawByteString; begin + fullpath:=''; DosError:= PathArgToFullPath(path, fullpath); FExpand:= fullpath; end; @@ -879,7 +877,7 @@ End; if (attr and VolumeID) <> 0 then begin Doserror := 5; - Exit; + Exit; end; DosError := PathArgToFSSpec(StrPas(filerec(f).name), spec); diff --git a/rtl/macos/system.pp b/rtl/macos/system.pp index 72e0b2a43c..40a395ad27 100644 --- a/rtl/macos/system.pp +++ b/rtl/macos/system.pp @@ -16,6 +16,8 @@ unit System; interface +{$DEFINE FPC_ANSI_TEXTFILEREC} + { include system-independent routine headers } {$I systemh.inc}