os-k-team/os-k
os-k-team
/
os-k
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'BetterMake'

This commit is contained in:
Adrien Bourmault 2019-12-15 22:57:59 +01:00
parent b61ce355dd 08838d2d7d
commit fcf6e745a7
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -22,7 +22,7 @@
# along with OS/K. If not, see <https://www.gnu.org/licenses/>. # # 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 .DELETE_ON_ERROR: $(BINDIR)/kaleid
.DEFAULT_GOAL := all .DEFAULT_GOAL := all
@ -270,18 +270,22 @@ all :
@make OS/K -j 8 @make OS/K -j 8
## QEMU/DEBUG RELATED ## QEMU/DEBUG RELATED
testkvm: all installonimage test: all installonimage
@qemu-system-x86_64 -vga std -enable-kvm -soundhw pcspk -s \ @qemu-system-x86_64 -vga std -enable-kvm -soundhw pcspk -cpu host -s \
-rtc base=localtime -m $(ram) -hda $(installdisk) \ -rtc base=localtime -m $(ram) -hda $(installdisk) \
-d cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log & -d cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log &
run: test run: test
test: all installonimage testnokvm: all installonimage
@qemu-system-x86_64 -vga std -cpu $(cpu) -soundhw pcspk -s \ @qemu-system-x86_64 -vga std -cpu $(cpu) -soundhw pcspk -s \
-rtc base=localtime -m $(ram) -hda $(installdisk) \ -rtc base=localtime -m $(ram) -hda $(installdisk) \
-d cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log & -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 test32: all installonimage
@qemu-system-i386 -m $(ram) -hda $(installdisk) -d \ @qemu-system-i386 -m $(ram) -hda $(installdisk) -d \