From aed3f2787090dfa4a8c7a3cbc187df01240a8eda Mon Sep 17 00:00:00 2001 From: zeljan1 Date: Fri, 11 Nov 2022 16:10:57 +0100 Subject: [PATCH] Qt5: added to the lcl.lpk, regenerated Makefiles --- lcl/interfaces/Makefile | 402 ++++++++++++++++++++++++------------ lcl/interfaces/Makefile.fpc | 2 +- lcl/interfaces/lcl.lpk | 175 +++++++++++++++- 3 files changed, 449 insertions(+), 130 deletions(-) diff --git a/lcl/interfaces/Makefile b/lcl/interfaces/Makefile index c887c0afaf..8225044326 100644 --- a/lcl/interfaces/Makefile +++ b/lcl/interfaces/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-ios 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 aarch64-ios wasm-wasm sparc64-linux BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari @@ -268,8 +268,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 @@ -352,268 +352,271 @@ endif export LCL_PLATFORM override DEFAULT_DIR=$(LCL_PLATFORM) ifeq ($(FULL_TARGET),i386-linux) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),i386-win32) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),i386-os2) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),i386-beos) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),i386-netware) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),i386-emx) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),i386-wince) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),i386-android) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),i386-aros) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif -ifeq ($(FULL_TARGET),m68k-macos) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +ifeq ($(FULL_TARGET),m68k-macosclassic) +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +ifeq ($(FULL_TARGET),powerpc-macosclassic) +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),x86_64-haiku) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),x86_64-android) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),x86_64-dragonfly) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),arm-linux) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),arm-netbsd) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),arm-wince) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),arm-gba) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),arm-nds) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),arm-android) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),arm-aros) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui +endif +ifeq ($(FULL_TARGET),arm-ios) +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),mips-linux) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),mipsel-embedded) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),mipsel-android) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),jvm-java) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),jvm-android) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),aarch64-android) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui +endif +ifeq ($(FULL_TARGET),aarch64-ios) +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),wasm-wasm) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifeq ($(FULL_TARGET),sparc64-linux) -override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +override TARGET_DIRS+=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -954,14 +957,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 @@ -1364,7 +1367,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) @@ -1379,7 +1382,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) @@ -1457,9 +1460,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 @@ -1481,6 +1481,9 @@ endif ifeq ($(FULL_TARGET),arm-aros) 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 @@ -1538,6 +1541,9 @@ 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 @@ -1633,16 +1639,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 @@ -2019,6 +2016,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2034,6 +2032,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2049,6 +2048,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2064,6 +2064,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2079,6 +2080,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2094,6 +2096,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2109,6 +2112,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2124,6 +2128,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2139,6 +2144,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2154,6 +2160,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2169,6 +2176,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2184,6 +2192,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2199,6 +2208,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2214,6 +2224,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2229,6 +2240,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2244,6 +2256,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2259,6 +2272,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2274,6 +2288,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2289,6 +2304,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2304,6 +2320,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2319,6 +2336,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2334,6 +2352,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2349,6 +2368,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2364,6 +2384,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2379,6 +2400,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2394,6 +2416,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2409,6 +2432,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2424,6 +2448,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2431,7 +2456,7 @@ TARGET_DIRS_COCOA=1 TARGET_DIRS_CUSTOMDRAWN=1 TARGET_DIRS_MUI=1 endif -ifeq ($(FULL_TARGET),m68k-macos) +ifeq ($(FULL_TARGET),m68k-macosclassic) TARGET_DIRS_GTK=1 TARGET_DIRS_GTK2=1 TARGET_DIRS_GTK3=1 @@ -2439,6 +2464,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2454,6 +2480,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2469,6 +2496,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2484,6 +2512,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2499,6 +2528,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2506,7 +2536,7 @@ TARGET_DIRS_COCOA=1 TARGET_DIRS_CUSTOMDRAWN=1 TARGET_DIRS_MUI=1 endif -ifeq ($(FULL_TARGET),powerpc-macos) +ifeq ($(FULL_TARGET),powerpc-macosclassic) TARGET_DIRS_GTK=1 TARGET_DIRS_GTK2=1 TARGET_DIRS_GTK3=1 @@ -2514,6 +2544,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2529,6 +2560,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2544,6 +2576,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2559,6 +2592,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2574,6 +2608,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2589,6 +2624,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2604,6 +2640,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2619,6 +2656,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2634,6 +2672,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2649,6 +2688,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2664,6 +2704,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2679,6 +2720,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2694,6 +2736,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2709,6 +2752,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2724,6 +2768,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2739,6 +2784,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2754,6 +2800,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2769,6 +2816,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2784,6 +2832,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2799,6 +2848,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2814,6 +2864,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2829,6 +2880,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2844,6 +2896,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2859,6 +2912,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2874,6 +2928,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2889,21 +2944,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 -TARGET_DIRS_CARBON=1 -TARGET_DIRS_FPGUI=1 -TARGET_DIRS_NOGUI=1 -TARGET_DIRS_COCOA=1 -TARGET_DIRS_CUSTOMDRAWN=1 -TARGET_DIRS_MUI=1 -endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_DIRS_GTK=1 -TARGET_DIRS_GTK2=1 -TARGET_DIRS_GTK3=1 -TARGET_DIRS_WIN32=1 -TARGET_DIRS_WINCE=1 -TARGET_DIRS_QT=1 -TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2919,6 +2960,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2934,6 +2976,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2949,6 +2992,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2964,6 +3008,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2979,6 +3024,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -2994,6 +3040,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -3009,6 +3056,23 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 +TARGET_DIRS_CARBON=1 +TARGET_DIRS_FPGUI=1 +TARGET_DIRS_NOGUI=1 +TARGET_DIRS_COCOA=1 +TARGET_DIRS_CUSTOMDRAWN=1 +TARGET_DIRS_MUI=1 +endif +ifeq ($(FULL_TARGET),arm-ios) +TARGET_DIRS_GTK=1 +TARGET_DIRS_GTK2=1 +TARGET_DIRS_GTK3=1 +TARGET_DIRS_WIN32=1 +TARGET_DIRS_WINCE=1 +TARGET_DIRS_QT=1 +TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -3024,6 +3088,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -3039,6 +3104,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -3054,6 +3120,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -3069,6 +3136,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -3084,6 +3152,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -3099,6 +3168,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -3114,6 +3184,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -3129,6 +3200,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -3144,6 +3216,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -3159,6 +3232,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -3174,6 +3248,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -3189,6 +3264,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -3204,6 +3280,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -3219,6 +3296,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -3234,6 +3312,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -3249,6 +3328,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -3264,6 +3344,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -3279,6 +3360,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -3294,6 +3376,23 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 +TARGET_DIRS_CARBON=1 +TARGET_DIRS_FPGUI=1 +TARGET_DIRS_NOGUI=1 +TARGET_DIRS_COCOA=1 +TARGET_DIRS_CUSTOMDRAWN=1 +TARGET_DIRS_MUI=1 +endif +ifeq ($(FULL_TARGET),aarch64-ios) +TARGET_DIRS_GTK=1 +TARGET_DIRS_GTK2=1 +TARGET_DIRS_GTK3=1 +TARGET_DIRS_WIN32=1 +TARGET_DIRS_WINCE=1 +TARGET_DIRS_QT=1 +TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -3309,6 +3408,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -3324,6 +3424,7 @@ TARGET_DIRS_WIN32=1 TARGET_DIRS_WINCE=1 TARGET_DIRS_QT=1 TARGET_DIRS_QT5=1 +TARGET_DIRS_QT6=1 TARGET_DIRS_CARBON=1 TARGET_DIRS_FPGUI=1 TARGET_DIRS_NOGUI=1 @@ -3646,6 +3747,51 @@ qt5: $(MAKE) -C qt5 all .PHONY: qt5_all qt5_debug qt5_smart qt5_release qt5_units qt5_examples qt5_shared qt5_install qt5_sourceinstall qt5_exampleinstall qt5_distinstall qt5_zipinstall qt5_zipsourceinstall qt5_zipexampleinstall qt5_zipdistinstall qt5_clean qt5_distclean qt5_cleanall qt5_info qt5_makefiles qt5 endif +ifdef TARGET_DIRS_QT6 +qt6_all: + $(MAKE) -C qt6 all +qt6_debug: + $(MAKE) -C qt6 debug +qt6_smart: + $(MAKE) -C qt6 smart +qt6_release: + $(MAKE) -C qt6 release +qt6_units: + $(MAKE) -C qt6 units +qt6_examples: + $(MAKE) -C qt6 examples +qt6_shared: + $(MAKE) -C qt6 shared +qt6_install: + $(MAKE) -C qt6 install +qt6_sourceinstall: + $(MAKE) -C qt6 sourceinstall +qt6_exampleinstall: + $(MAKE) -C qt6 exampleinstall +qt6_distinstall: + $(MAKE) -C qt6 distinstall +qt6_zipinstall: + $(MAKE) -C qt6 zipinstall +qt6_zipsourceinstall: + $(MAKE) -C qt6 zipsourceinstall +qt6_zipexampleinstall: + $(MAKE) -C qt6 zipexampleinstall +qt6_zipdistinstall: + $(MAKE) -C qt6 zipdistinstall +qt6_clean: + $(MAKE) -C qt6 clean +qt6_distclean: + $(MAKE) -C qt6 distclean +qt6_cleanall: + $(MAKE) -C qt6 cleanall +qt6_info: + $(MAKE) -C qt6 info +qt6_makefiles: + $(MAKE) -C qt6 makefiles +qt6: + $(MAKE) -C qt6 all +.PHONY: qt6_all qt6_debug qt6_smart qt6_release qt6_units qt6_examples qt6_shared qt6_install qt6_sourceinstall qt6_exampleinstall qt6_distinstall qt6_zipinstall qt6_zipsourceinstall qt6_zipexampleinstall qt6_zipdistinstall qt6_clean qt6_distclean qt6_cleanall qt6_info qt6_makefiles qt6 +endif ifdef TARGET_DIRS_CARBON carbon_all: $(MAKE) -C carbon all diff --git a/lcl/interfaces/Makefile.fpc b/lcl/interfaces/Makefile.fpc index b5bb813b87..09d63ae1da 100644 --- a/lcl/interfaces/Makefile.fpc +++ b/lcl/interfaces/Makefile.fpc @@ -2,7 +2,7 @@ main=lcl [target] -dirs=gtk gtk2 gtk3 win32 wince qt qt5 carbon fpgui nogui cocoa customdrawn mui +dirs=gtk gtk2 gtk3 win32 wince qt qt5 qt6 carbon fpgui nogui cocoa customdrawn mui [default] dir=$(LCL_PLATFORM) diff --git a/lcl/interfaces/lcl.lpk b/lcl/interfaces/lcl.lpk index 4265e7b22a..08c27b82f7 100644 --- a/lcl/interfaces/lcl.lpk +++ b/lcl/interfaces/lcl.lpk @@ -130,7 +130,7 @@ end;"/> - + @@ -2418,6 +2418,179 @@ end;"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +