From f57e2eabe0a10c9732c83532e01654a499fb8dcf Mon Sep 17 00:00:00 2001
From: Benji Dial <benji6283@gmail.com>
Date: Mon, 21 Jun 2021 17:47:13 -0400
Subject: many, many changes; settings is broken

---
 makefile | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

(limited to 'makefile')

diff --git a/makefile b/makefile
index 8973b99..8def292 100644
--- a/makefile
+++ b/makefile
@@ -14,9 +14,11 @@ out/disk.vdi: out/disk.img
 out/disk.img: out/kernel.bin out/boot.bin out/fs
 	mkdir -p obj
 	mkfs.fat -C -f 1 -F 16 -n "PORTLAND OS" -R 129 -s 1 -S 512 obj/shadow.img 8192
+	echo -n -e '\x01\x00\x00\x00uid \x00\x00\x00\x00' > out/fs/_fstab
+	dd if=obj/shadow.img of=out/fs/_fstab bs=1 seek=4 skip=39 count=4 conv=notrunc
 	echo -n -e '\xeb\x3c' > obj/jmp.bin
-	dd if=obj/jmp.bin of=obj/shadow.img obs=2 conv=notrunc
-	dd if=out/boot.bin of=obj/shadow.img obs=1 seek=62 conv=notrunc
+	dd if=obj/jmp.bin of=obj/shadow.img bs=1 conv=notrunc
+	dd if=out/boot.bin of=obj/shadow.img bs=1 seek=62 conv=notrunc
 	dd if=out/kernel.bin of=obj/shadow.img seek=1 conv=notrunc
 	mv obj/shadow.img out/disk.img
 	mcopy -i out/disk.img -s out/fs/* ::/
@@ -24,11 +26,11 @@ out/disk.img: out/kernel.bin out/boot.bin out/fs
 clean:
 	rm -r obj out || true
 
-qemu: out/disk.img
+gdb: out/disk.img
 	gdb -x qemu.gdb
 
-bochs: out/disk.img
-	bochs -q
+ddd: out/disk.img
+	ddd --debugger 'gdb -x qemu.gdb'
 
 out/fs/bin/%: obj/%.elf
 	mkdir -p $(shell dirname $@)
@@ -40,7 +42,7 @@ out/fs/bin/%: obj/%.elf
 
 out/fs: out/fs/bin/init     out/fs/bin/highway out/fs/bin/meminfo \
         out/fs/bin/terminal out/fs/bin/hello   out/fs/bin/mkpopup \
-        out/fs/bin/dirlist  out/fs/bin/time    \
+        out/fs/bin/dirlist  out/fs/bin/time \
         out/fs/bin/filetest out/fs/bin/settings
 	touch out/fs
 	cp -r fs-skel/* out/fs/
@@ -106,7 +108,8 @@ obj/raleigh.so: obj/raleigh/runtime.po   obj/raleigh/window.po           \
                 obj/raleigh/w/vbox.po    obj/raleigh/w/entry.po          \
                 obj/raleigh/w/label.po   obj/raleigh/w/colorpicker.po    \
                 obj/raleigh/w/hbox.po    obj/raleigh/w/multicontainer.po \
-                obj/raleigh/d/dialog.po  obj/raleigh/d/saving_window.po
+                obj/raleigh/d/dialog.po  obj/raleigh/d/saving_window.po  \
+                obj/raleigh/s/text_flower.po
 	ld ${partlink} $^ -o $@
 
 obj/init.elf: obj/init/init.o obj/knob.so obj/c.rto
@@ -118,7 +121,7 @@ obj/highway.elf: obj/highway/main.o obj/highway/cmds.o obj/highway/line.o \
 	ld ${clink} $^ -o $@
 
 obj/meminfo.elf: obj/meminfo/meminfo.po obj/raleigh.so obj/libfont.so \
-                 obj/knob.so obj/cxx.rto
+                 obj/knob.so            obj/cxx.rto
 	ld ${cxxlink} $^ -o $@
 
 obj/terminal.elf: obj/terminal/main.o obj/libfont.so obj/knob.so \
@@ -136,10 +139,6 @@ obj/dirlist.elf: obj/dirlist/main.o obj/libterm.so obj/knob.so \
                  obj/c.rto
 	ld ${clink} $^ -o $@
 
-#obj/ttt.elf: obj/ttt/main.o obj/popups.so obj/libfont.so \
-#             obj/knob.so obj/c.rto
-#	ld ${clink} $^ -o $@
-
 obj/time.elf: obj/time/time.o obj/libterm.so obj/knob.so \
               obj/c.rto
 	ld ${clink} $^ -o $@
@@ -148,9 +147,8 @@ obj/filetest.elf: obj/filetest/filetest.o obj/libterm.so obj/knob.so \
                   obj/c.rto
 	ld ${clink} $^ -o $@
 
-obj/settings.elf: obj/settings/main.po  obj/settings/str_editor.po   \
-                  obj/settings/model.po obj/settings/color_editor.po \
-                  obj/settings/editor.po                             \
+obj/settings.elf: obj/settings/main.po        obj/settings/model.po \
+                  obj/settings/string_kind.po obj/settings/color_kind.po \
                   obj/raleigh.so obj/libfont.so \
                   obj/knob.so    obj/cxx.rto
 	ld ${cxxlink} $^ -o $@
\ No newline at end of file
-- 
cgit v1.2.3