From 6e7fa8690cf1836a1c7e7a8b1ac7eade7edb5a50 Mon Sep 17 00:00:00 2001 From: Yves Rizoud Date: Tue, 18 Nov 2008 20:39:34 +0000 Subject: [PATCH] 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 | 11 ++++++++--- gfx2.ico | Bin 766 -> 25214 bytes 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1ed99e40..69380aef 100644 --- a/Makefile +++ b/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) - $(CC) $(OBJ) -o $(BIN) $(LOPT) +$(BIN) : $(OBJ) $(OBJRES) + $(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 : diff --git a/gfx2.ico b/gfx2.ico index 0c78ce5e33be2556f2b9e548fe556e49264ba2a6..1319ddd33e5988b373c32c76b7099ea52fc11707 100644 GIT binary patch literal 25214 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 GMDz~;ekG0o