summaryrefslogtreecommitdiff
path: root/makefile
diff options
context:
space:
mode:
authorBenji Dial <benji6283@gmail.com>2021-03-08 14:46:19 -0500
committerBenji Dial <benji6283@gmail.com>2021-03-08 14:46:19 -0500
commit8221fd5451f094defa9866f98026b74a969f7693 (patch)
tree9f0e9595fd15bdecbe667f823deded7428547b44 /makefile
parent1a5ece4f52ef17c7c868e95eb26e98137d5cab6f (diff)
downloadportland-os-8221fd5451f094defa9866f98026b74a969f7693.tar.gz
resizable widgets, default widget implementation for some functions, reimplementing meminfo in raleigh
Diffstat (limited to 'makefile')
-rw-r--r--makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/makefile b/makefile
index cea7ddd..9fb6cd1 100644
--- a/makefile
+++ b/makefile
@@ -103,9 +103,10 @@ 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/widget.po obj/raleigh/util.po \
obj/raleigh/w/padding.po obj/raleigh/w/button.po \
- obj/raleigh/w/vbox.po obj/raleigh/w/entry.po
+ obj/raleigh/w/vbox.po obj/raleigh/w/entry.po \
+ obj/raleigh/w/label.po
ld ${partlink} $^ -o $@
obj/init.elf: obj/init/init.o obj/knob.so obj/c.rto
@@ -116,9 +117,9 @@ obj/highway.elf: obj/highway/main.o obj/highway/cmds.o obj/highway/line.o \
obj/c.rto
ld ${clink} $^ -o $@
-obj/meminfo.elf: obj/meminfo/meminfo.o obj/popups.so obj/libfont.so \
- obj/knob.so obj/c.rto
- ld ${clink} $^ -o $@
+obj/meminfo.elf: obj/meminfo/meminfo.po obj/raleigh.so obj/popups.so \
+ obj/libfont.so obj/knob.so obj/cxx.rto
+ ld ${cxxlink} $^ -o $@
obj/terminal.elf: obj/terminal/main.o obj/libfont.so obj/knob.so \
obj/c.rto