-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 += 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.o
OBJ += renderers/widget/button.o
OBJ += renderers/widget/image.o
OBJ += renderers/widget/disptext.o