From 2f97637b0f18c561548954065cbb691c579e2ecd Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Wed, 2 Aug 2023 11:25:06 +0200 Subject: [PATCH] Regenerate Makefile's after change in inc/Makefile.rtl --- rtl/aix/Makefile | 2 +- rtl/amiga/Makefile | 2 +- rtl/android/Makefile | 2 +- rtl/aros/Makefile | 2 +- rtl/atari/Makefile | 2 +- rtl/beos/Makefile | 2 +- rtl/darwin/Makefile | 2 +- rtl/dragonfly/Makefile | 2 +- rtl/embedded/Makefile | 2 +- rtl/emx/Makefile | 2 +- rtl/freebsd/Makefile | 2 +- rtl/freertos/Makefile | 2 +- rtl/gba/Makefile | 2 +- rtl/go32v2/Makefile | 2 +- rtl/haiku/Makefile | 2 +- rtl/java/Makefile | 2 +- rtl/linux/Makefile | 2 +- rtl/macos/Makefile | 2 +- rtl/morphos/Makefile | 2 +- rtl/msdos/Makefile | 2 +- rtl/msxdos/Makefile | 2 +- rtl/nativent/Makefile | 2 +- rtl/nds/Makefile | 2 +- rtl/netbsd/Makefile | 2 +- rtl/netware/Makefile | 2 +- rtl/netwlibc/Makefile | 2 +- rtl/openbsd/Makefile | 2 +- rtl/os2/Makefile | 2 +- rtl/palmos/Makefile | 2 +- rtl/sinclairql/Makefile | 2 +- rtl/solaris/Makefile | 2 +- rtl/symbian/Makefile | 2 +- rtl/wasi/Makefile | 2 +- rtl/watcom/Makefile | 2 +- rtl/wii/Makefile | 2 +- rtl/win16/Makefile | 2 +- rtl/win32/Makefile | 24 ++++++++++++++++++------ rtl/win64/Makefile | 16 +++++++++------- rtl/wince/Makefile | 2 +- rtl/zxspectrum/Makefile | 2 +- 40 files changed, 65 insertions(+), 51 deletions(-) diff --git a/rtl/aix/Makefile b/rtl/aix/Makefile index 9fa5a1d582..3274745bb0 100644 --- a/rtl/aix/Makefile +++ b/rtl/aix/Makefile @@ -2617,7 +2617,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/amiga/Makefile b/rtl/amiga/Makefile index c99c9395c5..b172329637 100644 --- a/rtl/amiga/Makefile +++ b/rtl/amiga/Makefile @@ -2649,7 +2649,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/android/Makefile b/rtl/android/Makefile index b73c202fc7..af22b72f0c 100644 --- a/rtl/android/Makefile +++ b/rtl/android/Makefile @@ -2756,7 +2756,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/aros/Makefile b/rtl/aros/Makefile index 6de4908804..20cab7598b 100644 --- a/rtl/aros/Makefile +++ b/rtl/aros/Makefile @@ -2664,7 +2664,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/atari/Makefile b/rtl/atari/Makefile index 8a33fbfb5c..2fe96e9f87 100644 --- a/rtl/atari/Makefile +++ b/rtl/atari/Makefile @@ -2619,7 +2619,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/beos/Makefile b/rtl/beos/Makefile index a3dcb9de59..7be8bacfda 100644 --- a/rtl/beos/Makefile +++ b/rtl/beos/Makefile @@ -2624,7 +2624,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/darwin/Makefile b/rtl/darwin/Makefile index 90584aa601..488c937856 100644 --- a/rtl/darwin/Makefile +++ b/rtl/darwin/Makefile @@ -2745,7 +2745,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/dragonfly/Makefile b/rtl/dragonfly/Makefile index fb6751f7f3..5e475bd55f 100644 --- a/rtl/dragonfly/Makefile +++ b/rtl/dragonfly/Makefile @@ -2626,7 +2626,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/embedded/Makefile b/rtl/embedded/Makefile index 2f45715d39..3bcf5d6ad1 100644 --- a/rtl/embedded/Makefile +++ b/rtl/embedded/Makefile @@ -2983,7 +2983,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/emx/Makefile b/rtl/emx/Makefile index f5fb789247..3dcb6b96d2 100644 --- a/rtl/emx/Makefile +++ b/rtl/emx/Makefile @@ -2625,7 +2625,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/freebsd/Makefile b/rtl/freebsd/Makefile index 069626810b..60f9d8d220 100644 --- a/rtl/freebsd/Makefile +++ b/rtl/freebsd/Makefile @@ -2667,7 +2667,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/freertos/Makefile b/rtl/freertos/Makefile index 48205d2b6f..7929ee111d 100644 --- a/rtl/freertos/Makefile +++ b/rtl/freertos/Makefile @@ -2814,7 +2814,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/gba/Makefile b/rtl/gba/Makefile index 50577dbf49..a5e722e0c2 100644 --- a/rtl/gba/Makefile +++ b/rtl/gba/Makefile @@ -2618,7 +2618,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/go32v2/Makefile b/rtl/go32v2/Makefile index 9d68c81d97..df44923aa7 100644 --- a/rtl/go32v2/Makefile +++ b/rtl/go32v2/Makefile @@ -2624,7 +2624,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/haiku/Makefile b/rtl/haiku/Makefile index 5b3e0741b5..3e559cb06d 100644 --- a/rtl/haiku/Makefile +++ b/rtl/haiku/Makefile @@ -2658,7 +2658,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/java/Makefile b/rtl/java/Makefile index 85b52c6938..95af596484 100644 --- a/rtl/java/Makefile +++ b/rtl/java/Makefile @@ -2588,7 +2588,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile index 605f60b447..b4ad5ea2af 100644 --- a/rtl/linux/Makefile +++ b/rtl/linux/Makefile @@ -3218,7 +3218,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/macos/Makefile b/rtl/macos/Makefile index 3bd15584cd..52a2297250 100644 --- a/rtl/macos/Makefile +++ b/rtl/macos/Makefile @@ -2607,7 +2607,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/morphos/Makefile b/rtl/morphos/Makefile index 7f7690502c..fa17e96e9a 100644 --- a/rtl/morphos/Makefile +++ b/rtl/morphos/Makefile @@ -2591,7 +2591,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/msdos/Makefile b/rtl/msdos/Makefile index dfa1106dd2..b70918d73e 100644 --- a/rtl/msdos/Makefile +++ b/rtl/msdos/Makefile @@ -2618,7 +2618,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/msxdos/Makefile b/rtl/msxdos/Makefile index 02ce6aa4f2..4bc5f503fa 100644 --- a/rtl/msxdos/Makefile +++ b/rtl/msxdos/Makefile @@ -2588,7 +2588,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/nativent/Makefile b/rtl/nativent/Makefile index d63a68741f..459cd4a1f0 100644 --- a/rtl/nativent/Makefile +++ b/rtl/nativent/Makefile @@ -2595,7 +2595,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/nds/Makefile b/rtl/nds/Makefile index 9175671daa..61f4f1b451 100644 --- a/rtl/nds/Makefile +++ b/rtl/nds/Makefile @@ -2618,7 +2618,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/netbsd/Makefile b/rtl/netbsd/Makefile index 1142d52350..2b870bce1e 100644 --- a/rtl/netbsd/Makefile +++ b/rtl/netbsd/Makefile @@ -2723,7 +2723,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/netware/Makefile b/rtl/netware/Makefile index 229d36a6d2..a99c2c13a5 100644 --- a/rtl/netware/Makefile +++ b/rtl/netware/Makefile @@ -2629,7 +2629,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/netwlibc/Makefile b/rtl/netwlibc/Makefile index e565783a37..0dc0ef454f 100644 --- a/rtl/netwlibc/Makefile +++ b/rtl/netwlibc/Makefile @@ -2620,7 +2620,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/openbsd/Makefile b/rtl/openbsd/Makefile index 249d7e3632..70b33d80df 100644 --- a/rtl/openbsd/Makefile +++ b/rtl/openbsd/Makefile @@ -2656,7 +2656,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/os2/Makefile b/rtl/os2/Makefile index eb3b7084ef..c5fb17d913 100644 --- a/rtl/os2/Makefile +++ b/rtl/os2/Makefile @@ -2623,7 +2623,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/palmos/Makefile b/rtl/palmos/Makefile index 54bbe4ce53..57a66b2cd2 100644 --- a/rtl/palmos/Makefile +++ b/rtl/palmos/Makefile @@ -2631,7 +2631,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/sinclairql/Makefile b/rtl/sinclairql/Makefile index 3ed0d8480b..8a6ca4c931 100644 --- a/rtl/sinclairql/Makefile +++ b/rtl/sinclairql/Makefile @@ -2619,7 +2619,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/solaris/Makefile b/rtl/solaris/Makefile index a69dad5797..69f7291317 100644 --- a/rtl/solaris/Makefile +++ b/rtl/solaris/Makefile @@ -2632,7 +2632,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/symbian/Makefile b/rtl/symbian/Makefile index 065c09c516..e0545e3c80 100644 --- a/rtl/symbian/Makefile +++ b/rtl/symbian/Makefile @@ -2608,7 +2608,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/wasi/Makefile b/rtl/wasi/Makefile index 82b37884f4..1f36e85d1d 100644 --- a/rtl/wasi/Makefile +++ b/rtl/wasi/Makefile @@ -2593,7 +2593,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/watcom/Makefile b/rtl/watcom/Makefile index 752af905d3..6c3fb21d7f 100644 --- a/rtl/watcom/Makefile +++ b/rtl/watcom/Makefile @@ -2624,7 +2624,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/wii/Makefile b/rtl/wii/Makefile index 4de318c396..61d3a4b71d 100644 --- a/rtl/wii/Makefile +++ b/rtl/wii/Makefile @@ -2587,7 +2587,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/win16/Makefile b/rtl/win16/Makefile index dcecf45357..0a387c23b0 100644 --- a/rtl/win16/Makefile +++ b/rtl/win16/Makefile @@ -2618,7 +2618,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile index 567b248b5c..70b5c28c17 100644 --- a/rtl/win32/Makefile +++ b/rtl/win32/Makefile @@ -875,22 +875,26 @@ COMMON=$(RTL)/common PROCINC=$(RTL)/$(CPU_TARGET) WININC=../win/wininc WINDIR=../win +OSDIR=win32 +NSOSDIR=$(NSDIR)/windows UNITPREFIX=rtl SYSTEMUNIT=system DLLS=fpcmemdll -CPU_UNITS=cpu signals mmx +CPU_UNITS=$(CPUUNIT) $(SIGNALSUNIT) $(MMXUNIT) OBJPASDIR=$(RTL)/objpas FPC_SYSTEM_OPT=-Fu../win SYSUTILSDIR=$(WINDIR) SYSUTILS_OPT=-Fi../win +SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) $(WINDIRSUNIT)$(PPUEXT) include $(WININC)/makefile.inc WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES))) +EXEINFO_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) EXTPAS_DEPS_OS=buildrtl$(PPUEXT) ifeq ($(CPU_OS_TARGET),i386-win32) -override TARGET_UNITS+=system uuchar objpas macpas $(ISO7185UNIT) buildrtl $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) +override TARGET_UNITS+=system uuchar objpas macpas $(ISO7185UNIT) $(WINDOWSUNIT) $(SYSUTILSUNIT) buildrtl $(CHARSETUNIT) $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) endif ifeq ($(CPU_OS_TARGET),i386-win32) -override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof initc extpas heaptrc winsysut $(CTYPESUNIT) $(STRINGSUNIT) $(DOSUNIT) $(MESSAGESUNIT) $(WINDOWSUNIT) $(CMEMUNIT) $(DYNLIBSUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(GETOPTSUNIT) $(CHARSETUNIT) $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(SHAREMEMUNIT) $(EXEINFOUNIT) fpintres $(WINDIRSUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) $(CP1250UNIT) $(CP1251UNIT) $(CP1252UNIT) $(CP1253UNIT) $(CP1254UNIT) $(CP1255UNIT) $(CP1256UNIT) $(CP1257UNIT) $(CP1258UNIT) $(CP437UNIT) $(CP646UNIT) $(CP737UNIT) $(CP775UNIT) $(CP850UNIT) $(CP852UNIT) $(CP855UNIT) $(CP856UNIT) $(CP857UNIT) $(CP860UNIT) $(CP861UNIT) $(CP862UNIT) $(CP863UNIT) $(CP864UNIT) $(CP865UNIT) $(CP866UNIT) $(CP869UNIT) $(CP874UNIT) $(CP3021UNIT) $(CP8859_1UNIT) $(CP8859_2UNIT) $(CP8859_3UNIT) $(CP8859_4UNIT) $(CP8859_5UNIT) $(CP8859_6UNIT) $(CP8859_7UNIT) $(CP8859_8UNIT) $(CP8859_9UNIT) $(CP8859_10UNIT) $(CP8859_11UNIT) $(CP8859_13UNIT) $(CP8859_14UNIT) $(CP8859_15UNIT) $(CP8859_16UNIT) $(CPKOI8_RUNIT) $(CPKOI8_UUNIT) $(UNICODEDATAUNIT) $(CPU_UNITS) +override TARGET_IMPLICITUNITS+=sysinitpas sysinitcyg sysinitgprof initc extpas heaptrc $(WINSYSUTUNIT) $(CTYPESUNIT) $(STRINGSUNIT) $(DOSUNIT) $(MESSAGESUNIT) $(CMEMUNIT) $(DYNLIBSUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(MATHUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(GETOPTSUNIT) $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(SHAREMEMUNIT) $(EXEINFOUNIT) fpintres $(WINDIRSUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) $(CP1250UNIT) $(CP1251UNIT) $(CP1252UNIT) $(CP1253UNIT) $(CP1254UNIT) $(CP1255UNIT) $(CP1256UNIT) $(CP1257UNIT) $(CP1258UNIT) $(CP437UNIT) $(CP646UNIT) $(CP737UNIT) $(CP775UNIT) $(CP850UNIT) $(CP852UNIT) $(CP855UNIT) $(CP856UNIT) $(CP857UNIT) $(CP860UNIT) $(CP861UNIT) $(CP862UNIT) $(CP863UNIT) $(CP864UNIT) $(CP865UNIT) $(CP866UNIT) $(CP869UNIT) $(CP874UNIT) $(CP3021UNIT) $(CP8859_1UNIT) $(CP8859_2UNIT) $(CP8859_3UNIT) $(CP8859_4UNIT) $(CP8859_5UNIT) $(CP8859_6UNIT) $(CP8859_7UNIT) $(CP8859_8UNIT) $(CP8859_9UNIT) $(CP8859_10UNIT) $(CP8859_11UNIT) $(CP8859_13UNIT) $(CP8859_14UNIT) $(CP8859_15UNIT) $(CP8859_16UNIT) $(CPKOI8_RUNIT) $(CPKOI8_UUNIT) $(UNICODEDATAUNIT) $(CPU_UNITS) endif ifeq ($(CPU_OS_TARGET),i386-win32) override TARGET_LOADERS+=$(LOADERS) @@ -2625,7 +2629,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< @@ -2656,5 +2660,13 @@ SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES)) include $(PROCINC)/makefile.cpu SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) -buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) objpas$(PPUEXT) heaptrc$(PPUEXT) - $(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -I$(OBJPASDIR) -I$(WININC) -Fu$(WININC) -Fu$(WINDIR) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl +BUILDINCLUDEPATHS= -Fi$(OBJPASDIR)/sysutils -Fi$(WINDIR) -Fi$(OBJPASDIR) \ + -Fi$(OBJPASDIR)/classes -Fi$(WININC) -Fi$(INC) +BUILDUNITPATHS=-Fu$(WININC) -Fu$(WINDIR) -Fu$(INC) -Fu$(OBJPASDIR) -Fu../$(ARCH) +ifdef FPC_DOTTEDUNITS +BUILDRTL_OPT:=$(BUILDRTL_OPT) -Fu$(NSINC) -Fu$(NSOSDIR) -dFPC_DOTTEDUNITS +endif +BUILDRTL_DEPS=buildrtl.pp system$(PPUEXT) objpas$(PPUEXT) $(WINDOWSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \ + $(BUILDRTL_DEPS_OS) $(BUILDRTL_DEPS_CPU) +buildrtl$(PPUEXT) : $(BUILDRTL_DEPS) + $(COMPILER) $(BUILDUNITPATHS) $(BUILDINCLUDEPATHS) $(BUILDRTL_OPT) $< diff --git a/rtl/win64/Makefile b/rtl/win64/Makefile index ba840336c4..cf8739eb2c 100644 --- a/rtl/win64/Makefile +++ b/rtl/win64/Makefile @@ -879,25 +879,27 @@ OSDIR=win64 NSOSDIR=$(NSDIR)/windows SYSUTILSDIR=$(WINDIR) SYSUTILS_OPT=-Fi../win +SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) $(WINDIRSUNIT)$(PPUEXT) UNITPREFIX=rtl SYSTEMUNIT=system ifeq ($(ARCH),x86_64) -CPU_UNITS=cpu signals +CPU_UNITS=$(CPUUNIT) $(SIGNALSUNIT) endif OBJPASDIR=$(RTL)/objpas WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES))) FPC_SYSTEM_OPT=-Fi../win +EXEINFO_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) ifeq ($(CPU_OS_TARGET),x86_64-win64) -override TARGET_UNITS+=system uuchar objpas macpas $(ISO7185UNIT) buildrtl $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) +override TARGET_UNITS+=system uuchar objpas macpas $(ISO7185UNIT) $(WINDOWSUNIT) $(SYSUTILSUNIT) buildrtl $(CHARSETUNIT) $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) endif ifeq ($(CPU_OS_TARGET),aarch64-win64) -override TARGET_UNITS+=system uuchar objpas macpas $(ISO7185UNIT) buildrtl $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) +override TARGET_UNITS+=system uuchar objpas macpas $(ISO7185UNIT) $(WINDOWSUNIT) $(SYSUTILSUNIT) buildrtl $(CHARSETUNIT) $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) endif ifeq ($(CPU_OS_TARGET),x86_64-win64) -override TARGET_IMPLICITUNITS+=sysinit extpas heaptrc fpintres $(CTYPESUNIT) $(STRINGSUNIT) $(DOSUNIT) $(MESSAGESUNIT) $(WINDOWSUNIT) $(CMEMUNIT) $(DYNLIBSUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(GETOPTSUNIT) $(CHARSETUNIT) $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(SHAREMEMUNIT) $(EXEINFOUNIT) $(WINDIRSUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) $(CP1250UNIT) $(CP1251UNIT) $(CP1252UNIT) $(CP1253UNIT) $(CP1254UNIT) $(CP1255UNIT) $(CP1256UNIT) $(CP1257UNIT) $(CP1258UNIT) $(CP437UNIT) $(CP646UNIT) $(CP737UNIT) $(CP775UNIT) $(CP850UNIT) $(CP852UNIT) $(CP855UNIT) $(CP856UNIT) $(CP857UNIT) $(CP860UNIT) $(CP861UNIT) $(CP862UNIT) $(CP863UNIT) $(CP864UNIT) $(CP865UNIT) $(CP866UNIT) $(CP869UNIT) $(CP874UNIT) $(CP3021UNIT) $(CP8859_1UNIT) $(CP8859_2UNIT) $(CP8859_3UNIT) $(CP8859_4UNIT) $(CP8859_5UNIT) $(CP8859_6UNIT) $(CP8859_7UNIT) $(CP8859_8UNIT) $(CP8859_9UNIT) $(CP8859_10UNIT) $(CP8859_11UNIT) $(CP8859_13UNIT) $(CP8859_14UNIT) $(CP8859_15UNIT) $(CP8859_16UNIT) $(CPKOI8_RUNIT) $(CPKOI8_UUNIT) $(UNICODEDATAUNIT) $(CPU_UNITS) +override TARGET_IMPLICITUNITS+=sysinit extpas heaptrc fpintres $(CTYPESUNIT) $(STRINGSUNIT) $(DOSUNIT) $(MESSAGESUNIT) $(CMEMUNIT) $(DYNLIBSUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(MATHUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(GETOPTSUNIT) $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(SHAREMEMUNIT) $(EXEINFOUNIT) $(WINDIRSUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) $(CP1250UNIT) $(CP1251UNIT) $(CP1252UNIT) $(CP1253UNIT) $(CP1254UNIT) $(CP1255UNIT) $(CP1256UNIT) $(CP1257UNIT) $(CP1258UNIT) $(CP437UNIT) $(CP646UNIT) $(CP737UNIT) $(CP775UNIT) $(CP850UNIT) $(CP852UNIT) $(CP855UNIT) $(CP856UNIT) $(CP857UNIT) $(CP860UNIT) $(CP861UNIT) $(CP862UNIT) $(CP863UNIT) $(CP864UNIT) $(CP865UNIT) $(CP866UNIT) $(CP869UNIT) $(CP874UNIT) $(CP3021UNIT) $(CP8859_1UNIT) $(CP8859_2UNIT) $(CP8859_3UNIT) $(CP8859_4UNIT) $(CP8859_5UNIT) $(CP8859_6UNIT) $(CP8859_7UNIT) $(CP8859_8UNIT) $(CP8859_9UNIT) $(CP8859_10UNIT) $(CP8859_11UNIT) $(CP8859_13UNIT) $(CP8859_14UNIT) $(CP8859_15UNIT) $(CP8859_16UNIT) $(CPKOI8_RUNIT) $(CPKOI8_UUNIT) $(UNICODEDATAUNIT) $(CPU_UNITS) endif ifeq ($(CPU_OS_TARGET),aarch64-win64) -override TARGET_IMPLICITUNITS+=sysinit extpas heaptrc fpintres $(CTYPESUNIT) $(STRINGSUNIT) $(DOSUNIT) $(MESSAGESUNIT) $(WINDOWSUNIT) $(CMEMUNIT) $(DYNLIBSUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(GETOPTSUNIT) $(CHARSETUNIT) $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(SHAREMEMUNIT) $(EXEINFOUNIT) $(WINDIRSUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) $(CP1250UNIT) $(CP1251UNIT) $(CP1252UNIT) $(CP1253UNIT) $(CP1254UNIT) $(CP1255UNIT) $(CP1256UNIT) $(CP1257UNIT) $(CP1258UNIT) $(CP437UNIT) $(CP646UNIT) $(CP737UNIT) $(CP775UNIT) $(CP850UNIT) $(CP852UNIT) $(CP855UNIT) $(CP856UNIT) $(CP857UNIT) $(CP860UNIT) $(CP861UNIT) $(CP862UNIT) $(CP863UNIT) $(CP864UNIT) $(CP865UNIT) $(CP866UNIT) $(CP869UNIT) $(CP874UNIT) $(CP3021UNIT) $(CP8859_1UNIT) $(CP8859_2UNIT) $(CP8859_3UNIT) $(CP8859_4UNIT) $(CP8859_5UNIT) $(CP8859_6UNIT) $(CP8859_7UNIT) $(CP8859_8UNIT) $(CP8859_9UNIT) $(CP8859_10UNIT) $(CP8859_11UNIT) $(CP8859_13UNIT) $(CP8859_14UNIT) $(CP8859_15UNIT) $(CP8859_16UNIT) $(CPKOI8_RUNIT) $(CPKOI8_UUNIT) $(UNICODEDATAUNIT) $(CPU_UNITS) +override TARGET_IMPLICITUNITS+=sysinit extpas heaptrc fpintres $(CTYPESUNIT) $(STRINGSUNIT) $(DOSUNIT) $(MESSAGESUNIT) $(CMEMUNIT) $(DYNLIBSUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(MATHUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(GETOPTSUNIT) $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(SHAREMEMUNIT) $(EXEINFOUNIT) $(WINDIRSUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) $(CP1250UNIT) $(CP1251UNIT) $(CP1252UNIT) $(CP1253UNIT) $(CP1254UNIT) $(CP1255UNIT) $(CP1256UNIT) $(CP1257UNIT) $(CP1258UNIT) $(CP437UNIT) $(CP646UNIT) $(CP737UNIT) $(CP775UNIT) $(CP850UNIT) $(CP852UNIT) $(CP855UNIT) $(CP856UNIT) $(CP857UNIT) $(CP860UNIT) $(CP861UNIT) $(CP862UNIT) $(CP863UNIT) $(CP864UNIT) $(CP865UNIT) $(CP866UNIT) $(CP869UNIT) $(CP874UNIT) $(CP3021UNIT) $(CP8859_1UNIT) $(CP8859_2UNIT) $(CP8859_3UNIT) $(CP8859_4UNIT) $(CP8859_5UNIT) $(CP8859_6UNIT) $(CP8859_7UNIT) $(CP8859_8UNIT) $(CP8859_9UNIT) $(CP8859_10UNIT) $(CP8859_11UNIT) $(CP8859_13UNIT) $(CP8859_14UNIT) $(CP8859_15UNIT) $(CP8859_16UNIT) $(CPKOI8_RUNIT) $(CPKOI8_UUNIT) $(UNICODEDATAUNIT) $(CPU_UNITS) endif ifeq ($(CPU_OS_TARGET),x86_64-win64) override TARGET_LOADERS+=$(LOADERS) @@ -2644,7 +2646,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< @@ -2680,7 +2682,7 @@ BUILDUNITPATHS=-Fu$(WININC) -Fu$(WINDIR) -Fu$(INC) -Fu$(OBJPASDIR) -Fu../$(ARCH) ifdef FPC_DOTTEDUNITS BUILDRTL_OPT:=$(BUILDRTL_OPT) -Fu$(NSINC) -Fu$(NSOSDIR) -dFPC_DOTTEDUNITS endif -BUILDRTL_DEPS=buildrtl.pp system$(PPUEXT) objpas$(PPUEXT) \ +BUILDRTL_DEPS=buildrtl.pp system$(PPUEXT) objpas$(PPUEXT) $(WINDOWSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \ $(BUILDRTL_DEPS_OS) $(BUILDRTL_DEPS_CPU) buildrtl$(PPUEXT) : $(BUILDRTL_DEPS) $(COMPILER) $(BUILDUNITPATHS) $(BUILDINCLUDEPATHS) $(BUILDRTL_OPT) $< diff --git a/rtl/wince/Makefile b/rtl/wince/Makefile index bd4dc44438..bc54f224b8 100644 --- a/rtl/wince/Makefile +++ b/rtl/wince/Makefile @@ -2610,7 +2610,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $< diff --git a/rtl/zxspectrum/Makefile b/rtl/zxspectrum/Makefile index 6b32a74b35..1737d9c5e2 100644 --- a/rtl/zxspectrum/Makefile +++ b/rtl/zxspectrum/Makefile @@ -2585,7 +2585,7 @@ BLOCKRTL_DEPS=$(INC)/blockrtl.pp \ $(BLOCKRTL_DEPS_OS) $(BLOCKRTL_DEPS_CPU) blockrtl$(PPUEXT) : $(BLOCKRTL_DEPS) $(COMPILER) $(BLOCKRTL_OPT) $< -WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) \ +WINDOWS_DEPS=windows.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \ $(WINDOWS_DEPS_OS) $(WINDOWS_DEPS_CPU) windows$(PPUEXT): $(WINDOWS_DEPS) $(COMPILER) $(WINDOWS_OPT) $<