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

diff --git a/Usermode/Applications/axwin3_src/WM/Makefile b/Usermode/Applications/axwin3_src/WM/Makefile
index 1d674507..4150e945 100644
--- a/Usermode/Applications/axwin3_src/WM/Makefile
+++ b/Usermode/Applications/axwin3_src/WM/Makefile
@@ -7,7 +7,7 @@ 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 := main.o input.o video.o ipc.o image.o
 OBJ += wm.o wm_input.o wm_render.o wm_render_text.o wm_hotkeys.o
 OBJ += decorator.o
 OBJ += renderers/framebuffer.o
@@ -23,13 +23,31 @@ 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))