fixed merge conflicts from re-struct branch regarding fie renames and moves

2019-09-16 14:01:39 -07:00 · 2019-09-16 14:01:39 -07:00 · 18f0b02b58
commit 18f0b02b58
parent 6f25710ca9 c1254944ab
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -33,7 +33,7 @@ os.iso: kernel.elf
 	$(ASM) $(AFLAGS) $< -o $@

 # Building C objecets
-%.o: %.c
+core/%.o: %.c
 	$(CC) $(CFLAGS) $< -o $@

 # Running (no recipes called)