summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2024-12-01 18:43:32 +0100
committerAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2024-12-01 18:43:32 +0100
commitfba828e81bd2067679264999c26d2781602ca268 (patch)
treea0b898725633dc279fd3a02528b87fecf1e09f37
parente2588aa01603ac93a0b187c9d0e11bf50fb2416c (diff)
Refactor macro from __NEWOSLDR__ to __ZBAOSLDR__.
Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
-rw-r--r--dev/ZBAKit/BootKit/Support.h4
-rw-r--r--dev/ZBAKit/Modules/NetBoot/build.json2
-rw-r--r--dev/ZBAKit/Modules/SysChk/build.json2
-rw-r--r--dev/ZBAKit/amd64-efi.make2
-rw-r--r--dev/ZBAKit/arm64-efi.make2
-rw-r--r--dev/ZKAKit/FirmwareKit/EFI/API.h8
6 files changed, 10 insertions, 10 deletions
diff --git a/dev/ZBAKit/BootKit/Support.h b/dev/ZBAKit/BootKit/Support.h
index 2c1db6f4..c272b438 100644
--- a/dev/ZBAKit/BootKit/Support.h
+++ b/dev/ZBAKit/BootKit/Support.h
@@ -12,7 +12,7 @@
#define kLongMax ((long)(~0UL >> 1))
#define kLongMin (~kLongMax)
-#ifdef __NEWOSLDR__
+#ifdef __ZBAOSLDR__
/// @brief memset definition in C++.
/// @param dst destination pointer.
@@ -38,7 +38,7 @@ EXTERN_C int strcmp(const char* whatToCheck, const char* whatToCheckRight);
#define StrLen(src) strlen(src)
#define StrCmp(dst, src) strcmp(dst, src)
-#endif // __NEWOSLDR__
+#endif // __ZBAOSLDR__
inline int IsSpace(int c)
{
diff --git a/dev/ZBAKit/Modules/NetBoot/build.json b/dev/ZBAKit/Modules/NetBoot/build.json
index 779da7c6..25f3dc2e 100644
--- a/dev/ZBAKit/Modules/NetBoot/build.json
+++ b/dev/ZBAKit/Modules/NetBoot/build.json
@@ -15,7 +15,7 @@
],
"cpp_macros": [
"__MINOSKRNL__",
- "__NEWOSLDR__",
+ "__ZBAOSLDR__",
"__ZKA_AMD64__",
"kNetBootVersionHighest=0x0100",
"kNetBootVersionLowest=0x0100",
diff --git a/dev/ZBAKit/Modules/SysChk/build.json b/dev/ZBAKit/Modules/SysChk/build.json
index a3a4d9ff..e3fb3244 100644
--- a/dev/ZBAKit/Modules/SysChk/build.json
+++ b/dev/ZBAKit/Modules/SysChk/build.json
@@ -15,7 +15,7 @@
],
"cpp_macros": [
"__MINOSKRNL__",
- "__NEWOSLDR__",
+ "__ZBAOSLDR__",
"__ZKA_AMD64__",
"kChkVersionHighest=0x0100",
"kChkVersionLowest=0x0100",
diff --git a/dev/ZBAKit/amd64-efi.make b/dev/ZBAKit/amd64-efi.make
index 7a36305e..82fcab9f 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__MINOSKRNL__ -D__NEWOSLDR__ \
+FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -mno-red-zone -D__MINOSKRNL__ -D__ZBAOSLDR__ \
-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 12aae5f8..4a0c35b7 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__MINOSKRNL__ -D__NEWOSLDR__ -D__HAVE_ZKA_APIS__ -D__ZKA__ -I../ -I../ZKAKit
+ -std=c++20 -D__FSKIT_USE_NEFS__ -D__STANDALONE__ -D__MINOSKRNL__ -D__ZBAOSLDR__ -D__HAVE_ZKA_APIS__ -D__ZKA__ -I../ -I../ZKAKit
BOOT_LOADER=zbaosldr.exe
KERNEL=minoskrnl.exe
diff --git a/dev/ZKAKit/FirmwareKit/EFI/API.h b/dev/ZKAKit/FirmwareKit/EFI/API.h
index 712d6204..b7326927 100644
--- a/dev/ZKAKit/FirmwareKit/EFI/API.h
+++ b/dev/ZKAKit/FirmwareKit/EFI/API.h
@@ -14,7 +14,7 @@
#define kZKASubsystem 17
-#ifdef __NEWOSLDR__
+#ifdef __ZBAOSLDR__
// forward decl.
class BTextWriter;
@@ -22,7 +22,7 @@ class BTextWriter;
#include <BootKit/BootKit.h>
#include <Modules/FB/FB.h>
-#endif // ifdef __NEWOSLDR__
+#endif // ifdef __ZBAOSLDR__
inline EfiSystemTable* ST = nullptr;
inline EfiBootServices* BS = nullptr;
@@ -105,10 +105,10 @@ inline void InitEFI(EfiSystemTable* SystemTable) noexcept
ST->ConOut->EnableCursor(ST->ConOut, false);
}
-#ifdef __NEWOSLDR__
+#ifdef __ZBAOSLDR__
#include <BootKit/Platform.h>
-#endif // ifdef __NEWOSLDR__
+#endif // ifdef __ZBAOSLDR__
#endif /* ifndef __EFI_API__ */