mirror of
https://gitlab.os-k.eu/os-k-team/os-k.git
synced 2023-08-25 14:03:10 +02:00
Merge branch 'BetterMake'
This commit is contained in:
commit
fcf6e745a7
12
Makefile
12
Makefile
@ -22,7 +22,7 @@
|
||||
# along with OS/K. If not, see <https://www.gnu.org/licenses/>. #
|
||||
#=----------------------------------------------------------------------------=#
|
||||
|
||||
.PHONY: all test test32 debug gdb installonimage dust clean OS/K run
|
||||
.PHONY: all test testnokvm testnosnd test32 debug gdb installonimage dust clean OS/K run
|
||||
.DELETE_ON_ERROR: $(BINDIR)/kaleid
|
||||
.DEFAULT_GOAL := all
|
||||
|
||||
@ -270,18 +270,22 @@ all :
|
||||
@make OS/K -j 8
|
||||
## QEMU/DEBUG RELATED
|
||||
|
||||
testkvm: all installonimage
|
||||
@qemu-system-x86_64 -vga std -enable-kvm -soundhw pcspk -s \
|
||||
test: all installonimage
|
||||
@qemu-system-x86_64 -vga std -enable-kvm -soundhw pcspk -cpu host -s \
|
||||
-rtc base=localtime -m $(ram) -hda $(installdisk) \
|
||||
-d cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log &
|
||||
|
||||
run: test
|
||||
|
||||
test: all installonimage
|
||||
testnokvm: all installonimage
|
||||
@qemu-system-x86_64 -vga std -cpu $(cpu) -soundhw pcspk -s \
|
||||
-rtc base=localtime -m $(ram) -hda $(installdisk) \
|
||||
-d cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log &
|
||||
|
||||
testnosnd: all installonimage
|
||||
@qemu-system-x86_64 -vga std -enable-kvm -cpu host -s \
|
||||
-rtc base=localtime -m $(ram) -hda $(installdisk) \
|
||||
-d cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log &
|
||||
|
||||
test32: all installonimage
|
||||
@qemu-system-i386 -m $(ram) -hda $(installdisk) -d \
|
||||
|
Loading…
Reference in New Issue
Block a user