mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-11-01 15:08:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makefile: qemu targets and fixes

Browse Source
This commit is contained in:
Matheus
2023-04-08 01:56:25 -03:00
parent 4669717305
commit 2f8e93faa3
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+10 -3
View File
@@ -2,6 +2,7 @@ ISODIR=$(shell pwd)/iso
ISO=astral.iso ISO=astral.iso
LIMINEDIR=$(shell pwd)/host-pkgs/limine/usr/local/share/limine/ LIMINEDIR=$(shell pwd)/host-pkgs/limine/usr/local/share/limine/
KERNEL=pkgs/astral/boot/astral KERNEL=pkgs/astral/boot/astral
QEMUFLAGS=-cdrom $(ISO) -m 2G -smp cpus=2 -monitor stdio -debugcon file:/dev/stdout -serial file:/dev/stdout # hacky but works :')
.PHONY: all kernel clean clean-kernel iso .PHONY: all kernel clean clean-kernel iso
@@ -20,9 +21,9 @@ $(ISO): limine.cfg liminebg.bmp $(KERNEL)
xorriso -as mkisofs -b limine-cd.bin -no-emul-boot -boot-load-size 4 -boot-info-table --efi-boot limine-cd-efi.bin -efi-boot-part --efi-boot-image --protective-msdos-label $(ISODIR) -o $(ISO) xorriso -as mkisofs -b limine-cd.bin -no-emul-boot -boot-load-size 4 -boot-info-table --efi-boot limine-cd-efi.bin -efi-boot-part --efi-boot-image --protective-msdos-label $(ISODIR) -o $(ISO)
kernel: kernel:
rm builds/astral.configured rm -f builds/astral.configured
rm builds/astral.installed rm -f builds/astral.installed
rm builds/astral.built rm -f builds/astral.built
./jinx build astral ./jinx build astral
clean-kernel: clean-kernel:
@@ -32,3 +33,9 @@ clean:
make clean-kernel make clean-kernel
./jinx clean ./jinx clean
rm jinx rm jinx
run:
qemu-system-x86_64 $(QEMUFLAGS)
run-kvm:
qemu-system-x86_64 $(QEMUFLAGS) -enable-kvm -cpu host
kernel-src/Makefile
+1 -1
View File
@@ -5,7 +5,7 @@ TARGET=x86-64
INCDIR=$(shell pwd)/include INCDIR=$(shell pwd)/include
ARCHDIR=$(shell pwd)/arch/$(TARGET)/ ARCHDIR=$(shell pwd)/arch/$(TARGET)/
LDFLAGS=-ffreestanding -nostdlib -lgcc -Wl,-T,"$(ARCHDIR)/kernel.ld" -debug LDFLAGS=-ffreestanding -nostdlib -lgcc -Wl,-T,"$(ARCHDIR)/kernel.ld" -debug
CFLAGS=-ffreestanding -mcmodel=kernel -O2 -mno-red-zone -mno-mmx -mno-sse -mno-sse2 -nostdlib -nostdinc -I "${INCDIR}" CFLAGS=-ffreestanding -mcmodel=kernel -O2 -mno-red-zone -mno-mmx -mno-sse -mno-sse2 -nostdlib -I "${INCDIR}"
ASFLAGS=-felf64 ASFLAGS=-felf64
astral: $(OBJS) astral: $(OBJS)