X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2FMakefile;h=1112ffeae86bd42a71516e8ed80ab4140b26e9d1;hb=6a99a6d70179161964d47de9a825fd61e8445b86;hp=9bd94a0cb1f544bbea40d10f3d113b2b500d789b;hpb=c90f683ef8d3dde9db5b78feebe5508ca3f84ff3;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/WM/Makefile b/Usermode/Applications/axwin3_src/WM/Makefile
index 9bd94a0c..1112ffea 100644
--- a/Usermode/Applications/axwin3_src/WM/Makefile
+++ b/Usermode/Applications/axwin3_src/WM/Makefile
@@ -2,16 +2,28 @@
 
 -include ../../Makefile.cfg
 
-# Some evil lazy evaulation, hopefully it works
-CPPFLAGS += -I include/
+CPPFLAGS += -I include/ -I ../include/
+CFLAGS += -std=gnu99
 
 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_widget.o
+OBJ := main.o input.o video.o ipc.o image.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