diff options
| author | Amlal El Mahrouss <amlalelmahrouss@icloud.com> | 2024-03-03 11:57:21 +0000 |
|---|---|---|
| committer | Amlal El Mahrouss <amlalelmahrouss@icloud.com> | 2024-03-03 11:57:21 +0000 |
| commit | 332fab8d57aac52b9664785cbda989260962a41c (patch) | |
| tree | 861c303a27fb1d2d22be4b510aace0bdef96bfe8 /Private | |
| parent | 374d341bf0216294b58f0198dbe4ba986464563f (diff) | |
| parent | e93e0a0c548a407b7eadc8148687f626f2e26c42 (diff) | |
Merge branch 'unstable' into 'trunk'
Meta: update makefile, minor updates.
See merge request mahrouss-logic/micro-kernel!7
Diffstat (limited to 'Private')
| -rw-r--r-- | Private/NewBoot/Source/makefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Private/NewBoot/Source/makefile b/Private/NewBoot/Source/makefile index 23680c09..2d3dc777 100644 --- a/Private/NewBoot/Source/makefile +++ b/Private/NewBoot/Source/makefile @@ -9,8 +9,11 @@ LD_FLAGS=-e efi_main --subsystem=10 ASM=nasm OBJ=$(wildcard *.o) $(wildcard ../../Obj/*.obj) $(wildcard HEL/AMD64/*.obj) +REM=rm +REM_FLAG=-f + FLAG_ASM=-f win64 -FLAG_GNU=-fshort-wchar -DkBootKrnlSections=9 -D__DEBUG__ -mgeneral-regs-only -mno-red-zone -DEFI_FUNCTION_WRAPPER -I../ -I../../ -I./ -c -ffreestanding -fno-rtti -fno-exceptions -std=c++20 -D__HAVE_HCORE_APIS__ -D__HCORE__ -I./ -I$(HOME)/ +FLAG_GNU=-fshort-wchar -DkBootKrnlSections=9 -mgeneral-regs-only -mno-red-zone -DEFI_FUNCTION_WRAPPER -I../ -I../../ -I./ -c -ffreestanding -fno-rtti -fno-exceptions -std=c++20 -D__HAVE_HCORE_APIS__ -D__HCORE__ -D__BOOTLOADER__ -I./ -I$(HOME)/ .PHONY: invalid-recipe invalid-recipe: @@ -19,7 +22,7 @@ invalid-recipe: .PHONY: bootloader-amd64 bootloader-amd64: $(CC_GNU) $(FLAG_GNU) HEL/AMD64/*.cxx *.cxx - $(ASM) $(FLAG_ASM) HEl/AMD64/AMD64-VirtualMemory.asm + $(ASM) $(FLAG_ASM) HEL/AMD64/AMD64-VirtualMemory.asm $(LD_GNU) $(OBJ) $(LD_FLAGS) -o HCoreLdr.exe cp HCoreLdr.exe CDROM/EFI/BOOT/BOOTX64.EFI cp HCoreLdr.exe CDROM/EFI/BOOT/HCORELDR.EFI @@ -35,4 +38,4 @@ download-edk: .PHONY: clean clean: - rm -f $(OBJ) HCoreLdr.exe OVMF.fd + $(REM) $(REM_FLAG) $(OBJ) HCoreLdr.exe HCoreKrnl.exe OVMF.fd |