X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2FMakefile;h=1d674507c67ff60197f2d564df2b1729616a203d;hb=6020775ea4718e1f85c4b81f82caadeb81be28ac;hp=0e501e03c85e572136c439d36e65eb09d83b38e8;hpb=cee7338738f1a68c7eb7b956cab8d9fb83f95714;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/WM/Makefile b/Usermode/Applications/axwin3_src/WM/Makefile
index 0e501e03..1d674507 100644
--- a/Usermode/Applications/axwin3_src/WM/Makefile
+++ b/Usermode/Applications/axwin3_src/WM/Makefile
@@ -3,16 +3,25 @@
 -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 := 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 wm_hotkeys.o
 OBJ += decorator.o
-OBJ += renderer_passthru.o
-OBJ += renderer_background.o
-OBJ += renderer_widget.o renderer_widget_decorator.o
-OBJ += renderer_menu.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