Icon: gfx2.ico now contains 2 more versions, re-pixelled in 16x16 and 48x48

(win32): When compiled, the icon is embedded in executable.

Tested on win98 and linux.


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@354 416bcca6-2ee7-4201-b75f-2eb2f807beb1

Makefile

@@ -30,6 +30,9 @@ ifdef COMSPEC
   LOPT = `sdl-config --libs` -lSDL_image $(TTFLOPT)
   CC = gcc
   OBJDIR = obj/win32
+  # Resources (icon)
+  WINDRES = windres.exe
+  OBJRES = $(OBJDIR)/winres.o
 else
 
   PLATFORM = $(shell uname)
@@ -130,8 +133,8 @@ ziprelease: version $(BIN) $(BINCFG) release
 	$(DELCOMMAND) src-svn`svnversion | sed 's/:/-/'`.tgz
 	tar cvzf grafx2-svn`svnversion | sed 's/:/-/'`$(TTFLABEL)-src.tgz *.c *.h Makefile Makefile.dep gfx2.dat gfx2.ico doc/gpl-2.0.txt fonts/8pxfont.png fonts/Tuffy.ttf
 
-$(BIN) : $(OBJ)
+$(BIN) : $(OBJ) $(OBJRES)
-	$(CC) $(OBJ) -o $(BIN) $(LOPT)
+	$(CC) $(OBJ) $(OBJRES) -o $(BIN) $(LOPT)
 
 $(CFGBIN) : $(CFGOBJ)
 	$(CC) $(CFGOBJ) -o $(CFGBIN) $(LOPT)
@@ -152,9 +155,11 @@ $(OBJDIR)/%.o :
 depend :
 	$(CC) -MM *.c | sed 's:^[^ ]:$$(OBJDIR)/&:' > Makefile.dep
 
+$(OBJDIR)/winres.o : gfx2.ico
+	echo "1 ICON \"gfx2.ico\"" | $(WINDRES) -o $(OBJDIR)/winres.o
 
 clean :
-	$(DELCOMMAND) $(OBJ) $(CFGOBJ)
+	$(DELCOMMAND) $(OBJ) $(CFGOBJ) $(OBJDIR)/version.o $(OBJRES)
 	$(DELCOMMAND) $(BIN) $(CFGBIN)
 
 test :