diff options
Diffstat (limited to 'dev')
30 files changed, 168 insertions, 58 deletions
diff --git a/dev/ZBA/Modules/BootScr/Boot.S b/dev/ZBA/Modules/BootScr/Boot.S new file mode 100644 index 00000000..ce9f36b1 --- /dev/null +++ b/dev/ZBA/Modules/BootScr/Boot.S @@ -0,0 +1,28 @@ +;; /* +;; * ======================================================== +;; * +;; * ZKA +;; * Copyright ZKA Technologies., all rights reserved. +;; * +;; * ======================================================== +;; */ + +.code64 +.intel_syntax noprefix + +#define kTypeDriver 101 +#define kArchAmd64 122 +#define kHandoverMagic 0xBADCC + +.section .ldr + +.quad kHandoverMagic +.word kTypeDriver + +.text + +.extern main +.global __main + +__main: + ret diff --git a/dev/ZBA/Modules/BootScr/Module.cxx b/dev/ZBA/Modules/BootScr/Module.cxx index 11bbb6c0..15758599 100644 --- a/dev/ZBA/Modules/BootScr/Module.cxx +++ b/dev/ZBA/Modules/BootScr/Module.cxx @@ -9,11 +9,7 @@ #include <BootKit/BootKit.hxx> -EXTERN EfiSystemTable* ST; - -EXTERN_C Int32 ModuleMain(Void) +EXTERN_C Int32 main(Kernel::HEL::HandoverInformationHeader* Handover) { - ST->ConOut->ClearScreen(ST->ConOut); - return kEfiOk; } diff --git a/dev/ZBA/Modules/BootScr/build.json b/dev/ZBA/Modules/BootScr/build.json new file mode 100644 index 00000000..c53c6faa --- /dev/null +++ b/dev/ZBA/Modules/BootScr/build.json @@ -0,0 +1,25 @@ +{ + "compiler_path": "x86_64-w64-mingw32-g++", + "compiler_std": "c++20", + "headers_path": ["../", "../../", "../../../ZKA", "../../../", "./"], + "sources_path": ["*.cxx", "*.S"], + "output_name": "bootscr.sys", + "compiler_flags": [ + "-ffreestanding", + "-nostdlib", + "-std=c++20", + "-fPIC", + "-fno-rtti", + "-fno-exceptions", + "-Wl,--subsystem=17,--image-base 0x10000000" + ], + "cpp_macros": [ + "__NEWOSKRNL__", + "__NEWOSLDR__", + "__ZKA_AMD64__", + "__BOOTSCR__", + "cSCRVersionHighest=0x0100", + "cSCRVersionLowest=0x0100", + "cSCRVersion=0x0100" + ] +} diff --git a/dev/ZBA/Modules/BootScr/compile_flags.txt b/dev/ZBA/Modules/BootScr/compile_flags.txt index f9ca281f..18bc8512 100644 --- a/dev/ZBA/Modules/BootScr/compile_flags.txt +++ b/dev/ZBA/Modules/BootScr/compile_flags.txt @@ -2,7 +2,7 @@ -I../ -I../../ -I../../Kernel --D__NEWOS_AMD64__ +-D__ZKA_AMD64__ -std=c++20 -D__x86_64__ -D__NEWOS_OTA__ diff --git a/dev/ZBA/Modules/NetBoot/Boot.S b/dev/ZBA/Modules/NetBoot/Boot.S new file mode 100644 index 00000000..ce9f36b1 --- /dev/null +++ b/dev/ZBA/Modules/NetBoot/Boot.S @@ -0,0 +1,28 @@ +;; /* +;; * ======================================================== +;; * +;; * ZKA +;; * Copyright ZKA Technologies., all rights reserved. +;; * +;; * ======================================================== +;; */ + +.code64 +.intel_syntax noprefix + +#define kTypeDriver 101 +#define kArchAmd64 122 +#define kHandoverMagic 0xBADCC + +.section .ldr + +.quad kHandoverMagic +.word kTypeDriver + +.text + +.extern main +.global __main + +__main: + ret diff --git a/dev/ZBA/Modules/NetBoot/Module.cxx b/dev/ZBA/Modules/NetBoot/Module.cxx index 9bc65eda..ea30569b 100644 --- a/dev/ZBA/Modules/NetBoot/Module.cxx +++ b/dev/ZBA/Modules/NetBoot/Module.cxx @@ -7,19 +7,10 @@ * ======================================================== */ +#include <NetBoot.hxx> #include <BootKit/BootKit.hxx> -#include <NetBoot/NetBoot.hxx> -EXTERN EfiSystemTable* ST; - -EXTERN_C Int32 ModuleMain(Void) +EXTERN_C Int32 main(Kernel::HEL::HandoverInformationHeader* Handover) { - ST->ConOut->ClearScreen(ST->ConOut); - - /// @todo - /// - Find a network drive called "\.\newoskrnl.dll" with fork 'For-NewOSLdr' in the network path. (NewFS formatted disk as well!) - /// - Download our image - /// - Boot from it. - return kEfiOk; } diff --git a/dev/ZBA/Modules/NetBoot/build.json b/dev/ZBA/Modules/NetBoot/build.json new file mode 100644 index 00000000..78336241 --- /dev/null +++ b/dev/ZBA/Modules/NetBoot/build.json @@ -0,0 +1,25 @@ +{ + "compiler_path": "x86_64-w64-mingw32-g++", + "compiler_std": "c++20", + "headers_path": ["../", "../../", "../../../ZKA", "../../../", "./"], + "sources_path": ["*.cxx", "*.S"], + "output_name": "netboot.sys", + "compiler_flags": [ + "-ffreestanding", + "-nostdlib", + "-std=c++20", + "-fPIC", + "-fno-rtti", + "-fno-exceptions", + "-Wl,--subsystem=17,--image-base 0x10000000" + ], + "cpp_macros": [ + "__NEWOSKRNL__", + "__NEWOSLDR__", + "__ZKA_AMD64__", + "__BOOTSCR__", + "cSCRVersionHighest=0x0100", + "cSCRVersionLowest=0x0100", + "cSCRVersion=0x0100" + ] +} diff --git a/dev/ZBA/Modules/NetBoot/compile_flags.txt b/dev/ZBA/Modules/NetBoot/compile_flags.txt index f9ca281f..18bc8512 100644 --- a/dev/ZBA/Modules/NetBoot/compile_flags.txt +++ b/dev/ZBA/Modules/NetBoot/compile_flags.txt @@ -2,7 +2,7 @@ -I../ -I../../ -I../../Kernel --D__NEWOS_AMD64__ +-D__ZKA_AMD64__ -std=c++20 -D__x86_64__ -D__NEWOS_OTA__ diff --git a/dev/ZBA/Sources/HEL/AMD64/BootFileReader.cxx b/dev/ZBA/Sources/HEL/AMD64/BootFileReader.cxx index e94c690a..5686318b 100644 --- a/dev/ZBA/Sources/HEL/AMD64/BootFileReader.cxx +++ b/dev/ZBA/Sources/HEL/AMD64/BootFileReader.cxx @@ -139,7 +139,7 @@ Void BFileReader::ReadAll(SizeT readUntil, SizeT chunkToRead, UIntPtr outAddress else if (readUntil < 1) readUntil = newPtrInfo.FileSize; - mWriter.Write(L"newosldr: physical size: ").Write(readUntil).Write("\r"); + mWriter.Write(L"newosldr: Physical size: ").Write(readUntil).Write("\r"); } if (!outAddress) diff --git a/dev/ZBA/Sources/HEL/AMD64/BootJump.S b/dev/ZBA/Sources/HEL/AMD64/BootJump.S index 2eb745d0..de474c96 100644 --- a/dev/ZBA/Sources/HEL/AMD64/BootJump.S +++ b/dev/ZBA/Sources/HEL/AMD64/BootJump.S @@ -1,8 +1,8 @@ .global rt_jump_to_address .global rt_reset_hardware -.text .text + .intel_syntax noprefix /** diff --git a/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx b/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx index 1011ce10..c5ee3fb3 100644 --- a/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx +++ b/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx @@ -185,7 +185,8 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle, handoverHdrPtr->f_HeapStart = nullptr; - while (BS->AllocatePool(EfiLoaderCode, kHandoverHeapSz, &handoverHdrPtr->f_HeapStart) != kEfiOk); + while (BS->AllocatePool(EfiLoaderCode, kHandoverHeapSz, &handoverHdrPtr->f_HeapStart) != kEfiOk) + ; handoverHdrPtr->f_VirtualSize = Descriptor[cDefaultMemoryMap].NumberOfPages; /* # of pages */ @@ -225,6 +226,23 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle, // format the disk. // ---------------------------------------------------- // + BFileReader readerBootScr(L"bootscr.sys", ImageHandle); + readerBootScr.ReadAll(0); + + Boot::BThread* loaderBootScr = nullptr; + + // ------------------------------------------ // + // If we succeed in reading the blob, then execute it. + // ------------------------------------------ // + + if (readerBootScr.Blob()) + { + loaderBootScr = new Boot::BThread(readerBootScr.Blob()); + loaderBootScr->SetName("64-bit Boot Screen DLL."); + } + + loaderBootScr->Start(handoverHdrPtr); + BFileReader readerKernel(L"newoskrnl.dll", ImageHandle); readerKernel.ReadAll(0); diff --git a/dev/ZBA/Sources/HEL/AMD64/compile_flags.txt b/dev/ZBA/Sources/HEL/AMD64/compile_flags.txt index c24c4b09..cc79d229 100644 --- a/dev/ZBA/Sources/HEL/AMD64/compile_flags.txt +++ b/dev/ZBA/Sources/HEL/AMD64/compile_flags.txt @@ -1,7 +1,7 @@ -std=c++20 -I../../../ -I../../../../Kernel --D__NEWOS_AMD64__ +-D__ZKA_AMD64__ -std=c++20 -D__x86_64__ -D__NEWOS_OTA__ diff --git a/dev/ZBA/Sources/Thread.cxx b/dev/ZBA/Sources/Thread.cxx index c13d25b9..7362e484 100644 --- a/dev/ZBA/Sources/Thread.cxx +++ b/dev/ZBA/Sources/Thread.cxx @@ -15,13 +15,10 @@ #include <Modules/CoreCG/TextRenderer.hxx> #include <CFKit/LoaderUtils.hxx> -EXTERN_C -{ +EXTERN_C{ #include <string.h> } -#define kHOTypeKernel 100 - EXTERN EfiBootServices* BS; namespace Boot @@ -53,13 +50,13 @@ namespace Boot return; } - if (optHdr->mSubsystem != kNewOSSubsystem) + if (optHdr->mSubsystem != kZKASubsystem) { - writer.Write("newosldr: Not a New OS executable.\r"); + writer.Write("newosldr: Not a ZKA Subsystem executable.\r"); return; } - writer.Write("newosldr: PE32+ executable detected (New OS Subsystem).\r"); + writer.Write("newosldr: PE32+ executable detected (ZKA Subsystem).\r"); auto numSecs = hdrPtr->mNumberOfSections; @@ -83,7 +80,7 @@ namespace Boot constexpr auto sectionForCode = ".text"; constexpr auto sectionForNewLdr = ".ldr"; - constexpr auto sectionForBSS = ".bss"; + constexpr auto sectionForBSS = ".bss"; for (SizeT sectIndex = 0; sectIndex < numSecs; ++sectIndex) { @@ -92,7 +89,7 @@ namespace Boot if (StrCmp(sectionForCode, sect->mName) == 0) { fStartAddress = (VoidPtr)((UIntPtr)loadStartAddress + optHdr->mAddressOfEntryPoint); - writer.Write("newosldr: Start Address: ").Write((UIntPtr)fStartAddress).Write("\r"); + writer.Write("newosldr: Entrypoint of DLL: ").Write((UIntPtr)fStartAddress).Write("\r"); } else if (StrCmp(sectionForBSS, sect->mName) == 0) { @@ -106,11 +103,11 @@ namespace Boot UInt32 HandoverType; }* structHandover = (struct HANDOVER_INFORMATION_STUB*)((UIntPtr)fBlob + sect->mPointerToRawData); - if (structHandover->HandoverMagic != kHandoverMagic || - structHandover->HandoverType != kHOTypeKernel) + if (structHandover->HandoverMagic != kHandoverMagic && + structHandover->HandoverType != HEL::kTypeKernel) { - cg_write_text("NEWOSLDR: INVALID HANDOVER IMAGE! ABORTING...", 40, 10, RGB(0x00, 0x00, 0x00)); - EFI::Stop(); + writer.Write("newosldr: Entrypoint of SYS: ").Write((UIntPtr)fStartAddress).Write("\r"); + cg_write_text("NEWOSLDR: NOT AN HANDOVER IMAGE...", 40, 10, RGB(0xFF, 0xFF, 0xFF)); } } @@ -149,7 +146,7 @@ namespace Boot } HEL::HandoverProc err_fn = [](HEL::HandoverInformationHeader* rcx) -> void { - cg_write_text("NEWOSLDR: INVALID IMAGE! ABORTING...", 40, 10, RGB(0x00, 0x00, 0x00)); + cg_write_text("NEWOSLDR: INVALID IMAGE! ABORTING...", 50, 10, RGB(0xFF, 0xFF, 0xFF)); EFI::Stop(); }; @@ -159,7 +156,6 @@ namespace Boot } reinterpret_cast<HEL::HandoverProc>(fStartAddress)(handover); - err_fn(handover); } const Char* BThread::GetName() diff --git a/dev/ZBA/Sources/compile_flags.txt b/dev/ZBA/Sources/compile_flags.txt index f9ca281f..18bc8512 100644 --- a/dev/ZBA/Sources/compile_flags.txt +++ b/dev/ZBA/Sources/compile_flags.txt @@ -2,7 +2,7 @@ -I../ -I../../ -I../../Kernel --D__NEWOS_AMD64__ +-D__ZKA_AMD64__ -std=c++20 -D__x86_64__ -D__NEWOS_OTA__ diff --git a/dev/ZBA/amd64-efi.make b/dev/ZBA/amd64-efi.make index 9e1fcd98..70071439 100644 --- a/dev/ZBA/amd64-efi.make +++ b/dev/ZBA/amd64-efi.make @@ -46,13 +46,14 @@ REM_FLAG=-f FLAG_ASM=-f win64 FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -mno-red-zone -D__NEWOSKRNL__ -D__NEWOSLDR__ \ -DEFI_FUNCTION_WRAPPER -I./ -I../Vendor -I../ZKA -I../ -c -nostdlib -fno-rtti -fno-exceptions \ - -std=c++20 -D__HAVE_MAHROUSS_APIS__ -D__NEWOS_AMD64__ -D__MAHROUSS__ + -std=c++20 -D__HAVE_MAHROUSS_APIS__ -D__ZKA_AMD64__ -D__MAHROUSS__ BOOT_LOADER=newosldr.exe KERNEL=newoskrnl.dll DDK=ddk.dll SCI=sci.dll CRT=ndkcrt.dll +BOOT_SCR=bootscr.sys .PHONY: invalid-recipe invalid-recipe: @@ -67,6 +68,7 @@ all: compile-amd64 $(COPY) ../ZKA/$(KERNEL) Sources/Root/$(KERNEL) $(COPY) ../SCI/$(SCI) Sources/Root/$(SCI) $(COPY) ../DDK/$(DDK) Sources/Root/$(DDK) + $(COPY) ./Modules/BootScr/$(BOOT_SCR) Sources/Root/$(BOOT_SCR) $(COPY) ../CRT/$(CRT) Sources/Root/$(CRT) $(COPY) Sources/$(BOOT_LOADER) Sources/Root/$(BOOT_LOADER) diff --git a/dev/ZKA/ArchKit/ArchKit.hxx b/dev/ZKA/ArchKit/ArchKit.hxx index ba05e243..bcaaf5f7 100644 --- a/dev/ZKA/ArchKit/ArchKit.hxx +++ b/dev/ZKA/ArchKit/ArchKit.hxx @@ -12,7 +12,7 @@ #include <FirmwareKit/Handover.hxx> -#ifdef __NEWOS_AMD64__ +#ifdef __ZKA_AMD64__ #include <HALKit/AMD64/HalPageAlloc.hxx> #include <HALKit/AMD64/Hypervisor.hxx> #include <HALKit/AMD64/Processor.hxx> diff --git a/dev/ZKA/ArchKit/compile_flags.txt b/dev/ZKA/ArchKit/compile_flags.txt index c15efc77..0fa2cfc6 100644 --- a/dev/ZKA/ArchKit/compile_flags.txt +++ b/dev/ZKA/ArchKit/compile_flags.txt @@ -4,5 +4,5 @@ -I./ -I../ -I$(HOME)/ --D__NEWOS_AMD64__ +-D__ZKA_AMD64__ -D__ED__ diff --git a/dev/ZKA/FirmwareKit/EFI/API.hxx b/dev/ZKA/FirmwareKit/EFI/API.hxx index d666bbf2..c5c9de4c 100644 --- a/dev/ZKA/FirmwareKit/EFI/API.hxx +++ b/dev/ZKA/FirmwareKit/EFI/API.hxx @@ -12,7 +12,7 @@ #include <KernelKit/MSDOS.hxx> #include <KernelKit/PE.hxx> -#define kNewOSSubsystem 17 +#define kZKASubsystem 17 #ifdef __NEWOSLDR__ // forward decl. diff --git a/dev/ZKA/FirmwareKit/EPM.hxx b/dev/ZKA/FirmwareKit/EPM.hxx index 905e7f24..ee1d1c56 100644 --- a/dev/ZKA/FirmwareKit/EPM.hxx +++ b/dev/ZKA/FirmwareKit/EPM.hxx @@ -49,7 +49,7 @@ #define kEPMMagicError "EPM??" -#ifdef __NEWOS_AMD64__ +#ifdef __ZKA_AMD64__ #define kEPMMagic kEPMMagic86 #else #ifdef __NEWOS_ARM64__ diff --git a/dev/ZKA/FirmwareKit/Handover.hxx b/dev/ZKA/FirmwareKit/Handover.hxx index 1967d6de..5c09f79b 100644 --- a/dev/ZKA/FirmwareKit/Handover.hxx +++ b/dev/ZKA/FirmwareKit/Handover.hxx @@ -43,7 +43,8 @@ namespace Kernel::HEL kTypeKernel = 100, kTypeKernelDriver = 101, kTypeRsrc = 102, - kTypeCount = 3, + kTypeInvalid = 103, + kTypeCount = 4, }; /** diff --git a/dev/ZKA/HALKit/AMD64/HalPageAlloc.cxx b/dev/ZKA/HALKit/AMD64/HalPageAlloc.cxx index 3677a1f2..27706784 100644 --- a/dev/ZKA/HALKit/AMD64/HalPageAlloc.cxx +++ b/dev/ZKA/HALKit/AMD64/HalPageAlloc.cxx @@ -9,7 +9,7 @@ #define cVMHMagic (0xDEEFD00D) #define cPaddingVMH (512) -#ifdef __NEWOS_AMD64__ +#ifdef __ZKA_AMD64__ #include <HALKit/AMD64/HalPageAlloc.hxx> #elif defined(__NEWOS_ARM64__) #include <HALKit/ARM64/HalPageAlloc.hxx> diff --git a/dev/ZKA/HALKit/compile_flags.txt b/dev/ZKA/HALKit/compile_flags.txt index 26779833..d6e35511 100644 --- a/dev/ZKA/HALKit/compile_flags.txt +++ b/dev/ZKA/HALKit/compile_flags.txt @@ -3,4 +3,4 @@ -std=c++20 -I./ -I../ --D__NEWOS_AMD64__ +-D__ZKA_AMD64__ diff --git a/dev/ZKA/KernelKit/PCI/IO-Impl-AMD64.inl b/dev/ZKA/KernelKit/PCI/IO-Impl-AMD64.inl index b0252e63..84c24620 100644 --- a/dev/ZKA/KernelKit/PCI/IO-Impl-AMD64.inl +++ b/dev/ZKA/KernelKit/PCI/IO-Impl-AMD64.inl @@ -20,7 +20,7 @@ namespace Kernel { switch (sizeof(T)) { -#ifdef __NEWOS_AMD64__ +#ifdef __ZKA_AMD64__ case 4: return HAL::In32(fPorts[index].Leak()); case 2: @@ -39,7 +39,7 @@ namespace Kernel { switch (sizeof(T)) { -#ifdef __NEWOS_AMD64__ +#ifdef __ZKA_AMD64__ case 4: HAL::Out32(fPorts[index].Leak(), value); case 2: diff --git a/dev/ZKA/Sources/CxxAbi-AMD64.cxx b/dev/ZKA/Sources/CxxAbi-AMD64.cxx index 5514336e..66fae2f5 100644 --- a/dev/ZKA/Sources/CxxAbi-AMD64.cxx +++ b/dev/ZKA/Sources/CxxAbi-AMD64.cxx @@ -4,7 +4,7 @@ ------------------------------------------- */ -#ifdef __NEWOS_AMD64__ +#ifdef __ZKA_AMD64__ #include <KernelKit/DebugOutput.hxx> #include <NewKit/CxxAbi.hxx> @@ -88,4 +88,4 @@ namespace cxxabiv1 } } // namespace cxxabiv1 -#endif // ifdef __NEWOS_AMD64__ +#endif // ifdef __ZKA_AMD64__ diff --git a/dev/ZKA/Sources/PEFCodeManager.cxx b/dev/ZKA/Sources/PEFCodeManager.cxx index 746b75eb..4a729992 100644 --- a/dev/ZKA/Sources/PEFCodeManager.cxx +++ b/dev/ZKA/Sources/PEFCodeManager.cxx @@ -24,7 +24,7 @@ namespace Kernel return kPefArch32x0; #elif defined(__NEWOS_64X0__) return kPefArch64x0; -#elif defined(__NEWOS_AMD64__) +#elif defined(__ZKA_AMD64__) return kPefArchAMD64; #elif defined(__NEWOS_PPC64__) return kPefArchPowerPC; diff --git a/dev/ZKA/Sources/PageManager.cxx b/dev/ZKA/Sources/PageManager.cxx index 868a9f7a..77dbfd32 100644 --- a/dev/ZKA/Sources/PageManager.cxx +++ b/dev/ZKA/Sources/PageManager.cxx @@ -7,11 +7,11 @@ #include <KernelKit/DebugOutput.hxx> #include <NewKit/PageManager.hxx> -#ifdef __NEWOS_AMD64__ +#ifdef __ZKA_AMD64__ #include <HALKit/AMD64/HalPageAlloc.hxx> #elif defined(__NEWOS_ARM64__) #include <HALKit/ARM64/HalPageAlloc.hxx> -#endif // ifdef __NEWOS_AMD64__ || defined(__NEWOS_ARM64__) +#endif // ifdef __ZKA_AMD64__ || defined(__NEWOS_ARM64__) //! null deref will throw (Page Zero detected, aborting app!) #define kProtectedRegionEnd (512) diff --git a/dev/ZKA/Sources/Pmm.cxx b/dev/ZKA/Sources/Pmm.cxx index 4a511c30..62015f41 100644 --- a/dev/ZKA/Sources/Pmm.cxx +++ b/dev/ZKA/Sources/Pmm.cxx @@ -11,9 +11,9 @@ #include <HALKit/ARM64/Processor.hxx> #endif // defined(__NEWOS_ARM64__) -#if defined(__NEWOS_AMD64__) +#if defined(__ZKA_AMD64__) #include <HALKit/AMD64/Processor.hxx> -#endif // defined(__NEWOS_AMD64__) +#endif // defined(__ZKA_AMD64__) namespace Kernel { diff --git a/dev/ZKA/Sources/compile_flags.txt b/dev/ZKA/Sources/compile_flags.txt index b02c5e3d..33aadad4 100644 --- a/dev/ZKA/Sources/compile_flags.txt +++ b/dev/ZKA/Sources/compile_flags.txt @@ -4,4 +4,4 @@ -I../ -I$(HOME)/ -D__FSKIT_USE_NEWFS__ --D__NEWOS_AMD64__ +-D__ZKA_AMD64__ diff --git a/dev/ZKA/amd64-efi.make b/dev/ZKA/amd64-efi.make index 3797e5ba..ad72bb00 100644 --- a/dev/ZKA/amd64-efi.make +++ b/dev/ZKA/amd64-efi.make @@ -5,7 +5,7 @@ CC = x86_64-w64-mingw32-g++ LD = x86_64-w64-mingw32-ld -CCFLAGS = -fshort-wchar -c -shared -D__NEWOS_AMD64__ -mno-red-zone -fno-rtti -fno-exceptions \ +CCFLAGS = -fshort-wchar -c -shared -D__ZKA_AMD64__ -mno-red-zone -fno-rtti -fno-exceptions \ -std=c++20 -D__NEWOS_SUPPORT_NX__ -I../Vendor -D__FSKIT_USE_NEWFS__ \ -D__NEWOSKRNL__ -D__HAVE_MAHROUSS_APIS__ -D__MAHROUSS__ -I./ -I../ -I../ZBA diff --git a/dev/ZKA/compile_flags.txt b/dev/ZKA/compile_flags.txt index 4087caba..290eeee3 100644 --- a/dev/ZKA/compile_flags.txt +++ b/dev/ZKA/compile_flags.txt @@ -3,7 +3,7 @@ -std=c++20 -I./ -I$(HOME)/ --D__NEWOS_AMD64__ +-D__ZKA_AMD64__ -I../Vendor -D__x86_64__ -D__ED__ |