[Scummvm-cvs-logs] SF.net SVN: scummvm:[45490] media/trunk

[fingolfin at users.sourceforge.net]

Revision: 45490
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45490&view=rev
Author:   fingolfin
Date:     2009-10-28 21:53:49 +0000 (Wed, 28 Oct 2009)

Log Message:
-----------
Actually updated scummvm_logo.pdf; update Makefile for readability and by adding scummvm_logo.pdf to default target; adjust beamer/Makefile to changed file names and improve it a bit

Modified Paths:
--------------
    media/trunk/Makefile
    media/trunk/beamer/Makefile
    media/trunk/scummvm_logo.pdf

Modified: media/trunk/Makefile
===================================================================
--- media/trunk/Makefile	2009-10-28 21:49:16 UTC (rev 45489)
+++ media/trunk/Makefile	2009-10-28 21:53:49 UTC (rev 45490)
@@ -1,7 +1,32 @@
-REPOSITORY_IMAGES=$(foreach icon, scummvm_icon scummvm_tools_icon, $(foreach size, 16 32 128, $(icon)_$(size).png)) scummvm_icon.png scummvm_icon.xpm scummvm_icon.ico scummvm_icon_16.ico scummvm_icon_32.ico
-PORTS_IMAGES=$(foreach site, buildbot forums planet wiki, scummvm_favicon_$(site).ico) scummvm_icon_18.png scummvm_icon_48.png scummvm_icon_50.png scummvm_icon_dc.h scummvm_icon_moto32.png scummvm_icon_moto48.png $(foreach size, 16 18 32 40 64, scummvm_icon_symbian$(size).bmp scummvm_icon_symbian$(size)m.bmp) scummvm_iphone_icon.png scummvm_iphone_loading.png scummvm_logo_psp.png scummvm_logo_wii.png scummvm_logo_wiki.png scummvm_web_link.png scummvm_wince_bar.bmp scummvm_wince_bar.png
-ICON_BIG=512
+REPOSITORY_IMAGES = \
+	$(foreach icon, scummvm_icon scummvm_tools_icon, $(foreach size, 16 32 128, $(icon)_$(size).png)) \
+	scummvm_icon.png \
+	scummvm_icon.xpm \
+	scummvm_icon.ico \
+	scummvm_icon_16.ico \
+	scummvm_icon_32.ico \
+	scummvm_logo.pdf
 
+PORTS_IMAGES = \
+	$(foreach site, buildbot forums planet wiki, scummvm_favicon_$(site).ico) \
+	scummvm_icon_18.png \
+	scummvm_icon_48.png \
+	scummvm_icon_50.png \
+	scummvm_icon_dc.h \
+	scummvm_icon_moto32.png \
+	scummvm_icon_moto48.png \
+	$(foreach size, 16 18 32 40 64, scummvm_icon_symbian$(size).bmp scummvm_icon_symbian$(size)m.bmp) \
+	scummvm_iphone_icon.png \
+	scummvm_iphone_loading.png \
+	scummvm_logo_psp.png \
+	scummvm_logo_wii.png \
+	scummvm_logo_wiki.png \
+	scummvm_web_link.png \
+	scummvm_wince_bar.bmp \
+	scummvm_wince_bar.png
+
+ICON_BIG = 512
+
 all: $(REPOSITORY_IMAGES)
 
 # REPOSITORY IMAGES
@@ -51,7 +76,8 @@
 	echo "};" >> $@
 
 #FIXME: Doesn't show transparency, we create it with The GIMP until we find an automatic way to do it
-#scummvm_icon_dc.ico: scummvm_icon.png
+scummvm_icon_dc.ico: scummvm_icon.png
+	touch $@
 	@#convert $< -resize 32x32 -colors 15 $@
 
 scummvm_icon_moto32.png: scummvm_icon.png

Modified: media/trunk/beamer/Makefile
===================================================================
--- media/trunk/beamer/Makefile	2009-10-28 21:49:16 UTC (rev 45489)
+++ media/trunk/beamer/Makefile	2009-10-28 21:53:49 UTC (rev 45490)
@@ -2,8 +2,8 @@
 	pdflatex presentation
 	pdflatex presentation
 
-scummvm_logo.pdf:
-	cp ../scummvm_logo.pdf .
+scummvm_logo.pdf: ../scummvm_logo.pdf
+	cp $< $@
 
-scummvm_icon_big.png:
-	cp ../scummvm_icon_big.png .
+scummvm_icon_big.png: ../scummvm_icon.png
+	cp $< $@

Modified: media/trunk/scummvm_logo.pdf
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.