From 76d3431d89793ab13e1996ef4d3c6ec7c79acbc7 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Thu, 11 May 2017 21:34:39 -0600
Subject: [PATCH] Fix expansion

---
 x86_64/disk.asm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/x86_64/disk.asm b/x86_64/disk.asm
index af74f86..1ad1923 100644
--- a/x86_64/disk.asm
+++ b/x86_64/disk.asm
@@ -12,10 +12,14 @@ align 512, db 0
 startup_end:
 
 kernel_file:
-  incbin "build/kernel"
+  %defstr KERNEL_STR %[KERNEL]
+  incbin KERNEL_STR
   align 512, db 0
 .end:
 .length equ kernel_file.end - kernel_file
 .length_sectors equ .length / 512
 
-incbin "build/filesystem.bin"
+%ifdef FILESYSTEM
+    %defstr FILESYSTEM_STR %[FILESYSTEM]
+    incbin FILESYSTEM_STR
+%endif
-- 
GitLab