diff options
| author | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2024-04-26 15:48:09 +0200 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2024-04-26 15:48:09 +0200 |
| commit | 03a0fee13445aeb95f01d64409e5304b8e97b31c (patch) | |
| tree | 3a7d86868f7033c1c08c1e5fabd9db4144e26afc /Private/NewBoot/Source/makefile | |
| parent | 313c303fab092b1c45e615f960826375e7eef093 (diff) | |
MHR-16: Fix NewBoot bug due to terrible code.
Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Diffstat (limited to 'Private/NewBoot/Source/makefile')
| -rw-r--r-- | Private/NewBoot/Source/makefile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Private/NewBoot/Source/makefile b/Private/NewBoot/Source/makefile index 8306f844..f3a292c5 100644 --- a/Private/NewBoot/Source/makefile +++ b/Private/NewBoot/Source/makefile @@ -28,7 +28,13 @@ EMU_FLAGS=-net none -smp 4 -m 8G -M q35 -bios OVMF.fd -device piix3-ide,id=ide - LD_FLAGS=-e Main --subsystem=10 +ifeq ($(NEWS_STANDLONE), ) OBJ=*.o ../../Objects/*.obj +else +RESCMD=$(WINDRES) BootloaderRsrc.rsrc -O coff -o BootloaderRsrc.o +STANDALONE_MACRO=-D__STANDALONE__ +OBJ=*.o +endif REM=rm REM_FLAG=-f @@ -60,8 +66,8 @@ endif .PHONY: compile-amd64 compile-amd64: - # $(WINDRES) BootloaderRsrc.rsrc -O coff -o BootloaderRsrc.o - $(CC_GNU) $(NEWOS_MODEL) $(FLAG_GNU) $(DEBUG) $(wildcard HEL/AMD64/*.cxx) $(wildcard HEL/AMD64/*.S) $(wildcard *.cxx) + $(RESCMD) + $(CC_GNU) $(NEWOS_MODEL) $(STANDALONE_MACRO) $(FLAG_GNU) $(DEBUG) $(wildcard HEL/AMD64/*.cxx) $(wildcard HEL/AMD64/*.S) $(wildcard *.cxx) .PHONY: run-efi-amd64 run-efi-amd64: |