diff options
| author | Benji Dial <benji6283@gmail.com> | 2021-03-11 22:00:22 -0500 |
|---|---|---|
| committer | Benji Dial <benji6283@gmail.com> | 2021-03-11 22:00:22 -0500 |
| commit | 5fcf57739e68a8b5053e03778aaee0eed445babd (patch) | |
| tree | e7a8bab18668d112e58b1b48190195035c71fa8a /makefile | |
| parent | 0f2398d1f622cce37925f52d978d92e6cce1c7a9 (diff) | |
| download | portland-os-5fcf57739e68a8b5053e03778aaee0eed445babd.tar.gz | |
settings editor, and lots of changes in service of that
Diffstat (limited to 'makefile')
| -rw-r--r-- | makefile | 50 |
1 files changed, 24 insertions, 26 deletions
@@ -5,6 +5,7 @@ nasmargs = -f elf32 partlink = -r -m elf_i386 clink = -T src/user/runtimes/c/elf.ld cxxlink = ${clink} src/user/runtimes/cxx/extra.ld +asmlink = -T src/user/runtimes/asm/elf.ld out/disk.vdi: out/disk.img rm out/disk.vdi || true @@ -39,8 +40,8 @@ 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/ttt out/fs/bin/time \ - out/fs/bin/filetest out/fs/bin/mdemo out/fs/bin/rhello + 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/ @@ -99,15 +100,13 @@ obj/libfont.so: obj/libfont/bdf.o obj/libfont/pbf.o obj/libfont/fonts.o \ obj/libfont/filist.o ld ${partlink} $^ -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/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/label.po obj/raleigh/w/colorpicker.po \ - obj/raleigh/w/hbox.po obj/raleigh/w/multicontainer.po +obj/raleigh.so: obj/raleigh/runtime.po obj/raleigh/window.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/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 ld ${partlink} $^ -o $@ obj/init.elf: obj/init/init.o obj/knob.so obj/c.rto @@ -118,8 +117,8 @@ 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.po obj/raleigh.so obj/popups.so \ - obj/libfont.so obj/knob.so obj/cxx.rto +obj/meminfo.elf: obj/meminfo/meminfo.po obj/raleigh.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 \ @@ -127,19 +126,19 @@ obj/terminal.elf: obj/terminal/main.o obj/libfont.so obj/knob.so \ ld ${clink} $^ -o $@ obj/hello.elf: obj/hello/hello.ao - ld ${clink} $^ -o $@ + ld ${asmlink} $^ -o $@ -obj/mkpopup.elf: obj/mkpopup/main.o obj/popups.so obj/libfont.so \ - obj/knob.so obj/c.rto - ld ${clink} $^ -o $@ +obj/mkpopup.elf: obj/mkpopup/main.po obj/raleigh.so obj/libfont.so \ + obj/knob.so obj/cxx.rto + ld ${cxxlink} $^ -o $@ 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/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 @@ -149,10 +148,9 @@ obj/filetest.elf: obj/filetest/filetest.o obj/libterm.so obj/knob.so \ obj/c.rto ld ${clink} $^ -o $@ -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/popups.so \ - obj/libfont.so obj/knob.so obj/cxx.rto +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/raleigh.so obj/libfont.so \ + obj/knob.so obj/cxx.rto ld ${cxxlink} $^ -o $@
\ No newline at end of file |