diff options
| author | Amlal EL Mahrouss <amlalelmahrouss@icloud.com> | 2024-06-30 05:06:48 +0200 |
|---|---|---|
| committer | Amlal EL Mahrouss <amlalelmahrouss@icloud.com> | 2024-06-30 05:06:48 +0200 |
| commit | ffa1c9bd15768cbc5f176935e0e6d72e97c3e0ba (patch) | |
| tree | ff00027cb4648a340b31096535fc4d58baf72c05 /Boot | |
| parent | 8d40572607dabd4de34e7a6881bed8af9680a5c2 (diff) | |
amd64-efi.make: Fix makefile: Add necessary macros and detect windows
correctly.
DebugOutput.hpp: Use default destructor for TerminalDevice, rename
NUMBERS to cNumbers.
NewFS.cxx/ProcessScheduler.hxx: Just code improvements here.
Signed-off-by: Amlal EL Mahrouss <amlalelmahrouss@icloud.com>
Diffstat (limited to 'Boot')
| -rw-r--r-- | Boot/amd64-efi.make | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Boot/amd64-efi.make b/Boot/amd64-efi.make index 7439ebf3..2bbe2a2c 100644 --- a/Boot/amd64-efi.make +++ b/Boot/amd64-efi.make @@ -12,12 +12,12 @@ ADD_FILE=touch COPY=cp HTTP_GET=wget -# Select this for UNIX distributions -ifneq ($(shell uname), CYGWIN_NT-10.0-19045) -EMU=qemu-system-x86_64 +# Select this for Windows. +ifneq ($(findstring CYGWIN_NT-10.0,$(shell uname)), ) +EMU=qemu-system-x86_64w.exe else # this for NT distributions -EMU=qemu-system-x86_64w.exe +EMU=qemu-system-x86_64 endif ifeq ($(NEWS_MODEL), ) @@ -50,7 +50,7 @@ REM_FLAG=-f FLAG_ASM=-f win64 FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -mno-red-zone -D__KERNEL__ -D__NEWBOOT__ \ -DEFI_FUNCTION_WRAPPER -I./ -I../Kernel -I./ -c -nostdlib -fno-rtti -fno-exceptions \ - -std=c++20 -D__HAVE_MAHROUSS_APIS__ -D__MAHROUSS__ -D__BOOTLOADER__ -I./ + -std=c++20 -D__HAVE_MAHROUSS_APIS__ -D__NEWOS_AMD64__ -D__MAHROUSS__ -D__BOOTLOADER__ -I./ BOOT_LOADER=newosldr.exe KERNEL=newoskrnl.exe |