X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2FMakefile;h=f0f932169b2952060b36e1c96aaad88c1367941c;hb=3ae2c079ea44ea7a8fb1a65e7b9ff5d76f3f4c24;hp=69c99b22a63b445fe19717d81651271032a27cc6;hpb=52508b805ef1512b016b74461f080411cf076088;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/WM/Makefile b/Usermode/Applications/axwin3_src/WM/Makefile
index 69c99b22..f0f93216 100644
--- a/Usermode/Applications/axwin3_src/WM/Makefile
+++ b/Usermode/Applications/axwin3_src/WM/Makefile
@@ -2,13 +2,23 @@
 
 -include ../../Makefile.cfg
 
-CPPFLAGS += -I include/
+CPPFLAGS += -I include/ -I ../include/
 
-DIR := Apps/AxWin/2.0
+DIR := Apps/AxWin/3.0
 BIN := AxWinWM
-OBJ := main.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 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