# HG changeset patch # User Matti Hamalainen # Date 1510225724 -7200 # Node ID dfe5e8d7c58a7775b2e5877db4195517f128d832 # Parent 79da81b9e184b331686b527c2e2051c57cb20905 Use the finalized Cafe Kampus logo. diff -r 79da81b9e184 -r dfe5e8d7c58a Makefile.gen --- a/Makefile.gen Thu Nov 09 12:19:27 2017 +0200 +++ b/Makefile.gen Thu Nov 09 13:08:44 2017 +0200 @@ -30,6 +30,7 @@ CXXFLAGS += -DAPP_VERSION=\"$(APP_VERSION)\" LOGO_SVG ?= kampuscafe4.svg +LOGO_IMG ?= CafeKampus_logo_FINAL_RGB.png ICON_PNGS = icon-64.png icon-48.png icon-32.png icon-16.png APP_RESOURCES += $(addprefix $(APP_IMG),logo.png $(ICON_PNGS)) @@ -90,11 +91,17 @@ ### ### Application rules ### -$(APP_IMG)icon-%.png: $(addprefix $(APP_IMG),$(LOGO_SVG)) - inkscape --export-area-page -w $(patsubst $(APP_IMG)icon-%.png,%,$@) -h $(patsubst $(APP_IMG)icon-%.png,%,$@) -e "$@" "$<" +#$(APP_IMG)icon-%.png: $(addprefix $(APP_IMG),$(LOGO_SVG)) +# inkscape --export-area-page -w $(patsubst $(APP_IMG)icon-%.png,%,$@) -h $(patsubst $(APP_IMG)icon-%.png,%,$@) -e "$@" "$<" + +#$(APP_IMG)logo.png: $(addprefix $(APP_IMG),$(LOGO_SVG)) +# inkscape --export-area-page -w 258 -h 220 -e "$@" "$<" -$(APP_IMG)logo.png: $(addprefix $(APP_IMG),$(LOGO_SVG)) - inkscape --export-area-page -w 258 -h 220 -e "$@" "$<" +$(APP_IMG)icon-%.png: $(addprefix $(APP_IMG),$(LOGO_IMG)) + convert "$<" -scale "$(patsubst $(APP_IMG)icon-%.png,%,$@)x$(patsubst $(APP_IMG)icon-%.png,%,$@)" "$@" + +$(APP_IMG)logo.png: $(addprefix $(APP_IMG),$(LOGO_IMG)) + convert "$<" -scale "258x220" "$@" icon.ico: $(addprefix $(APP_IMG),$(ICON_PNGS)) @echo " CONVERT $+ -> $@" diff -r 79da81b9e184 -r dfe5e8d7c58a img/CafeKampus_logo_FINAL_RGB.png Binary file img/CafeKampus_logo_FINAL_RGB.png has changed diff -r 79da81b9e184 -r dfe5e8d7c58a img/icon-16.png Binary file img/icon-16.png has changed diff -r 79da81b9e184 -r dfe5e8d7c58a img/icon-32.png Binary file img/icon-32.png has changed diff -r 79da81b9e184 -r dfe5e8d7c58a img/icon-48.png Binary file img/icon-48.png has changed diff -r 79da81b9e184 -r dfe5e8d7c58a img/icon-64.png Binary file img/icon-64.png has changed diff -r 79da81b9e184 -r dfe5e8d7c58a img/kampuscafe1.svg --- a/img/kampuscafe1.svg Thu Nov 09 12:19:27 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,119 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - Kampus Cafe - - - diff -r 79da81b9e184 -r dfe5e8d7c58a img/kampuscafe2.svg --- a/img/kampuscafe2.svg Thu Nov 09 12:19:27 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,132 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - Kampus Cafe - - - - diff -r 79da81b9e184 -r dfe5e8d7c58a img/kampuscafe3.svg --- a/img/kampuscafe3.svg Thu Nov 09 12:19:27 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,151 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - Kampus Cafe - - - Kampus Cafe - - diff -r 79da81b9e184 -r dfe5e8d7c58a img/kampuscafe4.svg --- a/img/kampuscafe4.svg Thu Nov 09 12:19:27 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,174 +0,0 @@ - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - Cafe Kampus - - - - diff -r 79da81b9e184 -r dfe5e8d7c58a img/logo.png Binary file img/logo.png has changed