summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAmlal <amlalelmahrouss@icloud.com>2024-12-01 09:32:48 +0100
committerAmlal <amlalelmahrouss@icloud.com>2024-12-01 09:32:48 +0100
commit6eb2b554c61574c16c168132ba68b82dcc5c1f0c (patch)
tree856c84ac11fa88101e7dd6e93c8ecdb5e548f7b0
parent0e28b91069fed6ebf0953b08a9fd4952fd198008 (diff)
META: Morning bump.
Signed-off-by: Amlal <amlalelmahrouss@icloud.com>
-rw-r--r--compile_flags.txt2
-rw-r--r--dev/Modules/ATA/ATA.h2
-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/CompilerKit/Detail.h4
-rw-r--r--dev/ZKAKit/amd64-efi.make2
-rw-r--r--dev/ZKAKit/arm64-efi.make2
-rw-r--r--zka-dev.cxxflags2
10 files changed, 11 insertions, 11 deletions
diff --git a/compile_flags.txt b/compile_flags.txt
index 8cf293a9..1be90d48 100644
--- a/compile_flags.txt
+++ b/compile_flags.txt
@@ -5,7 +5,7 @@
-Idev/ZBAKit/BootKit
-std=c++20
-D__ZKA_AMD64__
--D__NEWOSKRNL__
+-D__MINOSKRNL__
-D__FSKIT_INCLUDES_NEFS__
-D__ZKA_ED__
-xc++ \ No newline at end of file
diff --git a/dev/Modules/ATA/ATA.h b/dev/Modules/ATA/ATA.h
index 970a1dd0..b9309752 100644
--- a/dev/Modules/ATA/ATA.h
+++ b/dev/Modules/ATA/ATA.h
@@ -152,5 +152,5 @@ Kernel::SizeT drv_get_sector_count();
/// @brief get device size.
Kernel::SizeT drv_get_size();
-#endif // ifdef __NEWOSKRNL__
+#endif // ifdef __MINOSKRNL__
#endif // ifndef __ATA_PIO__ || __AHCI__
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
diff --git a/dev/ZKAKit/CompilerKit/Detail.h b/dev/ZKAKit/CompilerKit/Detail.h
index 7202edaf..75a29bcd 100644
--- a/dev/ZKAKit/CompilerKit/Detail.h
+++ b/dev/ZKAKit/CompilerKit/Detail.h
@@ -6,9 +6,9 @@
#pragma once
-#ifdef __NEWOSKRNL__
+#ifdef __MINOSKRNL__
#include <NewKit/Defines.h>
-#endif // ifdef __NEWOSKRNL__
+#endif // ifdef __MINOSKRNL__
#define ZKA_COPY_DELETE(KLASS) \
KLASS& operator=(const KLASS&) = delete; \
diff --git a/dev/ZKAKit/amd64-efi.make b/dev/ZKAKit/amd64-efi.make
index c89389c3..296abbb9 100644
--- a/dev/ZKAKit/amd64-efi.make
+++ b/dev/ZKAKit/amd64-efi.make
@@ -7,7 +7,7 @@ CC = x86_64-w64-mingw32-g++
LD = x86_64-w64-mingw32-ld
CCFLAGS = -fshort-wchar -c -D__ZKA_AMD64__ -mno-red-zone -fno-rtti -fno-exceptions \
-std=c++20 -D__ZKA_SUPPORT_NX__ -O0 -I../Vendor -D__FSKIT_INCLUDES_NEFS__ \
- -D__NEWOSKRNL__ -D__HAVE_ZKA_APIS__ -D__FREESTANDING__ -D__ZKA__ -I./ -I../ -I../zba -Wall
+ -D__MINOSKRNL__ -D__HAVE_ZKA_APIS__ -D__FREESTANDING__ -D__ZKA__ -I./ -I../ -I../zba -Wall
ASM = nasm
diff --git a/dev/ZKAKit/arm64-efi.make b/dev/ZKAKit/arm64-efi.make
index 535548d4..138c29c5 100644
--- a/dev/ZKAKit/arm64-efi.make
+++ b/dev/ZKAKit/arm64-efi.make
@@ -7,7 +7,7 @@ CC = clang++
LD = lld-link
CCFLAGS = -fshort-wchar -c -ffreestanding -MMD -mno-red-zone -D__ZKA_ARM64__ -fno-rtti -fno-exceptions -I./ \
-target aarch64-unknown-windows \
- -std=c++20 -O3 -D__NEWOSKRNL__ -D__ZKA_MINIMAL_OS__ -D__ZKA_NO_BUILTIN__ -D__HAVE_ZKA_APIS__ -D__ZKA__ -I../
+ -std=c++20 -O3 -D__MINOSKRNL__ -D__ZKA_MINIMAL_OS__ -D__ZKA_NO_BUILTIN__ -D__HAVE_ZKA_APIS__ -D__ZKA__ -I../
ASM = clang++
diff --git a/zka-dev.cxxflags b/zka-dev.cxxflags
index b2087e41..a7948341 100644
--- a/zka-dev.cxxflags
+++ b/zka-dev.cxxflags
@@ -6,6 +6,6 @@
-Idev/base/
-std=c++20
-D__ZKA_AMD64__
--D__NEWOSKRNL__
+-D__MINOSKRNL__
-D__FSKIT_INCLUDES_NEFS__
-D__ZKA_ED__