Merge branch 'master' of ssh://git.javalsai.tuxcord.net:1022/deadvey/crawos

.gitignore

@@ -1 +1,2 @@
 *.swp
+disk-images/*

Makefile

@@ -4,6 +4,11 @@ SRC_DIR=source
 BUILD_DIR=disk_images
 DATA_DIR=data
 
+# CD image
+cdrom: $(BUILD_DIR)/crawos.iso
+$(BUILD_DIR)/crawos.iso: floppy_image
+	mkisofs -quiet -V 'CRAWOS' -input-charset iso8859-1 -o disk_images/crawos.iso -b crawos.img disk_images/
+
 # Floppy image
 # Fat12
 floppy_image: $(BUILD_DIR)/crawos.img
@@ -14,6 +19,7 @@ $(BUILD_DIR)/crawos.img: bootloader kernel
 	mcopy -i $(BUILD_DIR)/crawos.img $(BUILD_DIR)/kernel.bin "::kernel.bin" # Put kernel.bin inside the disk image
 	for filename in $(DATA_DIR)/*; do mcopy -i $(BUILD_DIR)/crawos.img $$filename "::/$$(echo $$filename | xargs -n 1 basename)"; done
 
+
 # Bootloader
 bootloader: $(BUILD_DIR)/boot.bin
 $(BUILD_DIR)/boot.bin: