From 76e39eac8cee2175ec62a191f7c91ca53857e80c Mon Sep 17 00:00:00 2001
From: Benji Dial <benji6283@gmail.com>
Date: Fri, 5 Mar 2021 18:07:48 -0500
Subject: more raleigh, including button and vbox widgets

---
 makefile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'makefile')

diff --git a/makefile b/makefile
index 83c1013..d03c43d 100644
--- a/makefile
+++ b/makefile
@@ -1,6 +1,6 @@
 kgccargs = -Wall -Wsuggest-attribute=pure -Wsuggest-attribute=const -m32 -mno-sse -Og -ggdb -ffreestanding -fno-asynchronous-unwind-tables -fno-pic -Isrc/shared/include -Isrc/lib
 ugccargs = ${kgccargs} -Isrc/user/include
-ugppargs = ${ugccargs} -fno-rtti -Isrc/user/include/cxx
+ugppargs = ${ugccargs} -fno-rtti -fno-exceptions -Isrc/user/include/cxx
 nasmargs = -f elf32
 partlink = -r -m elf_i386
 clink = -T src/user/runtimes/c/elf.ld
@@ -102,9 +102,10 @@ obj/libfont.so: obj/libfont/bdf.o obj/libfont/pbf.o obj/libfont/fonts.o \
 obj/popups.so: obj/popups/info.o obj/popups/popup.o
 	ld ${partlink} $^ -o $@
 
-obj/raleigh.so: obj/raleigh/runtime.po obj/raleigh/window.po \
-                obj/raleigh/w/label.po obj/raleigh/util.po   \
-                obj/raleigh/w/padding.po
+obj/raleigh.so: obj/raleigh/runtime.po   obj/raleigh/window.po \
+                obj/raleigh/w/label.po   obj/raleigh/util.po   \
+                obj/raleigh/w/padding.po obj/raleigh/w/button.po \
+                obj/raleigh/w/vbox.po
 	ld ${partlink} $^ -o $@
 
 obj/init.elf: obj/init/init.o obj/knob.so obj/c.rto
@@ -150,6 +151,6 @@ obj/mdemo.elf: obj/mdemo/main.o obj/popups.so obj/libfont.so \
                obj/knob.so      obj/c.rto
 	ld ${clink} $^ -o $@
 
-obj/rhello.elf: obj/rhello/main.po obj/raleigh.so obj/libfont.so \
-                obj/knob.so obj/cxx.rto
+obj/rhello.elf: obj/rhello/main.po obj/raleigh.so obj/popups.so \
+                obj/libfont.so     obj/knob.so    obj/cxx.rto
 	ld ${cxxlink} $^ -o $@
\ No newline at end of file
-- 
cgit v1.2.3