X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2FMakefile;h=1112ffeae86bd42a71516e8ed80ab4140b26e9d1;hb=8e1f78107cc9aa137de29e0c9df3a1fccb483b67;hp=60c3920d00665da24540750a047995fb618ead5c;hpb=5b6ff5b0698142d4f17a693c0d340df10b375926;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/WM/Makefile b/Usermode/Applications/axwin3_src/WM/Makefile
index 60c3920d..1112ffea 100644
--- a/Usermode/Applications/axwin3_src/WM/Makefile
+++ b/Usermode/Applications/axwin3_src/WM/Makefile
@@ -3,15 +3,27 @@
 -include ../../Makefile.cfg
 
 CPPFLAGS += -I include/ -I ../include/
+CFLAGS += -std=gnu99
 
 DIR := Apps/AxWin/3.0
 BIN := AxWinWM
 OBJ := main.o input.o video.o ipc.o image.o
-OBJ += wm.o wm_input.o wm_render.o wm_render_text.o
-OBJ += renderer_classes.o renderer_passthru.o renderer_background.o
-OBJ += renderer_widget.o renderer_widget_decorator.o
+OBJ += wm.o wm_input.o wm_render.o wm_render_text.o wm_hotkeys.o
+OBJ += decorator.o
+OBJ += renderers/framebuffer.o
+OBJ += renderers/background.o
+OBJ += renderers/menu.o
+OBJ += renderers/richtext.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
+OBJ += renderers/widget/subwin.o
 
-LDFLAGS += -limage_sif -luri -lnet
+LDFLAGS += -limage_sif -luri -lnet -lunicode
 
 -include ../../Makefile.tpl