X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2FMakefile;h=972f72fe5e0e2afcc4119ff7c05eaae3ae821d3b;hb=507f19941f45bca7c1de783a394f56b15f10be4d;hp=f0f932169b2952060b36e1c96aaad88c1367941c;hpb=f0c407e7d468bc5acfd8d436be7f79f6e6248421;p=tpg%2Facess2.git diff --git a/Usermode/Applications/axwin3_src/WM/Makefile b/Usermode/Applications/axwin3_src/WM/Makefile index f0f93216..972f72fe 100644 --- a/Usermode/Applications/axwin3_src/WM/Makefile +++ b/Usermode/Applications/axwin3_src/WM/Makefile @@ -3,15 +3,17 @@ -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 utf-8.o -OBJ += wm.o wm_input.o wm_render.o wm_render_text.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 +OBJ += renderers/richtext.o # TODO: Move to a lower makefile OBJ += renderers/widget.o OBJ += renderers/widget/button.o @@ -19,6 +21,7 @@ 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