Usermode/AxWin3 - Fixed undefined memory usage

[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..3bc24f8 100644 (file)
--- a/Usermode/Applications/axwin3_src/WM/Makefile
+++ b/Usermode/Applications/axwin3_src/WM/Makefile
@@ -2,22 +2,57 @@
 
 -include ../../Makefile.cfg
 
-# Some evil lazy evaulation, hopefully it works
-CPPFLAGS += -I include/
+CPPFLAGS += -I include/ -I ../include/
+CFLAGS += -std=gnu99
 
 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 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 toolbar_save.png toolbar_open.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
+
+all: $(addprefix resources/,$(PNGIMAGES:%.png=.%.sif))
+
+resources/.%.sif: $(IMG2SIF) Makefile resources/%.png
+       @echo img2sif resources/$*.png
+       @$(IMG2SIF) --rle1x32 resources/$*.png resources/.$*.sif
+
+install_%.sif: resources/.%.sif ;
+       @echo [xCP] $(DISTROOT)/$(DIR)/$*.sif
+       @$(xCP) $< $(DISTROOT)/$(DIR)/$*.sif
+
+install_resources: $(IMG2SIF) $(addprefix install_,$(PNGIMAGES:%.png=%.sif))