-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