64x0: Fix naming of the toolchain.

link: Use kDistVersion on -v command.

Signed-off-by: Amlal El Mahrouss <113760121+Amlal-ElMahrouss@users.noreply.github.com>

5 files changed, 16 insertions, 11 deletions

diff --git a/64asm.rsrc b/64asm.rsrc
index f6c6b58..9e79e5a 100644
--- a/64asm.rsrc
+++ b/64asm.rsrc
@@ -9,7 +9,7 @@ BEGIN
     BLOCK "080904E4"
     BEGIN
       VALUE "CompanyName", "Mahrouss-Logic"
-      VALUE "FileDescription", "NewOS 64x000 assembler."
+      VALUE "FileDescription", "NewOS 64x0 assembler."
       VALUE "FileVersion", kDistVersion
       VALUE "InternalName", "NewAssembler"
       VALUE "LegalCopyright", "Mahrouss-Logic"
diff --git a/64x000-cc.rsrc b/64x0-cc.rsrc
index d9df247..de7d9fc 100644
--- a/64x000-cc.rsrc
+++ b/64x0-cc.rsrc
@@ -9,11 +9,11 @@ BEGIN
     BLOCK "080904E4"
     BEGIN
       VALUE "CompanyName", "Mahrouss-Logic"
-      VALUE "FileDescription", "NewOS 64x000 C compiler."
+      VALUE "FileDescription", "NewOS 64x0 C compiler."
       VALUE "FileVersion", kDistVersion
       VALUE "InternalName", "NewC"
       VALUE "LegalCopyright", "Mahrouss-Logic"
-      VALUE "OriginalFilename", "64x000-cc.exe"
+      VALUE "OriginalFilename", "64x0-cc.exe"
       VALUE "ProductName", "NewC"
       VALUE "ProductVersion", kDistVersion
     END
diff --git a/Sources/64x000-cc.cc b/Sources/64x0-cc.cc
index aafc44f..834217b 100644
--- a/Sources/64x000-cc.cc
+++ b/Sources/64x0-cc.cc
@@ -167,7 +167,7 @@ class CompilerBackendCLang final : public ParserKit::CompilerBackend {
   std::string Check(const char *text, const char *file);
   bool Compile(const std::string &text, const char *file) override;
 
-  const char *Language() override { return "64x000 C"; }
+  const char *Language() override { return "64x0 C"; }
 };
 
 static CompilerBackendCLang *kCompilerBackend = nullptr;
diff --git a/Sources/link.cc b/Sources/link.cc
index 55cc3f5..6ca68ec 100644
--- a/Sources/link.cc
+++ b/Sources/link.cc
@@ -34,6 +34,9 @@
 //! Advanced Executable Object Format
 #include <Headers/StdKit/AE.hpp>
 
+//! Dist version
+#include <Version.hxx>
+
 //! C++ I/O headers.
 #include <fstream>
 #include <iostream>
@@ -41,7 +44,7 @@
 //! @brief standard PEF entry.
 #define kPefStart "__start"
 
-#define kLinkerVersion "Mahrouss Visual Linker v2.23, (c) Mahrouss Logic 2024"
+#define kLinkerVersion "Mahrouss Linker %s, (c) Mahrouss Logic 2024"
 
 #define StringCompare(DST, SRC) strcmp(DST, SRC)
 
@@ -74,6 +77,9 @@ static const char *kLdDynamicSym = ":RuntimeSymbol:";
 static std::vector<std::string> kObjectList;
 static std::vector<char> kObjectBytes;
 
+#define kPrintF printf
+#define kSplashLink() kPrintF(kWhite kLinkerVersion, kDistVersion)
+
 MPCC_MODULE(NewOSLinker) {
   bool is_executable = true;
 
@@ -97,8 +103,7 @@ MPCC_MODULE(NewOSLinker) {
 
       return 0;
     } else if (StringCompare(argv[i], "-v") == 0) {
-      kStdOut << kLinkerVersion << std::endl;
-
+      kSplashLink();
       return 0;
     } else if (StringCompare(argv[i], "-fat-bin") == 0) {
       kFatBinaryEnable = true;
diff --git a/makefile b/makefile
index e0d960c..9e60e5f 100644
--- a/makefile
+++ b/makefile
@@ -28,8 +28,8 @@ PP_OUTPUT=Output/bpp.exe
 SRC_COMMON=Sources/String.cc Sources/AsmKit.cc
 
 # C Compiler (PowerPC)
-64X0_CC_SRC=Sources/64x000-cc.cc $(SRC_COMMON)
-64X0_CC_OUTPUT=Output/64x000-cc.exe
+64X0_CC_SRC=Sources/64x0-cc.cc $(SRC_COMMON)
+64X0_CC_OUTPUT=Output/64x0-cc.exe
 
 # C Compiler
 PPC_CC_SRC=Sources/ppc-cc.cc $(SRC_COMMON)
@@ -60,9 +60,9 @@ compiler:
 	$(WINRES) i64asm.rsrc -O coff -o i64asm.obj
 	$(WINRES) 64asm.rsrc -O coff -o 64asm.obj
 	$(WINRES) ppcasm.rsrc -O coff -o ppcasm.obj
-	$(WINRES) 64x000-cc.rsrc -O coff -o 64x000-cc.obj
+	$(WINRES) 64x0-cc.rsrc -O coff -o 64x0-cc.obj
 	$(WINRES) ppc-cc.rsrc -O coff -o ppc-cc.obj
-	$(LINK_CC) $(COMMON_INC) 64x000-cc.obj $(64X0_CC_SRC) -o $(64X0_CC_OUTPUT)
+	$(LINK_CC) $(COMMON_INC) 64x0-cc.obj $(64X0_CC_SRC) -o $(64X0_CC_OUTPUT)
 	$(LINK_CC) $(COMMON_INC) ppc-cc.obj $(PPC_CC_SRC) -o $(PPC_CC_OUTPUT)
 	$(LINK_CC) $(COMMON_INC) i64asm.obj $(IASM_SRC) -o $(IASM_OUTPUT)
 	$(LINK_CC) $(COMMON_INC) 64asm.obj $(ASM_SRC) -o $(ASM_OUTPUT)