Meta: Update resource file.

Signed-off-by: Amlal El Mahrouss <amlal@el-mahrouss-logic.com>

5 files changed, 43 insertions, 13 deletions

diff --git a/Private/KernelRsrc.rc b/Private/KernelRsrc.rsrc
index 0470d572..bc12b441 100644
--- a/Private/KernelRsrc.rc
+++ b/Private/KernelRsrc.rsrc
@@ -1,5 +1,7 @@
 1 ICON "Root/Boot/kernel-logo.ico"
 
+#include "CompilerKit/Version.hxx"
+
 1 VERSIONINFO
 FILEVERSION     1,0,0,0
 PRODUCTVERSION  1,0,0,0
@@ -8,14 +10,14 @@ BEGIN
   BEGIN
     BLOCK "080904E4"
     BEGIN
-      VALUE "CompanyName", "MahroussLogic"
-      VALUE "FileDescription", "NewOS microkernel."
-      VALUE "FileVersion", "1.0"
+      VALUE "CompanyName", "Mahrouss-Logic"
+      VALUE "FileDescription", "NewOS multiplatform kernel."
+      VALUE "FileVersion", KERNEL_VERSION
       VALUE "InternalName", "NewKernel"
-      VALUE "LegalCopyright", "MahroussLogic"
+      VALUE "LegalCopyright", "Mahrouss-Logic"
       VALUE "OriginalFilename", "NewKernel.exe"
       VALUE "ProductName", "NewKernel"
-      VALUE "ProductVersion", "1.0"
+      VALUE "ProductVersion", KERNEL_VERSION
     END
   END
   BLOCK "VarFileInfo"
diff --git a/Private/NewBoot/Source/BootloaderRsrc.rsrc b/Private/NewBoot/Source/BootloaderRsrc.rsrc
new file mode 100644
index 00000000..e8fa0c9a
--- /dev/null
+++ b/Private/NewBoot/Source/BootloaderRsrc.rsrc
@@ -0,0 +1,27 @@
+#include "../../CompilerKit/Version.hxx"
+
+1 ICON "../../Root/Boot/kernel-logo.ico"
+
+1 VERSIONINFO
+FILEVERSION     1,0,0,0
+PRODUCTVERSION  1,0,0,0
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "080904E4"
+    BEGIN
+      VALUE "CompanyName", "Mahrouss-Logic"
+      VALUE "FileDescription", "NewOS multi-platform bootloader."
+      VALUE "FileVersion", BOOTLOADER_VERSION
+      VALUE "InternalName", "NewBoot"
+      VALUE "LegalCopyright", "Copyright Mahrouss-Logic, all rights reserved."
+      VALUE "OriginalFilename", "NewBoot.exe"
+      VALUE "ProductName", "NewBoot"
+      VALUE "ProductVersion", BOOTLOADER_VERSION
+    END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x809, 1252
+  END
+END
\ No newline at end of file
diff --git a/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx b/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx
index 542d62b1..f4eaee33 100644
--- a/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx
+++ b/Private/NewBoot/Source/HEL/AMD64/BootMain.cxx
@@ -32,7 +32,7 @@ EFI_EXTERN_C EFI_API Int EfiMain(EfiHandlePtr ImageHandle,
   BTextWriter writer;
   /// Splash screen stuff
 
-  writer.Write(L"MahroussLogic (R) NewOS: ")
+  writer.Write(L"Mahrouss-Logic (R) NewOS: ")
       .Write(BVersionString::Shared());
 
   writer.Write(L"\r\nNewBoot.exe: Firmware Vendor: ")
diff --git a/Private/NewBoot/Source/makefile b/Private/NewBoot/Source/makefile
index a3807a6d..b9413bb4 100644
--- a/Private/NewBoot/Source/makefile
+++ b/Private/NewBoot/Source/makefile
@@ -32,14 +32,15 @@ FLAG_GNU=-fshort-wchar -mgeneral-regs-only -mno-red-zone -D__KERNEL__ -DEFI_FUNC
 invalid-recipe:
 	@echo "invalid-recipe: Use make bootloader-<arch> all instead."
 
-.PHONY: bootloader-amd64
-bootloader-amd64: compile-amd64
+.PHONY: all
+all: compile-amd64
 	$(LD_GNU) $(OBJ) $(LD_FLAGS) -o NewBoot.exe
 	$(COPY) NewBoot.exe CDROM/EFI/BOOT/BOOTX64.EFI
 	$(COPY) NewBoot.exe CDROM/EFI/BOOT/NEWBOOT.EFI
 
 .PHONY: compile-amd64
 compile-amd64:
+	windres BootloaderRsrc.rsrc -O coff -o BootloaderRsrc.o
 	$(CC_GNU) $(FLAG_GNU) $(DEBUG) $(wildcard HEL/AMD64/*.cxx) $(wildcard *.cxx)
 
 .PHONY: run-efi-amd64
diff --git a/Private/makefile b/Private/makefile
index 0a47157a..ca3a7bf2 100644
--- a/Private/makefile
+++ b/Private/makefile
@@ -8,19 +8,19 @@ LD			= x86_64-w64-mingw32-ld
 CCFLAGS		= -c -ffreestanding -mgeneral-regs-only -mno-red-zone -fno-rtti -fno-exceptions -std=c++20 -D__FSKIT_NEWFS__ -D__KERNEL__ -D__HAVE_MAHROUSS_APIS__ -D__MAHROUSS__ -I../ -I./ 
 ASM 		= nasm
 
-ifneq ($(NEWOS_PIO_ATA), )
+ifneq ($(ATA_PIO_SUPPORT), )
 DISKDRIVER =  -D__ATA_PIO__ 
 endif
 
-ifneq ($(NEWOS_DMA_ATA), )
+ifneq ($(ATA_DMA_SUPPORT), )
 DISKDRIVER =  -D__ATA_DMA__ 
 endif
 
-ifneq ($(NEWOS_AHCI), )
+ifneq ($(AHCI_SUPPORT), )
 DISKDRIVER =  -D__AHCI__ 
 endif
 
-ifneq ($(DEBUG), )
+ifneq ($(DEBUG_SUPPORT), )
 DEBUG =  -D__DEBUG__ 
 endif
 
@@ -43,7 +43,7 @@ MOVEALL=./MoveAll.sh
 
 .PHONY: h-core-amd64-epm
 h-core-amd64-epm: clean
-	windres KernelRsrc.rc -O coff -o KernelRsrc.obj
+	windres KernelRsrc.rsrc -O coff -o KernelRsrc.obj
 	$(CC) $(CCFLAGS) $(DISKDRIVER) $(DEBUG) $(wildcard Source/*.cxx HALKit/AMD64/Storage/*.cxx) $(wildcard HALKit/AMD64/PCI/*.cxx) $(wildcard Source/Network/*.cxx) $(wildcard Source/Storage/*.cxx) $(wildcard HALKit/AMD64/*.cxx) $(wildcard HALKit/AMD64/*.cpp) $(wildcard HALKit/AMD64/*.s)
 	$(ASM) $(ASMFLAGS) HALKit/AMD64/HalInterruptAPI.asm
 	$(ASM) $(ASMFLAGS) HALKit/AMD64/HalSMPCoreManager.asm