From c66efeda3ab3e213493ad27b8cef231c7307a549 Mon Sep 17 00:00:00 2001 From: pascal Date: Fri, 17 Jul 2020 05:32:31 +0000 Subject: [PATCH] freetype: fixed name clash git-svn-id: trunk@63582 - --- .gitattributes | 4 +- components/freetype/Makefile | 639 ++++++++++++++---- components/freetype/Makefile.compiled | 2 +- components/freetype/Makefile.fpc | 14 +- components/freetype/fpmake.pp | 104 +-- components/freetype/freetype.pas | 24 - .../{freetype.lpk => freetypelaz.lpk} | 4 +- components/freetype/freetypelaz.pas | 23 + lcl/lclbase.lpk | 3 +- 9 files changed, 582 insertions(+), 235 deletions(-) delete mode 100644 components/freetype/freetype.pas rename components/freetype/{freetype.lpk => freetypelaz.lpk} (99%) create mode 100644 components/freetype/freetypelaz.pas diff --git a/.gitattributes b/.gitattributes index cb79c935a3..f5e7097054 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1873,8 +1873,8 @@ components/freetype/Makefile.compiled svneol=native#text/plain components/freetype/Makefile.fpc svneol=native#text/plain components/freetype/easylazfreetype.pas svneol=native#text/pascal components/freetype/fpmake.pp svneol=native#text/plain -components/freetype/freetype.lpk svneol=native#text/plain -components/freetype/freetype.pas svneol=native#text/plain +components/freetype/freetypelaz.lpk svneol=native#text/plain +components/freetype/freetypelaz.pas svneol=native#text/plain components/freetype/lazfreetype.pas svneol=native#text/pascal components/freetype/lazfreetypefontcollection.pas svneol=native#text/plain components/freetype/lazfreetypefpimagedrawer.pas svneol=native#text/pascal diff --git a/components/freetype/Makefile b/components/freetype/Makefile index 90ca74d7f1..379a21bfbe 100644 --- a/components/freetype/Makefile +++ b/components/freetype/Makefile @@ -2,7 +2,7 @@ # Don't edit, this file is generated by FPCMake Version 2.0.0 # default: all -MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-macos 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-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd 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 aarch64-android wasm-wasm sparc64-linux +MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris 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-macosclassic m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macosclassic 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-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros arm-freertos arm-ios powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android mips64el-linux jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-win64 aarch64-android aarch64-ios wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-linux xtensa-embedded xtensa-freertos z80-embedded z80-zxspectrum z80-msxdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari @@ -195,6 +195,24 @@ $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic endif override FPCOPT+=-Cp$(SUBARCH) endif +ifeq ($(FULL_TARGET),xtensa-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif +ifeq ($(FULL_TARGET),xtensa-freertos) +ifeq ($(SUBARCH),) +$(error When compiling for xtensa-freertos, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif +ifeq ($(FULL_TARGET),arm-freertos) +ifeq ($(SUBARCH),) +$(error When compiling for arm-freertos, a sub-architecture (e.g. SUBARCH=armv6m or SUBARCH=armv7em) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) @@ -268,8 +286,8 @@ endif ifndef CROSSBINDIR CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX)) endif -ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) -ifeq ($(OS_SOURCE),darwin) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),) +ifneq ($(findstring $(OS_SOURCE),darwin ios),) DARWIN2DARWIN=1 endif endif @@ -328,7 +346,7 @@ FPMAKE_SKIP_CONFIG=-n FPCFPMAKE=$(FPC) endif endif -override PACKAGE_NAME=freetype +override PACKAGE_NAME=freetypelaz override PACKAGE_VERSION=1.0 ifndef LCL_PLATFORM ifeq ($(OS_TARGET),win32) @@ -351,268 +369,310 @@ ifeq ($(OS_TARGET),darwin) DBG_OPTIONS=-gw endif ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i386-android) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i386-aros) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif -ifeq ($(FULL_TARGET),m68k-macos) -override TARGET_UNITS+=freetype.pas +ifeq ($(FULL_TARGET),m68k-macosclassic) +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=freetype.pas +ifeq ($(FULL_TARGET),powerpc-macosclassic) +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),x86_64-haiku) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),x86_64-android) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),x86_64-dragonfly) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),arm-netbsd) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=freetype.pas -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),arm-android) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),arm-aros) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas +endif +ifeq ($(FULL_TARGET),arm-freertos) +override TARGET_UNITS+=freetypelaz.pas +endif +ifeq ($(FULL_TARGET),arm-ios) +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),mips-linux) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),mipsel-embedded) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),mipsel-android) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas +endif +ifeq ($(FULL_TARGET),mips64el-linux) +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),jvm-java) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),jvm-android) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas +endif +ifeq ($(FULL_TARGET),aarch64-win64) +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),aarch64-android) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas +endif +ifeq ($(FULL_TARGET),aarch64-ios) +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),wasm-wasm) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),sparc64-linux) -override TARGET_UNITS+=freetype.pas +override TARGET_UNITS+=freetypelaz.pas +endif +ifeq ($(FULL_TARGET),riscv32-linux) +override TARGET_UNITS+=freetypelaz.pas +endif +ifeq ($(FULL_TARGET),riscv32-embedded) +override TARGET_UNITS+=freetypelaz.pas +endif +ifeq ($(FULL_TARGET),riscv64-linux) +override TARGET_UNITS+=freetypelaz.pas +endif +ifeq ($(FULL_TARGET),riscv64-embedded) +override TARGET_UNITS+=freetypelaz.pas +endif +ifeq ($(FULL_TARGET),xtensa-linux) +override TARGET_UNITS+=freetypelaz.pas +endif +ifeq ($(FULL_TARGET),xtensa-embedded) +override TARGET_UNITS+=freetypelaz.pas +endif +ifeq ($(FULL_TARGET),xtensa-freertos) +override TARGET_UNITS+=freetypelaz.pas +endif +ifeq ($(FULL_TARGET),z80-embedded) +override TARGET_UNITS+=freetypelaz.pas +endif +ifeq ($(FULL_TARGET),z80-zxspectrum) +override TARGET_UNITS+=freetypelaz.pas +endif +ifeq ($(FULL_TARGET),z80-msxdos) +override TARGET_UNITS+=freetypelaz.pas endif ifeq ($(FULL_TARGET),i386-linux) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) @@ -698,7 +758,7 @@ endif ifeq ($(FULL_TARGET),m68k-palmos) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif -ifeq ($(FULL_TARGET),m68k-macos) +ifeq ($(FULL_TARGET),m68k-macosclassic) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -713,7 +773,7 @@ endif ifeq ($(FULL_TARGET),powerpc-amiga) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif -ifeq ($(FULL_TARGET),powerpc-macos) +ifeq ($(FULL_TARGET),powerpc-macosclassic) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif ifeq ($(FULL_TARGET),powerpc-darwin) @@ -791,9 +851,6 @@ endif ifeq ($(FULL_TARGET),arm-palmos) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif -ifeq ($(FULL_TARGET),arm-darwin) -override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) -endif ifeq ($(FULL_TARGET),arm-wince) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif @@ -815,6 +872,12 @@ endif ifeq ($(FULL_TARGET),arm-aros) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif +ifeq ($(FULL_TARGET),arm-freertos) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif +ifeq ($(FULL_TARGET),arm-ios) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif ifeq ($(FULL_TARGET),powerpc64-linux) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif @@ -848,6 +911,9 @@ endif ifeq ($(FULL_TARGET),mipsel-android) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif +ifeq ($(FULL_TARGET),mips64el-linux) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif ifeq ($(FULL_TARGET),jvm-java) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif @@ -869,15 +935,51 @@ endif ifeq ($(FULL_TARGET),aarch64-darwin) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif +ifeq ($(FULL_TARGET),aarch64-win64) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif ifeq ($(FULL_TARGET),aarch64-android) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif +ifeq ($(FULL_TARGET),aarch64-ios) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif ifeq ($(FULL_TARGET),wasm-wasm) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif ifeq ($(FULL_TARGET),sparc64-linux) override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) endif +ifeq ($(FULL_TARGET),riscv32-linux) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif +ifeq ($(FULL_TARGET),riscv32-embedded) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif +ifeq ($(FULL_TARGET),riscv64-linux) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif +ifeq ($(FULL_TARGET),riscv64-embedded) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif +ifeq ($(FULL_TARGET),xtensa-linux) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif +ifeq ($(FULL_TARGET),xtensa-embedded) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif +ifeq ($(FULL_TARGET),xtensa-freertos) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif +ifeq ($(FULL_TARGET),z80-embedded) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif +ifeq ($(FULL_TARGET),z80-zxspectrum) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif +ifeq ($(FULL_TARGET),z80-msxdos) +override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.lfm) $(wildcard $(COMPILER_UNITTARGETDIR)/*.res) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) endif @@ -962,7 +1064,7 @@ endif ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) endif -ifeq ($(FULL_TARGET),m68k-macos) +ifeq ($(FULL_TARGET),m68k-macosclassic) override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -977,7 +1079,7 @@ endif ifeq ($(FULL_TARGET),powerpc-amiga) override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) endif -ifeq ($(FULL_TARGET),powerpc-macos) +ifeq ($(FULL_TARGET),powerpc-macosclassic) override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) endif ifeq ($(FULL_TARGET),powerpc-darwin) @@ -1055,9 +1157,6 @@ endif ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) endif @@ -1079,6 +1178,12 @@ endif ifeq ($(FULL_TARGET),arm-aros) override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) endif +ifeq ($(FULL_TARGET),arm-freertos) +override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) +endif +ifeq ($(FULL_TARGET),arm-ios) +override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) endif @@ -1112,6 +1217,9 @@ endif ifeq ($(FULL_TARGET),mipsel-android) override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) endif +ifeq ($(FULL_TARGET),mips64el-linux) +override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) +endif ifeq ($(FULL_TARGET),jvm-java) override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) endif @@ -1133,15 +1241,51 @@ endif ifeq ($(FULL_TARGET),aarch64-darwin) override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) endif +ifeq ($(FULL_TARGET),aarch64-win64) +override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) +endif ifeq ($(FULL_TARGET),aarch64-android) override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) endif +ifeq ($(FULL_TARGET),aarch64-ios) +override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) +endif ifeq ($(FULL_TARGET),wasm-wasm) override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) endif ifeq ($(FULL_TARGET),sparc64-linux) override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) endif +ifeq ($(FULL_TARGET),riscv32-linux) +override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) +endif +ifeq ($(FULL_TARGET),riscv32-embedded) +override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) +endif +ifeq ($(FULL_TARGET),riscv64-linux) +override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) +endif +ifeq ($(FULL_TARGET),riscv64-embedded) +override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) +endif +ifeq ($(FULL_TARGET),xtensa-linux) +override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) +endif +ifeq ($(FULL_TARGET),xtensa-embedded) +override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) +endif +ifeq ($(FULL_TARGET),xtensa-freertos) +override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) +endif +ifeq ($(FULL_TARGET),z80-embedded) +override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) +endif +ifeq ($(FULL_TARGET),z80-zxspectrum) +override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) +endif +ifeq ($(FULL_TARGET),z80-msxdos) +override COMPILER_OPTIONS+=-MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . endif @@ -1226,7 +1370,7 @@ endif ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . endif -ifeq ($(FULL_TARGET),m68k-macos) +ifeq ($(FULL_TARGET),m68k-macosclassic) override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1241,7 +1385,7 @@ endif ifeq ($(FULL_TARGET),powerpc-amiga) override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . endif -ifeq ($(FULL_TARGET),powerpc-macos) +ifeq ($(FULL_TARGET),powerpc-macosclassic) override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . endif ifeq ($(FULL_TARGET),powerpc-darwin) @@ -1319,9 +1463,6 @@ endif ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . endif @@ -1343,6 +1484,12 @@ endif ifeq ($(FULL_TARGET),arm-aros) override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . endif +ifeq ($(FULL_TARGET),arm-freertos) +override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . +endif +ifeq ($(FULL_TARGET),arm-ios) +override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . endif @@ -1376,6 +1523,9 @@ endif ifeq ($(FULL_TARGET),mipsel-android) override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . endif +ifeq ($(FULL_TARGET),mips64el-linux) +override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . +endif ifeq ($(FULL_TARGET),jvm-java) override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . endif @@ -1397,15 +1547,51 @@ endif ifeq ($(FULL_TARGET),aarch64-darwin) override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . endif +ifeq ($(FULL_TARGET),aarch64-win64) +override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . +endif ifeq ($(FULL_TARGET),aarch64-android) override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . endif +ifeq ($(FULL_TARGET),aarch64-ios) +override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . +endif ifeq ($(FULL_TARGET),wasm-wasm) override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . endif ifeq ($(FULL_TARGET),sparc64-linux) override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . endif +ifeq ($(FULL_TARGET),riscv32-linux) +override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . +endif +ifeq ($(FULL_TARGET),riscv32-embedded) +override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . +endif +ifeq ($(FULL_TARGET),riscv64-linux) +override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . +endif +ifeq ($(FULL_TARGET),riscv64-embedded) +override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . +endif +ifeq ($(FULL_TARGET),xtensa-linux) +override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . +endif +ifeq ($(FULL_TARGET),xtensa-embedded) +override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . +endif +ifeq ($(FULL_TARGET),xtensa-freertos) +override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . +endif +ifeq ($(FULL_TARGET),z80-embedded) +override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . +endif +ifeq ($(FULL_TARGET),z80-zxspectrum) +override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . +endif +ifeq ($(FULL_TARGET),z80-msxdos) +override COMPILER_UNITDIR+=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) . +endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) endif @@ -1490,7 +1676,7 @@ endif ifeq ($(FULL_TARGET),m68k-palmos) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) endif -ifeq ($(FULL_TARGET),m68k-macos) +ifeq ($(FULL_TARGET),m68k-macosclassic) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -1505,7 +1691,7 @@ endif ifeq ($(FULL_TARGET),powerpc-amiga) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) endif -ifeq ($(FULL_TARGET),powerpc-macos) +ifeq ($(FULL_TARGET),powerpc-macosclassic) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) endif ifeq ($(FULL_TARGET),powerpc-darwin) @@ -1583,9 +1769,6 @@ endif ifeq ($(FULL_TARGET),arm-palmos) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) -endif ifeq ($(FULL_TARGET),arm-wince) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) endif @@ -1607,6 +1790,12 @@ endif ifeq ($(FULL_TARGET),arm-aros) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) endif +ifeq ($(FULL_TARGET),arm-freertos) +override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) +endif +ifeq ($(FULL_TARGET),arm-ios) +override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) +endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) endif @@ -1640,6 +1829,9 @@ endif ifeq ($(FULL_TARGET),mipsel-android) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) endif +ifeq ($(FULL_TARGET),mips64el-linux) +override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) +endif ifeq ($(FULL_TARGET),jvm-java) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) endif @@ -1661,15 +1853,51 @@ endif ifeq ($(FULL_TARGET),aarch64-darwin) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) endif +ifeq ($(FULL_TARGET),aarch64-win64) +override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) +endif ifeq ($(FULL_TARGET),aarch64-android) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) endif +ifeq ($(FULL_TARGET),aarch64-ios) +override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) +endif ifeq ($(FULL_TARGET),wasm-wasm) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) endif ifeq ($(FULL_TARGET),sparc64-linux) override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) endif +ifeq ($(FULL_TARGET),riscv32-linux) +override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) +endif +ifeq ($(FULL_TARGET),riscv32-embedded) +override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) +endif +ifeq ($(FULL_TARGET),riscv64-linux) +override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) +endif +ifeq ($(FULL_TARGET),riscv64-embedded) +override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) +endif +ifeq ($(FULL_TARGET),xtensa-linux) +override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) +endif +ifeq ($(FULL_TARGET),xtensa-embedded) +override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) +endif +ifeq ($(FULL_TARGET),xtensa-freertos) +override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) +endif +ifeq ($(FULL_TARGET),z80-embedded) +override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) +endif +ifeq ($(FULL_TARGET),z80-zxspectrum) +override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) +endif +ifeq ($(FULL_TARGET),z80-msxdos) +override COMPILER_UNITTARGETDIR+=lib/$(CPU_TARGET)-$(OS_TARGET) +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1866,12 +2094,63 @@ endif else CROSSBINDIR= endif +ifeq ($(OS_SOURCE),linux) +ifndef GCCLIBDIR +ifeq ($(CPU_TARGET),i386) +ifneq ($(findstring x86_64,$(shell uname -a)),) +ifeq ($(BINUTILSPREFIX),) +GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +else +CROSSGCCOPT=-m32 +endif +endif +endif +ifeq ($(CPU_TARGET),powerpc64) +ifeq ($(BINUTILSPREFIX),) +GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`) +else +CROSSGCCOPT=-m64 +endif +endif +ifeq ($(CPU_TARGET),sparc) +ifneq ($(findstring sparc64,$(shell uname -a)),) +ifeq ($(BINUTILSPREFIX),) +GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +else +CROSSGCCOPT=-m32 +endif +endif +endif +endif +ifdef FPCFPMAKE +FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP) +ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET)) +FPCMAKEGCCLIBDIR:=$(GCCLIBDIR) +endif +endif +ifndef FPCMAKEGCCLIBDIR +FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`) +endif +ifndef GCCLIBDIR +CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(CROSSGCC),) +GCCLIBDIR:=$(shell dirname `$(CROSSGCC) $(CROSSGCCOPT) -print-libgcc-file-name`) +endif +endif +endif +ifdef inUnix +ifeq ($(OS_SOURCE),netbsd) +OTHERLIBDIR:=/usr/pkg/lib +endif +export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR +endif BATCHEXT=.bat LOADEREXT=.as EXEEXT=.exe PPLEXT=.ppl PPUEXT=.ppu OEXT=.o +LTOEXT=.bc ASMEXT=.s SMARTEXT=.sl STATICLIBEXT=.a @@ -2009,14 +2288,14 @@ STATICLIBPREFIX= SHORTSUFFIX=nwl IMPORTLIBPREFIX=imp endif -ifeq ($(OS_TARGET),macos) +ifeq ($(OS_TARGET),macosclassic) BATCHEXT= EXEEXT= DEBUGSYMEXT=.xcoff SHORTSUFFIX=mac IMPORTLIBPREFIX=imp endif -ifneq ($(findstring $(OS_TARGET),darwin iphonesim),) +ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),) BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 @@ -2066,6 +2345,11 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif +ifeq ($(OS_TARGET),msxdos) +STATICLIBPREFIX= +STATICLIBEXT=.a +SHORTSUFFIX=msd +endif ifeq ($(OS_TARGET),embedded) ifeq ($(CPU_TARGET),i8086) STATICLIBPREFIX= @@ -2073,6 +2357,9 @@ STATICLIBEXT=.a else EXEEXT=.bin endif +ifeq ($(CPU_TARGET),z80) +OEXT=.rel +endif SHORTSUFFIX=emb endif ifeq ($(OS_TARGET),win16) @@ -2081,6 +2368,9 @@ STATICLIBEXT=.a SHAREDLIBEXT=.dll SHORTSUFFIX=w16 endif +ifeq ($(OS_TARGET),zxspectrum) +OEXT=.rel +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2420,7 +2710,7 @@ endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),m68k-macos) +ifeq ($(FULL_TARGET),m68k-macosclassic) REQUIRE_PACKAGES_RTL=1 endif ifeq ($(FULL_TARGET),m68k-embedded) @@ -2435,7 +2725,7 @@ endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),powerpc-macos) +ifeq ($(FULL_TARGET),powerpc-macosclassic) REQUIRE_PACKAGES_RTL=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) @@ -2513,9 +2803,6 @@ endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 endif @@ -2537,6 +2824,12 @@ endif ifeq ($(FULL_TARGET),arm-aros) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),arm-freertos) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),arm-ios) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2570,6 +2863,9 @@ endif ifeq ($(FULL_TARGET),mipsel-android) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),mips64el-linux) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 endif @@ -2591,15 +2887,51 @@ endif ifeq ($(FULL_TARGET),aarch64-darwin) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),aarch64-win64) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),aarch64-android) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),aarch64-ios) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),wasm-wasm) REQUIRE_PACKAGES_RTL=1 endif ifeq ($(FULL_TARGET),sparc64-linux) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),riscv32-linux) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),riscv32-embedded) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),riscv64-linux) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),riscv64-embedded) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),xtensa-linux) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),xtensa-embedded) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),xtensa-freertos) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),z80-embedded) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),z80-zxspectrum) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),z80-msxdos) +REQUIRE_PACKAGES_RTL=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -2689,16 +3021,7 @@ override FPCOPT+=-gl override FPCOPTDEF+=DEBUG endif ifdef RELEASE -ifneq ($(findstring 2.0.,$(FPC_VERSION)),) -ifeq ($(CPU_TARGET),i386) -FPCCPUOPT:=-OG2p3 -endif -ifeq ($(CPU_TARGET),powerpc) -FPCCPUOPT:=-O1r -endif -else FPCCPUOPT:=-O2 -endif override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n override FPCOPTDEF+=RELEASE endif @@ -2760,6 +3083,17 @@ endif endif ifdef LINKSHARED endif +ifdef GCCLIBDIR +override FPCOPT+=-Fl$(GCCLIBDIR) +ifdef FPCMAKEGCCLIBDIR +override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR) +else +override FPCMAKEOPT+=-Fl$(GCCLIBDIR) +endif +endif +ifdef OTHERLIBDIR +override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR)) +endif ifdef OPT override FPCOPT+=$(OPT) endif @@ -2826,7 +3160,7 @@ fpc_debug: $(MAKE) all DEBUG=1 fpc_release: $(MAKE) all RELEASE=1 -.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res +.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .rc .res $(COMPILER_UNITTARGETDIR): $(MKDIRTREE) $(COMPILER_UNITTARGETDIR) $(COMPILER_TARGETDIR): @@ -2857,6 +3191,7 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) vpath %.inc $(COMPILER_INCLUDEDIR) vpath %$(OEXT) $(COMPILER_UNITTARGETDIR) +vpath %$(LTOEXT) $(COMPILER_UNITTARGETDIR) vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR) .PHONY: fpc_shared override INSTALLTARGET+=fpc_shared_install @@ -2877,7 +3212,7 @@ fpc_shared: ifdef HASSHAREDLIB $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1 ifneq ($(SHARED_BUILD),n) - $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR) + $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR) -P$(BINUTILSPREFIX) endif else @$(ECHO) Shared Libraries not supported @@ -2899,13 +3234,15 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPP endif ifdef INSTALLPPUFILES ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICLIBEXT)) -override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) else -override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) endif ifneq ($(UNITTARGETDIRPREFIX),) -override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) -override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) +override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES)) +override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES)) +override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILENAMES)) +override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILENAMES))) endif override INSTALL_CREATEPACKAGEFPC=1 endif @@ -3060,12 +3397,14 @@ ifdef CLEAN_UNITS override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS)) endif ifdef CLEANPPUFILES -override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) +override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)) $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) ifdef DEBUGSYMEXT override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPPUFILES)) endif -override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILES)) -override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILES))) +override CLEANPPUFILENAMES:=$(CLEANPPUFILES) +override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFILENAMES)) +override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES) +override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPULINKFILENAMES))) endif fpc_clean: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -3089,8 +3428,9 @@ endif ifdef LIB_NAME -$(DEL) $(LIB_NAME) $(LIB_FULLNAME) endif - -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE) - -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT) + -$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT) + -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res + -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES -$(DEL) $(CLEANEXEFILES) @@ -3111,13 +3451,14 @@ ifdef CLEAN_FILES endif -$(DELTREE) units -$(DELTREE) bin - -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) + -$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) ifneq ($(PPUEXT),.ppu) -$(DEL) *.o *.ppu *.a endif -$(DELTREE) *$(SMARTEXT) - -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE) - -$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT) + -$(DEL) fpcmade.* Package.fpc *.fpm + -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res + -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT) ifdef AOUTEXT -$(DEL) *$(AOUTEXT) endif @@ -3260,9 +3601,9 @@ include fpcmake.loc endif .PHONY: cleartarget compiled all cleartarget: - -$(DEL) $(COMPILER_UNITTARGETDIR)/freetype$(PPUEXT) + -$(DEL) $(COMPILER_UNITTARGETDIR)/freetypelaz$(PPUEXT) compiled: - $(CPPROG) -f Makefile.compiled $(COMPILER_UNITTARGETDIR)/freetype.compiled -all: cleartarget $(COMPILER_UNITTARGETDIR) freetype$(PPUEXT) compiled + $(CPPROG) -f Makefile.compiled $(COMPILER_UNITTARGETDIR)/freetypelaz.compiled +all: cleartarget $(COMPILER_UNITTARGETDIR) freetypelaz$(PPUEXT) compiled distclean: clean ${DELTREE} lib/* diff --git a/components/freetype/Makefile.compiled b/components/freetype/Makefile.compiled index 4b1a719bf2..aec3675436 100644 --- a/components/freetype/Makefile.compiled +++ b/components/freetype/Makefile.compiled @@ -1,5 +1,5 @@ - + diff --git a/components/freetype/Makefile.fpc b/components/freetype/Makefile.fpc index 86fcdad58d..40ace3dce1 100644 --- a/components/freetype/Makefile.fpc +++ b/components/freetype/Makefile.fpc @@ -1,11 +1,11 @@ # File generated automatically by Lazarus Package Manager # -# Makefile.fpc for freetype 1.0 +# Makefile.fpc for freetypelaz 1.0 # -# This file was generated on 14.07.2020 +# This file was generated on 17.07.2020 [package] -name=freetype +name=freetypelaz version=1.0 [compiler] @@ -14,7 +14,7 @@ unitdir=../../packager/units/$(CPU_TARGET)-$(OS_TARGET) ../lazutils/lib/$(CPU_TA options= -MObjFPC -Scghi -O1 -g -gl -l -vewnhibq $(DBG_OPTIONS) [target] -units=freetype.pas +units=freetypelaz.pas [clean] files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \ @@ -53,12 +53,12 @@ endif .PHONY: cleartarget compiled all cleartarget: - -$(DEL) $(COMPILER_UNITTARGETDIR)/freetype$(PPUEXT) + -$(DEL) $(COMPILER_UNITTARGETDIR)/freetypelaz$(PPUEXT) compiled: - $(CPPROG) -f Makefile.compiled $(COMPILER_UNITTARGETDIR)/freetype.compiled + $(CPPROG) -f Makefile.compiled $(COMPILER_UNITTARGETDIR)/freetypelaz.compiled -all: cleartarget $(COMPILER_UNITTARGETDIR) freetype$(PPUEXT) compiled +all: cleartarget $(COMPILER_UNITTARGETDIR) freetypelaz$(PPUEXT) compiled distclean: clean ${DELTREE} lib/* diff --git a/components/freetype/fpmake.pp b/components/freetype/fpmake.pp index 0fa769968d..3bffd84491 100644 --- a/components/freetype/fpmake.pp +++ b/components/freetype/fpmake.pp @@ -1,9 +1,10 @@ { File generated automatically by Lazarus Package Manager + Created with the Fppkgpackagemanager package installed - fpmake.pp for freetype 1.0 + fpmake.pp for freetypelaz 1.0 - This file was generated on 14.07.2020 + This file was generated on 17.07.2020 } {$ifndef ALLPACKAGES} @@ -13,7 +14,7 @@ program fpmake; uses fpmkunit; {$endif ALLPACKAGES} -procedure add_freetype(const ADirectory: string); +procedure add_freetypelaz(const ADirectory: string); var P : TPackage; @@ -23,7 +24,7 @@ var begin with Installer do begin - P:=AddPackage('freetype'); + P:=AddPackage('freetypelaz'); P.Version:='1.0.0-0'; P.Directory:=ADirectory; @@ -43,59 +44,64 @@ begin P.Options.Add('-l'); P.Options.Add('-vewnhibq'); P.UnitPath.Add('.'); - T:=P.Targets.AddUnit('freetype.pas'); - t.Dependencies.AddUnit('easylazfreetype'); - t.Dependencies.AddUnit('lazfreetype'); - t.Dependencies.AddUnit('lazfreetypefontcollection'); - t.Dependencies.AddUnit('lazfreetypefpimagedrawer'); - t.Dependencies.AddUnit('ttcache'); - t.Dependencies.AddUnit('ttcalc'); - t.Dependencies.AddUnit('ttcmap'); - t.Dependencies.AddUnit('ttdebug'); - t.Dependencies.AddUnit('tterror'); - t.Dependencies.AddUnit('ttfile'); - t.Dependencies.AddUnit('ttgload'); - t.Dependencies.AddUnit('ttinterp'); - t.Dependencies.AddUnit('ttkern'); - t.Dependencies.AddUnit('ttload'); - t.Dependencies.AddUnit('ttmemory'); - t.Dependencies.AddUnit('ttobjs'); - t.Dependencies.AddUnit('ttprofile'); - t.Dependencies.AddUnit('ttraster'); - t.Dependencies.AddUnit('tttables'); - t.Dependencies.AddUnit('tttypes'); - - T:=P.Targets.AddUnit('easylazfreetype.pas'); - T:=P.Targets.AddUnit('lazfreetype.pas'); - T:=P.Targets.AddUnit('lazfreetypefontcollection.pas'); - T:=P.Targets.AddUnit('lazfreetypefpimagedrawer.pas'); - T:=P.Targets.AddUnit('ttcache.pas'); - T:=P.Targets.AddUnit('ttcalc.pas'); - T:=P.Targets.AddUnit('ttcmap.pas'); - T:=P.Targets.AddUnit('ttdebug.pas'); - T:=P.Targets.AddUnit('tterror.pas'); - T:=P.Targets.AddUnit('ttfile.pas'); - T:=P.Targets.AddUnit('ttgload.pas'); - T:=P.Targets.AddUnit('ttinterp.pas'); - T:=P.Targets.AddUnit('ttkern.pas'); - T:=P.Targets.AddUnit('ttload.pas'); - T:=P.Targets.AddUnit('ttmemory.pas'); - T:=P.Targets.AddUnit('ttobjs.pas'); - T:=P.Targets.AddUnit('ttprofile.pas'); - T:=P.Targets.AddUnit('ttraster.pas'); - T:=P.Targets.AddUnit('tttables.pas'); - T:=P.Targets.AddUnit('tttypes.pas'); + T:=P.Targets.AddUnit('freetypelaz.pas'); + D := T.Dependencies.AddUnit('EasyLazFreeType'); + D := T.Dependencies.AddUnit('LazFreeType'); + D := T.Dependencies.AddUnit('LazFreeTypeFontCollection'); + D := T.Dependencies.AddUnit('LazFreeTypeFPImageDrawer'); + D := T.Dependencies.AddUnit('TTCache'); + D := T.Dependencies.AddUnit('TTCalc'); + D := T.Dependencies.AddInclude('ttcalc1.inc'); + D := T.Dependencies.AddInclude('ttcalc2.inc'); + D := T.Dependencies.AddInclude('ttcalc3.inc'); + D := T.Dependencies.AddInclude('ttcalc4.inc'); + D := T.Dependencies.AddUnit('TTCMap'); + D := T.Dependencies.AddInclude('ttconfig.inc'); + D := T.Dependencies.AddUnit('TTDebug'); + D := T.Dependencies.AddUnit('TTError'); + D := T.Dependencies.AddUnit('TTFile'); + D := T.Dependencies.AddUnit('TTGLoad'); + D := T.Dependencies.AddUnit('TTInterp'); + D := T.Dependencies.AddUnit('TTKern'); + D := T.Dependencies.AddUnit('TTLoad'); + D := T.Dependencies.AddUnit('TTMemory'); + D := T.Dependencies.AddUnit('TTObjs'); + D := T.Dependencies.AddUnit('TTProfile'); + D := T.Dependencies.AddUnit('TTRASTER'); + D := T.Dependencies.AddInclude('ttraster_sweep.inc'); + D := T.Dependencies.AddUnit('TTTables'); + D := T.Dependencies.AddUnit('TTTypes'); + T := P.Targets.AddImplicitUnit('easylazfreetype.pas'); + T := P.Targets.AddImplicitUnit('lazfreetype.pas'); + T := P.Targets.AddImplicitUnit('lazfreetypefontcollection.pas'); + T := P.Targets.AddImplicitUnit('lazfreetypefpimagedrawer.pas'); + T := P.Targets.AddImplicitUnit('ttcache.pas'); + T := P.Targets.AddImplicitUnit('ttcalc.pas'); + T := P.Targets.AddImplicitUnit('ttcmap.pas'); + T := P.Targets.AddImplicitUnit('ttdebug.pas'); + T := P.Targets.AddImplicitUnit('tterror.pas'); + T := P.Targets.AddImplicitUnit('ttfile.pas'); + T := P.Targets.AddImplicitUnit('ttgload.pas'); + T := P.Targets.AddImplicitUnit('ttinterp.pas'); + T := P.Targets.AddImplicitUnit('ttkern.pas'); + T := P.Targets.AddImplicitUnit('ttload.pas'); + T := P.Targets.AddImplicitUnit('ttmemory.pas'); + T := P.Targets.AddImplicitUnit('ttobjs.pas'); + T := P.Targets.AddImplicitUnit('ttprofile.pas'); + T := P.Targets.AddImplicitUnit('ttraster.pas'); + T := P.Targets.AddImplicitUnit('tttables.pas'); + T := P.Targets.AddImplicitUnit('tttypes.pas'); // copy the compiled file, so the IDE knows how the package was compiled - P.Sources.AddSrc('freetype.compiled'); - P.InstallFiles.Add('freetype.compiled',AllOSes,'$(unitinstalldir)'); + P.Sources.AddSrc('freetypelaz.compiled'); + P.InstallFiles.Add('freetypelaz.compiled',AllOSes,'$(unitinstalldir)'); end; end; {$ifndef ALLPACKAGES} begin - add_freetype(''); + add_freetypelaz(''); Installer.Run; end. {$endif ALLPACKAGES} diff --git a/components/freetype/freetype.pas b/components/freetype/freetype.pas deleted file mode 100644 index cebf7a4d7a..0000000000 --- a/components/freetype/freetype.pas +++ /dev/null @@ -1,24 +0,0 @@ -{ This file was automatically created by Lazarus. Do not edit! - This source is only used to compile and install the package. - } - -unit freetype; - -{$warn 5023 off : no warning about unused units} -interface - -uses - EasyLazFreeType, LazFreeType, LazFreeTypeFontCollection, - LazFreeTypeFPImageDrawer, TTCache, TTCalc, TTCMap, TTDebug, TTError, TTFile, - TTGLoad, TTInterp, TTKern, TTLoad, TTMemory, TTObjs, TTProfile, TTRASTER, - TTTables, TTTypes, LazarusPackageIntf; - -implementation - -procedure Register; -begin -end; - -initialization - RegisterPackage('freetype', @Register); -end. diff --git a/components/freetype/freetype.lpk b/components/freetype/freetypelaz.lpk similarity index 99% rename from components/freetype/freetype.lpk rename to components/freetype/freetypelaz.lpk index 7c4f86abe1..5bd355f495 100644 --- a/components/freetype/freetype.lpk +++ b/components/freetype/freetypelaz.lpk @@ -1,13 +1,13 @@ - + - + diff --git a/components/freetype/freetypelaz.pas b/components/freetype/freetypelaz.pas new file mode 100644 index 0000000000..06ad37fdec --- /dev/null +++ b/components/freetype/freetypelaz.pas @@ -0,0 +1,23 @@ +{ This file was automatically created by Lazarus. Do not edit! + This source is only used to compile and install the package. + } + +unit freetypelaz; + +{$warn 5023 off : no warning about unused units} +interface + +uses + EasyLazFreeType, LazFreeType, LazFreeTypeFontCollection, LazFreeTypeFPImageDrawer, TTCache, TTCalc, TTCMap, TTDebug, + TTError, TTFile, TTGLoad, TTInterp, TTKern, TTLoad, TTMemory, TTObjs, TTProfile, TTRASTER, TTTables, TTTypes, + LazarusPackageIntf; + +implementation + +procedure Register; +begin +end; + +initialization + RegisterPackage('freetypelaz', @Register); +end. diff --git a/lcl/lclbase.lpk b/lcl/lclbase.lpk index f25ab45305..bcb8b1b723 100644 --- a/lcl/lclbase.lpk +++ b/lcl/lclbase.lpk @@ -1189,7 +1189,8 @@ - + +