Allow compiling both livedisk and harddrive

x86_64/harddrive.asm

@@ -18,4 +18,4 @@ kernel_file:
 .length equ kernel_file.end - kernel_file
 .length_sectors equ .length / 512
 
-;incbin "build/userspace/filesystem.bin"
+incbin "build/filesystem.bin"

x86_64/livedisk.asm

+%include "bootsector.asm"
+
+startup_start:
+%ifdef ARCH_i386
+    %include "startup-i386.asm"
+%endif
+
+%ifdef ARCH_x86_64
+    %include "startup-x86_64.asm"
+%endif
+align 512, db 0
+startup_end:
+
+kernel_file:
+  incbin "build/kernel/kernel_live"
+  align 512, db 0
+.end:
+.length equ kernel_file.end - kernel_file
+.length_sectors equ .length / 512