# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1365754725 -10800
# Node ID a0082ce261c8fabebd02355f6aeb4cc6b5b1a68b
# Parent  2fad71bcbe790f7f21e40b315fcfb41bac95b427
Add setup menu bar image conversion to build process, move some things around.

diff -r 2fad71bcbe79 -r a0082ce261c8 Makefile.gen
--- a/Makefile.gen	Fri Apr 12 11:16:48 2013 +0300
+++ b/Makefile.gen	Fri Apr 12 11:18:45 2013 +0300
@@ -8,7 +8,8 @@
 DM_CFLAGS += -I$(DMLIB)
 
 ifeq ($(EXTRA_CFLAGS),)
-EXTRA_CFLAGS=-O3 -march=core2 -DDM_DEVEL
+#EXTRA_CFLAGS=-O3 -march=core2 -DDM_DEVEL
+EXTRA_CFLAGS= -march=core2 -DDM_DEVEL
 endif
 
 
@@ -333,6 +334,23 @@
 	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS) $(LIBPNG_CFLAGS)
 
 
+$(DMLIB)graphics/SetupFont.dmf: $(DMLIB)graphics/SetupFont.fnt
+	$(FONTCONV_BIN) -o $@ $<
+
+$(DMLIB)setupfont.h: $(DMLIB)graphics/SetupFont.dmf
+	$(DATA2INC_BIN) -C -n engineSetupFont -t Uint8 $< $@
+
+$(DMLIB)setupimage.h: $(DMLIB)graphics/SetupImage.png
+	$(DATA2INC_BIN) -C -n engineSetupImage -t Uint8 $< $@
+
+$(DMLIB)setupbar.h: $(DMLIB)graphics/SetupMenuBar.png
+	$(DATA2INC_BIN) -C -n engineSetupMenuBar -t Uint8 $< $@
+
+$(OBJPATH)dmsimple.o: $(DMLIB)setupbar.h $(DMLIB)setupfont.h $(DMLIB)setupimage.h $(DMLIB)dmsimple.c
+	@echo " CC $+"
+	@$(CC) $(CFLAGS) -c -o $@ $< $(DM_CFLAGS)
+
+
 $(DMLIB_A): $(addprefix $(OBJPATH),$(DMLIB_OBJS)) $(DMLIB)Makefile.gen config.mak
 	@echo " AR $@ $(addprefix $(OBJPATH),$(DMLIB_OBJS))"
 	@$(AR) cru $@ $(addprefix $(OBJPATH),$(DMLIB_OBJS))
@@ -380,14 +398,6 @@
 	@echo " LINK $+"
 	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -lSDL_ttf
 
-$(DMLIB)graphics/SetupFont.dmf: $(DMLIB)graphics/SetupFont.fnt
-	$(FONTCONV_BIN) -o $@ $<
-
-$(DMLIB)setupfont.h: $(DMLIB)graphics/SetupFont.dmf
-	$(DATA2INC_BIN) -C -n engineSetupFont -t Uint8 $< $@
-
-$(DMLIB)setupimage.h: $(DMLIB)graphics/SetupImage.png
-	$(DATA2INC_BIN) -C -n engineSetupImage -t Uint8 $< $@
 
 $(BINPATH)ppl$(EXEEXT): $(DMLIB)setupfont.h $(OBJPATH)ppl.o $(DMLIB_A) 
 	@echo " LINK $+"