Usermode/AxWin3 - Bugfixing rendering/layout issues

[tpg/acess2.git] / Usermode / Applications / axwin3_src / WM / Makefile

diff --git a/Usermode/Applications/axwin3_src/WM/Makefile b/Usermode/Applications/axwin3_src/WM/Makefile
index 9bd94a0..60669b7 100644 (file)
--- a/Usermode/Applications/axwin3_src/WM/Makefile
+++ b/Usermode/Applications/axwin3_src/WM/Makefile
@@ -2,14 +2,22 @@
 
 -include ../../Makefile.cfg
 
-# Some evil lazy evaulation, hopefully it works
-CPPFLAGS += -I include/
+CPPFLAGS += -I include/ -I ../include/
 
 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
+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 renderers/widget/widget_decorator.o
+OBJ += renderers/widget/button.o
+OBJ += renderers/widget/image.o
+OBJ += renderers/widget/disptext.o
+OBJ += renderers/widget/textinput.o
 
 LDFLAGS += -limage_sif -luri -lnet