From 6eb2b554c61574c16c168132ba68b82dcc5c1f0c Mon Sep 17 00:00:00 2001 From: Amlal Date: Sun, 1 Dec 2024 09:32:48 +0100 Subject: META: Morning bump. Signed-off-by: Amlal --- dev/ZBAKit/Modules/NetBoot/build.json | 2 +- dev/ZBAKit/Modules/SysChk/build.json | 2 +- dev/ZBAKit/amd64-efi.make | 2 +- dev/ZBAKit/arm64-efi.make | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'dev/ZBAKit') diff --git a/dev/ZBAKit/Modules/NetBoot/build.json b/dev/ZBAKit/Modules/NetBoot/build.json index df033057..779da7c6 100644 --- a/dev/ZBAKit/Modules/NetBoot/build.json +++ b/dev/ZBAKit/Modules/NetBoot/build.json @@ -14,7 +14,7 @@ "-Wl,--subsystem=17,--image-base,0x1000000" ], "cpp_macros": [ - "__NEWOSKRNL__", + "__MINOSKRNL__", "__NEWOSLDR__", "__ZKA_AMD64__", "kNetBootVersionHighest=0x0100", diff --git a/dev/ZBAKit/Modules/SysChk/build.json b/dev/ZBAKit/Modules/SysChk/build.json index 59edff16..a3a4d9ff 100644 --- a/dev/ZBAKit/Modules/SysChk/build.json +++ b/dev/ZBAKit/Modules/SysChk/build.json @@ -14,7 +14,7 @@ "-Wl,--subsystem=17,--image-base,0x10000000,-e,ModuleMain" ], "cpp_macros": [ - "__NEWOSKRNL__", + "__MINOSKRNL__", "__NEWOSLDR__", "__ZKA_AMD64__", "kChkVersionHighest=0x0100", diff --git a/dev/ZBAKit/amd64-efi.make b/dev/ZBAKit/amd64-efi.make index 9669189c..4d503bc3 100644 --- a/dev/ZBAKit/amd64-efi.make +++ b/dev/ZBAKit/amd64-efi.make @@ -43,7 +43,7 @@ REM=rm REM_FLAG=-f FLAG_ASM=-f win64 -FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -mno-red-zone -D__NEWOSKRNL__ -D__NEWOSLDR__ \ +FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -mno-red-zone -D__MINOSKRNL__ -D__NEWOSLDR__ \ -DEFI_FUNCTION_WRAPPER -I./ -I../ZKAKit -I../ -c -nostdlib -fno-rtti -fno-exceptions \ -std=c++20 -D__HAVE_ZKA_APIS__ -DZBA_USE_FB -D__ZKA_AMD64__ -D__ZKA__ -DZKA_AUTO_FORMAT -Wall diff --git a/dev/ZBAKit/arm64-efi.make b/dev/ZBAKit/arm64-efi.make index fa6e04f2..db805848 100644 --- a/dev/ZBAKit/arm64-efi.make +++ b/dev/ZBAKit/arm64-efi.make @@ -46,7 +46,7 @@ REM_FLAG=-f FLAG_ASM=-f win64 FLAG_GNU=-fshort-wchar -c -ffreestanding -MMD -mno-red-zone -D__ZKA_ARM64__ -fno-rtti -fno-exceptions -I./ \ -target aarch64-unknown-windows \ - -std=c++20 -D__FSKIT_USE_NEFS__ -D__STANDALONE__ -D__NEWOSKRNL__ -D__NEWOSLDR__ -D__HAVE_ZKA_APIS__ -D__ZKA__ -I../ -I../zka + -std=c++20 -D__FSKIT_USE_NEFS__ -D__STANDALONE__ -D__MINOSKRNL__ -D__NEWOSLDR__ -D__HAVE_ZKA_APIS__ -D__ZKA__ -I../ -I../zka BOOT_LOADER=zbaosldr.exe KERNEL=minoskrnl.exe -- cgit v1.2.3