X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin3_src%2FWM%2FMakefile;h=4150e9457341199044f591a969d424e251729b47;hb=6457e97e47fa29a23975daf853a3c032ce6650ef;hp=60c3920d00665da24540750a047995fb618ead5c;hpb=5b6ff5b0698142d4f17a693c0d340df10b375926;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin3_src/WM/Makefile b/Usermode/Applications/axwin3_src/WM/Makefile
index 60c3920d..4150e945 100644
--- a/Usermode/Applications/axwin3_src/WM/Makefile
+++ b/Usermode/Applications/axwin3_src/WM/Makefile
@@ -3,21 +3,51 @@
 -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 += renderer_classes.o renderer_passthru.o renderer_background.o
-OBJ += renderer_widget.o renderer_widget_decorator.o
+OBJ += wm.o wm_input.o wm_render.o wm_render_text.o wm_hotkeys.o
+OBJ += decorator.o
+OBJ += renderers/framebuffer.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
+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
+PNGIMAGES := toolbar_new.png
+
+LDFLAGS += -limage_sif -luri -lnet -lunicode
+
+IMG2SIF = ../../../../Tools/img2sif
 
 -include ../../Makefile.tpl
 
+.PHONY: install_resources
+
+install: install_resources
+
 #all: resources/LogoSmall.sif.res.h
 
 %.res.h: % Makefile
 	echo "#define RESOURCE_$(notdir $<) \\"| sed -e 's/\./_/g' > $@
 	base64 $< | sed -e 's/.*/"&"\\/' >> $@
 	echo "" >> $@
+
+$(IMG2SIF):
+	$(MAKE) -C $(dir $(IMG2SIF)) img2sif
+
+install_%.sif: resources/%.png
+	@echo img2sif resources/$*.png
+	@$(IMG2SIF) resources/$*.png resources/.$*.sif
+	@$(xCP) resources/.$*.sif $(DISTROOT)/$(DIR)/$*.sif
+
+install_resources: $(IMG2SIF) $(addprefix install_,$(PNGIMAGES:%.png=%.sif))