X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2FMakefile;h=f0f932169b2952060b36e1c96aaad88c1367941c;hb=f0c407e7d468bc5acfd8d436be7f79f6e6248421;hp=83544130541643f6a3491baca2d83c57281202f2;hpb=7f1cbeafb4acc13d0cc7c11ac47df3efe473c106;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/WM/Makefile b/Usermode/Applications/axwin3_src/WM/Makefile
index 83544130..f0f93216 100644
--- a/Usermode/Applications/axwin3_src/WM/Makefile
+++ b/Usermode/Applications/axwin3_src/WM/Makefile
@@ -6,10 +6,19 @@ CPPFLAGS += -I include/ -I ../include/
 
 DIR := Apps/AxWin/3.0
 BIN := AxWinWM
-OBJ := main.o wm.o input.o video.o ipc.o
-OBJ += messageio.o
-OBJ += renderer_classes.o renderer_passthru.o renderer_background.o
-OBJ += renderer_widget.o renderer_widget_decorator.o
+OBJ := main.o input.o video.o ipc.o image.o utf-8.o
+OBJ += wm.o wm_input.o wm_render.o wm_render_text.o
+OBJ += decorator.o
+OBJ += renderers/passthru.o
+OBJ += renderers/background.o
+OBJ += renderers/menu.o
+# TODO: Move to a lower makefile
+OBJ += renderers/widget.o
+OBJ += renderers/widget/button.o
+OBJ += renderers/widget/image.o
+OBJ += renderers/widget/disptext.o
+OBJ += renderers/widget/textinput.o
+OBJ += renderers/widget/spacer.o
 
 LDFLAGS += -limage_sif -luri -lnet