Merge remote-tracking branch 'upstream/master'

zment4 · May 5, 2021 · c9ab0ff · c9ab0ff
2 parents 5834719 + c82d2d1
commit c9ab0ff
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -63,20 +63,20 @@ kernel: $(KERNEL_OBJS)
 
 img: dirs bootsect kernel
 	dd if=/dev/zero of=$(IMG) bs=512 count=2880
-	dd if=./bin/$(BOOTSECT) of=boot.img conv=notrunc bs=512 seek=0 count=1
-	dd if=./bin/$(KERNEL) of=boot.img conv=notrunc bs=512 seek=1 count=2048
+	dd if=./bin/$(BOOTSECT) of=$(IMG) conv=notrunc bs=512 seek=0 count=1
+	dd if=./bin/$(KERNEL) of=$(IMG) conv=notrunc bs=512 seek=1 count=2048
 
 qemu-mac: img
-	qemu-system-i386 -drive format=raw,file=boot.img -d cpu_reset -monitor stdio -device sb16 -audiodev coreaudio,id=coreaudio,out.frequency=48000,out.channels=2,out.format=s32  -machine pcspk-audiodev=dsound
+	qemu-system-i386 -drive format=raw,file=boot.img -d cpu_reset -monitor stdio -device sb16 -audiodev coreaudio,id=coreaudio,out.frequency=48000,out.channels=2,out.format=s32  -machine pcspk-audiodev=coresound
 
 qemu-pulse: img
-	qemu-system-i386 -drive format=raw,file=boot.img -d cpu_reset -monitor stdio -device sb16 -audiodev pulseaudio,id=pulseaudio,out.frequency=48000,out.channels=2,out.format=s32  -machine pcspk-audiodev=dsound
+	qemu-system-i386 -drive format=raw,file=boot.img -d cpu_reset -monitor stdio -device sb16 -audiodev pulseaudio,id=pulseaudio,out.frequency=48000,out.channels=2,out.format=s32  -machine pcspk-audiodev=pulseaudio
 
 qemu-sdl: img
-	qemu-system-i386 -display sdl -drive format=raw,file=boot.img -d cpu_reset -monitor stdio -audiodev sdl,id=sdl,out.frequency=48000,out.channels=2,out.format=s32 -device sb16,audiodev=sdl  -machine pcspk-audiodev=dsound
+	qemu-system-i386 -display sdl -drive format=raw,file=boot.img -d cpu_reset -monitor stdio -audiodev sdl,id=sdl,out.frequency=48000,out.channels=2,out.format=s32 -device sb16,audiodev=sdl  -machine pcspk-audiodev=sdl
 
 qemu-no-audio: img
-	qemu-system-i386 -drive format=raw,file=boot.img -d cpu_reset -monitor stdio
+	qemu-system-i386 -drive format=raw,file=$(IMG) -d cpu_reset -monitor stdio
 
 qemu-win: img
 	qemu-system-i386 -display sdl -drive format=raw,file=boot.img -d cpu_reset -monitor stdio -audiodev dsound,id=dsound -device sb16,audiodev=dsound -machine pcspk-audiodev=dsound