[IMP] [unstable] Bootloader now moves DDK and SCI into boot folder

(which is a FAT32 partition).

Signed-off-by: Amlal EL Mahrouss <amlalelmahrouss@icloud.com>

24 files changed, 15 insertions, 5 deletions

diff --git a/Boot/Modules/NetBoot/manifest.json b/Boot/Modules/NetBoot/manifest.json
index 708c451e..bb3a509e 100644
--- a/Boot/Modules/NetBoot/manifest.json
+++ b/Boot/Modules/NetBoot/manifest.json
@@ -1,4 +1,4 @@
 {
   "pluginName": "NetBoot",
-  "description": "Over the Air update module."
+  "description": "Boot NewOS from a network volume."
 }
diff --git a/Boot/Sources/HEL/AMD64/Support.cxx b/Boot/Sources/HEL/AMD64/Support.cxx
index a2ac6394..eb6f54df 100644
--- a/Boot/Sources/HEL/AMD64/Support.cxx
+++ b/Boot/Sources/HEL/AMD64/Support.cxx
@@ -14,6 +14,12 @@
 
 #ifdef __STANDALONE__
 
+EXTERN_C void __cxa_pure_virtual()
+{
+	BTextWriter writer;
+	writer.Write("newosldr: Placeholder.\r");
+}
+
 /// @brief memset definition in C++.
 /// @param dst destination pointer.
 /// @param byte value to fill in.
diff --git a/Boot/Sources/Root/ZETA/BootLoader-Load.webm b/Boot/Sources/Root/ZETA/BootLoader-Load.webm
deleted file mode 100644
index 84b5e749..00000000
--- a/Boot/Sources/Root/ZETA/BootLoader-Load.webm
+++ /dev/null
diff --git a/Boot/Sources/Root/ZETA/fonts.json b/Boot/Sources/Root/ZETA/fonts.json
deleted file mode 100644
index de0425a1..00000000
--- a/Boot/Sources/Root/ZETA/fonts.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "font_ext": ".ttf",
-  "src_dir": "ZETA"
-}
diff --git a/Boot/Sources/Root/ZETA/Urbanist-Black.ttf b/Boot/Sources/Root/ZKA/Urbanist-Black.ttf
index e1ec32b3..e1ec32b3 100644
--- a/Boot/Sources/Root/ZETA/Urbanist-Black.ttf
+++ b/Boot/Sources/Root/ZKA/Urbanist-Black.ttf
diff --git a/Boot/Sources/Root/ZETA/Urbanist-BlackItalic.ttf b/Boot/Sources/Root/ZKA/Urbanist-BlackItalic.ttf
index 85323c97..85323c97 100644
--- a/Boot/Sources/Root/ZETA/Urbanist-BlackItalic.ttf
+++ b/Boot/Sources/Root/ZKA/Urbanist-BlackItalic.ttf
diff --git a/Boot/Sources/Root/ZETA/Urbanist-Bold.ttf b/Boot/Sources/Root/ZKA/Urbanist-Bold.ttf
index 330e84f9..330e84f9 100644
--- a/Boot/Sources/Root/ZETA/Urbanist-Bold.ttf
+++ b/Boot/Sources/Root/ZKA/Urbanist-Bold.ttf
diff --git a/Boot/Sources/Root/ZETA/Urbanist-BoldItalic.ttf b/Boot/Sources/Root/ZKA/Urbanist-BoldItalic.ttf
index 08d47a8a..08d47a8a 100644
--- a/Boot/Sources/Root/ZETA/Urbanist-BoldItalic.ttf
+++ b/Boot/Sources/Root/ZKA/Urbanist-BoldItalic.ttf
diff --git a/Boot/Sources/Root/ZETA/Urbanist-ExtraBold.ttf b/Boot/Sources/Root/ZKA/Urbanist-ExtraBold.ttf
index 7971b6db..7971b6db 100644
--- a/Boot/Sources/Root/ZETA/Urbanist-ExtraBold.ttf
+++ b/Boot/Sources/Root/ZKA/Urbanist-ExtraBold.ttf
diff --git a/Boot/Sources/Root/ZETA/Urbanist-ExtraBoldItalic.ttf b/Boot/Sources/Root/ZKA/Urbanist-ExtraBoldItalic.ttf
index 050297e2..050297e2 100644
--- a/Boot/Sources/Root/ZETA/Urbanist-ExtraBoldItalic.ttf
+++ b/Boot/Sources/Root/ZKA/Urbanist-ExtraBoldItalic.ttf
diff --git a/Boot/Sources/Root/ZETA/Urbanist-ExtraLight.ttf b/Boot/Sources/Root/ZKA/Urbanist-ExtraLight.ttf
index a20a0bf9..a20a0bf9 100644
--- a/Boot/Sources/Root/ZETA/Urbanist-ExtraLight.ttf
+++ b/Boot/Sources/Root/ZKA/Urbanist-ExtraLight.ttf
diff --git a/Boot/Sources/Root/ZETA/Urbanist-ExtraLightItalic.ttf b/Boot/Sources/Root/ZKA/Urbanist-ExtraLightItalic.ttf
index 68968472..68968472 100644
--- a/Boot/Sources/Root/ZETA/Urbanist-ExtraLightItalic.ttf
+++ b/Boot/Sources/Root/ZKA/Urbanist-ExtraLightItalic.ttf
diff --git a/Boot/Sources/Root/ZETA/Urbanist-Italic.ttf b/Boot/Sources/Root/ZKA/Urbanist-Italic.ttf
index 79688a6c..79688a6c 100644
--- a/Boot/Sources/Root/ZETA/Urbanist-Italic.ttf
+++ b/Boot/Sources/Root/ZKA/Urbanist-Italic.ttf
diff --git a/Boot/Sources/Root/ZETA/Urbanist-Light.ttf b/Boot/Sources/Root/ZKA/Urbanist-Light.ttf
index 59034000..59034000 100644
--- a/Boot/Sources/Root/ZETA/Urbanist-Light.ttf
+++ b/Boot/Sources/Root/ZKA/Urbanist-Light.ttf
diff --git a/Boot/Sources/Root/ZETA/Urbanist-LightItalic.ttf b/Boot/Sources/Root/ZKA/Urbanist-LightItalic.ttf
index 1a455ce2..1a455ce2 100644
--- a/Boot/Sources/Root/ZETA/Urbanist-LightItalic.ttf
+++ b/Boot/Sources/Root/ZKA/Urbanist-LightItalic.ttf
diff --git a/Boot/Sources/Root/ZETA/Urbanist-Medium.ttf b/Boot/Sources/Root/ZKA/Urbanist-Medium.ttf
index e9a6dbb0..e9a6dbb0 100644
--- a/Boot/Sources/Root/ZETA/Urbanist-Medium.ttf
+++ b/Boot/Sources/Root/ZKA/Urbanist-Medium.ttf
diff --git a/Boot/Sources/Root/ZETA/Urbanist-MediumItalic.ttf b/Boot/Sources/Root/ZKA/Urbanist-MediumItalic.ttf
index 44a9c897..44a9c897 100644
--- a/Boot/Sources/Root/ZETA/Urbanist-MediumItalic.ttf
+++ b/Boot/Sources/Root/ZKA/Urbanist-MediumItalic.ttf
diff --git a/Boot/Sources/Root/ZETA/Urbanist-Regular.ttf b/Boot/Sources/Root/ZKA/Urbanist-Regular.ttf
index 2a794b27..2a794b27 100644
--- a/Boot/Sources/Root/ZETA/Urbanist-Regular.ttf
+++ b/Boot/Sources/Root/ZKA/Urbanist-Regular.ttf
diff --git a/Boot/Sources/Root/ZETA/Urbanist-SemiBold.ttf b/Boot/Sources/Root/ZKA/Urbanist-SemiBold.ttf
index 6d393d1c..6d393d1c 100644
--- a/Boot/Sources/Root/ZETA/Urbanist-SemiBold.ttf
+++ b/Boot/Sources/Root/ZKA/Urbanist-SemiBold.ttf
diff --git a/Boot/Sources/Root/ZETA/Urbanist-SemiBoldItalic.ttf b/Boot/Sources/Root/ZKA/Urbanist-SemiBoldItalic.ttf
index 327aa044..327aa044 100644
--- a/Boot/Sources/Root/ZETA/Urbanist-SemiBoldItalic.ttf
+++ b/Boot/Sources/Root/ZKA/Urbanist-SemiBoldItalic.ttf
diff --git a/Boot/Sources/Root/ZETA/Urbanist-Thin.ttf b/Boot/Sources/Root/ZKA/Urbanist-Thin.ttf
index 9e272162..9e272162 100644
--- a/Boot/Sources/Root/ZETA/Urbanist-Thin.ttf
+++ b/Boot/Sources/Root/ZKA/Urbanist-Thin.ttf
diff --git a/Boot/Sources/Root/ZETA/Urbanist-ThinItalic.ttf b/Boot/Sources/Root/ZKA/Urbanist-ThinItalic.ttf
index 5cf054f1..5cf054f1 100644
--- a/Boot/Sources/Root/ZETA/Urbanist-ThinItalic.ttf
+++ b/Boot/Sources/Root/ZKA/Urbanist-ThinItalic.ttf
diff --git a/Boot/Sources/Root/ZKA/fonts.json b/Boot/Sources/Root/ZKA/fonts.json
new file mode 100644
index 00000000..e804c2e7
--- /dev/null
+++ b/Boot/Sources/Root/ZKA/fonts.json
@@ -0,0 +1,4 @@
+{
+  "font_pkg_src": "*.ttf",
+  "font_pkg_name": "ZKA Fonts."
+}
diff --git a/Boot/amd64-efi.make b/Boot/amd64-efi.make
index 49d2ae59..b866e650 100644
--- a/Boot/amd64-efi.make
+++ b/Boot/amd64-efi.make
@@ -51,6 +51,8 @@ FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -D__NEWOS_OTA__ -mno-red-zone -D__KERNEL
 
 BOOT_LOADER=newosldr.exe
 KERNEL=newoskrnl.exe
+DDK=libDDK.lib
+SCI=libSCI.lib
 
 .PHONY: invalid-recipe
 invalid-recipe:
@@ -63,6 +65,8 @@ all: compile-amd64
 	$(COPY) Sources/$(BOOT_LOADER) Sources/Root/EFI/BOOT/BOOTX64.EFI
 	$(COPY) Sources/$(BOOT_LOADER) Sources/Root/EFI/BOOT/NEWBOOT.EFI
 	$(COPY) ../Kernel/$(KERNEL) Sources/Root/$(KERNEL)
+	$(COPY) ../SCIKit/$(SCI) Sources/Root/$(SCI)
+	$(COPY) ../DDKit/$(DDK) Sources/Root/$(DDK)
 	$(COPY) Sources/$(BOOT_LOADER) Sources/Root/$(BOOT_LOADER)
 
 ifneq ($(DEBUG_SUPPORT), )