https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dc7eac583f97d2222ed4a7d7ba8786bbe9a90898
commit dc7eac583f97d2222ed4a7d7ba8786bbe9a90898 Author: Stanislav Motylkov <[email protected]> AuthorDate: Sat Mar 14 20:13:49 2020 +0300 Commit: GitHub <[email protected]> CommitDate: Sat Mar 14 18:13:49 2020 +0100 [FREELDR] Move built-in VGA font to better location (#2429) Addendum to 97eacb9. --- boot/freeldr/freeldr/CMakeLists.txt | 10 +++++++--- boot/freeldr/freeldr/arch/{i386/xbox/xboxfont.c => vgafont.c} | 0 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 75a8a98fec1..ec6010cb81f 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -122,6 +122,12 @@ if(ARCH STREQUAL "i386") arch/i386/i386idt.c disk/scsiport.c) + if(SARCH STREQUAL "pc98" OR SARCH STREQUAL "xbox") + # These machine types require built-in bitmap font + list(APPEND FREELDR_ARC_SOURCE + arch/vgafont.c) + endif() + if(SARCH STREQUAL "xbox") list(APPEND FREELDR_ARC_SOURCE # FIXME: Abstract things better so we don't need to include /pc/* here @@ -134,7 +140,6 @@ if(ARCH STREQUAL "i386") arch/i386/xbox/machxbox.c arch/i386/xbox/xboxcons.c arch/i386/xbox/xboxdisk.c - arch/i386/xbox/xboxfont.c arch/i386/xbox/xboxi2c.c arch/i386/xbox/xboxmem.c arch/i386/xbox/xboxrtc.c @@ -149,8 +154,7 @@ if(ARCH STREQUAL "i386") arch/i386/pc98/pc98hw.c arch/i386/pc98/pc98mem.c arch/i386/pc98/pc98rtc.c - arch/i386/pc98/pc98video.c - arch/i386/xbox/xboxfont.c) + arch/i386/pc98/pc98video.c) else() list(APPEND FREELDR_ARC_SOURCE arch/i386/pc/machpc.c diff --git a/boot/freeldr/freeldr/arch/i386/xbox/xboxfont.c b/boot/freeldr/freeldr/arch/vgafont.c similarity index 100% rename from boot/freeldr/freeldr/arch/i386/xbox/xboxfont.c rename to boot/freeldr/freeldr/arch/vgafont.c
