From 1feb3848114c6fabb569af3c7fd08cdeaacdff82 Mon Sep 17 00:00:00 2001 From: Amlal Date: Sun, 1 Dec 2024 09:54:00 +0100 Subject: ZBA: Include resource file to define executable's metadata. FB: Framebuffer module got some refactors. Signed-off-by: Amlal --- dev/ZBAKit/amd64-efi.make | 2 +- dev/ZBAKit/src/HEL/AMD64/BootMain.cc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'dev/ZBAKit') diff --git a/dev/ZBAKit/amd64-efi.make b/dev/ZBAKit/amd64-efi.make index 4d503bc3..7a36305e 100644 --- a/dev/ZBAKit/amd64-efi.make +++ b/dev/ZBAKit/amd64-efi.make @@ -75,7 +75,7 @@ endif .PHONY: compile-amd64 compile-amd64: - $(RESCMD) + $(WINDRES) src/BootloaderRsrc.rsrc -O coff -o BootloaderRsrc.o $(CC_GNU) $(ZKA_MODEL) $(STANDALONE_MACRO) $(FLAG_GNU) $(DEBUG) \ $(wildcard src/HEL/AMD64/*.cc) \ $(wildcard src/HEL/AMD64/*.S) \ diff --git a/dev/ZBAKit/src/HEL/AMD64/BootMain.cc b/dev/ZBAKit/src/HEL/AMD64/BootMain.cc index 77de8a7b..87336fbd 100644 --- a/dev/ZBAKit/src/HEL/AMD64/BootMain.cc +++ b/dev/ZBAKit/src/HEL/AMD64/BootMain.cc @@ -142,11 +142,11 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr ImageHandle, kHandoverHeader = handover_hdr; #ifdef ZBA_USE_FB - CGInit(); - CGDrawInRegion(CGColor(0x00, 0x00, 0x00), handover_hdr->f_GOP.f_Height, handover_hdr->f_GOP.f_Width, 0, 0); - CGFini(); + cg_init(); + CGDrawInRegion(cg_color(0x00, 0x00, 0x00), handover_hdr->f_GOP.f_Height, handover_hdr->f_GOP.f_Width, 0, 0); + cg_fini(); - CGFini(); + cg_fini(); #endif // ZBA_USE_FB UInt32 cnt_enabled = 0; -- cgit v1.2.3