Build Linux dcpomatic2 icons on build.

13 files changed, 23 insertions, 9 deletions

diff --git a/graphics/128x128/dcpomatic2.png b/graphics/128x128/dcpomatic2.png
deleted file mode 100644
index 9936b39af..000000000
--- a/graphics/128x128/dcpomatic2.png
+++ /dev/null
diff --git a/graphics/16x16/dcpomatic2.png b/graphics/16x16/dcpomatic2.png
deleted file mode 100644
index 3c5a10f2d..000000000
--- a/graphics/16x16/dcpomatic2.png
+++ /dev/null
diff --git a/graphics/22x22/dcpomatic2.png b/graphics/22x22/dcpomatic2.png
deleted file mode 100644
index dddb86298..000000000
--- a/graphics/22x22/dcpomatic2.png
+++ /dev/null
diff --git a/graphics/256x256/dcpomatic2.png b/graphics/256x256/dcpomatic2.png
deleted file mode 100644
index d12b00efb..000000000
--- a/graphics/256x256/dcpomatic2.png
+++ /dev/null
diff --git a/graphics/32x32/dcpomatic2.png b/graphics/32x32/dcpomatic2.png
deleted file mode 100644
index 8cecf08f8..000000000
--- a/graphics/32x32/dcpomatic2.png
+++ /dev/null
diff --git a/graphics/48x48/dcpomatic2.png b/graphics/48x48/dcpomatic2.png
deleted file mode 100644
index 07bf2d10b..000000000
--- a/graphics/48x48/dcpomatic2.png
+++ /dev/null
diff --git a/graphics/512x512/dcpomatic2.png b/graphics/512x512/dcpomatic2.png
deleted file mode 100644
index 7036de427..000000000
--- a/graphics/512x512/dcpomatic2.png
+++ /dev/null
diff --git a/graphics/512x512/dvdomatic.png b/graphics/512x512/dvdomatic.png
deleted file mode 100644
index 65b5012de..000000000
--- a/graphics/512x512/dvdomatic.png
+++ /dev/null
diff --git a/graphics/64x64/dcpomatic2.png b/graphics/64x64/dcpomatic2.png
deleted file mode 100644
index 35564a8a2..000000000
--- a/graphics/64x64/dcpomatic2.png
+++ /dev/null
diff --git a/graphics/logo.svg b/graphics/dcpomatic2.svg
index c63f8be6a..c63f8be6a 100644
--- a/graphics/logo.svg
+++ b/graphics/dcpomatic2.svg
diff --git a/graphics/make.sh b/graphics/make.sh
deleted file mode 100755
index 9058ef65d..000000000
--- a/graphics/make.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-width=$1
-height=$2
-output=$3
-
-inkscape -C -z -e $output -w $width -h $height -D logo.svg
diff --git a/graphics/wscript b/graphics/wscript
new file mode 100644
index 000000000..54b123379
--- /dev/null
+++ b/graphics/wscript
@@ -0,0 +1,22 @@
+#
+#    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+
+def build(bld):
+    for r in [16, 22, 32, 48, 64, 128, 256, 512]:
+        bld(rule='inkscape -C -z -e ${TGT} -w %d -h %d -D ${SRC}' % (r, r), source='dcpomatic2.svg', target='%d/dcpomatic2.png' % r)
+        bld.install_files('${PREFIX}/share/icons/hicolor/%dx%d/apps' % (r, r), '../build/graphics/%d/dcpomatic2.png' % r)
diff --git a/wscript b/wscript
index 79116ff03..66bedf9e5 100644
--- a/wscript
+++ b/wscript
@@ -430,8 +430,7 @@ def build(bld):
     if bld.env.TARGET_OSX:
         bld.recurse('platform/osx')
 
-    for r in ['22x22', '32x32', '48x48', '64x64', '128x128']:
-        bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'graphics/%s/dcpomatic2.png' % r)
+    bld.recurse('graphics')
 
     if not bld.env.TARGET_WINDOWS:
         bld.install_files('${PREFIX}/share/dcpomatic2', 'graphics/taskbar_icon.png')