summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXu Zhao <i@xuzhao.net>2017-07-01 23:04:20 -0400
committerwm4 <wm4@nowhere>2017-07-02 13:07:36 +0200
commit1097c1416f352fe4da49391548224a057cfc870d (patch)
tree06bdc4c02f9f65b0662253866594adcb108ea4b6
parent3d318071982cc80867098ca5fe2641f31a289ac8 (diff)
downloadmpv-1097c1416f352fe4da49391548224a057cfc870d.tar.bz2
mpv-1097c1416f352fe4da49391548224a057cfc870d.tar.xz
x11: add 128x128 sized icon support
-rw-r--r--etc/mpv-icon-8bit-128x128.pngbin0 -> 22984 bytes
-rw-r--r--video/out/x11_common.c5
-rw-r--r--wscript_build.py6
3 files changed, 11 insertions, 0 deletions
diff --git a/etc/mpv-icon-8bit-128x128.png b/etc/mpv-icon-8bit-128x128.png
new file mode 100644
index 0000000000..1840269246
--- /dev/null
+++ b/etc/mpv-icon-8bit-128x128.png
Binary files differ
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index f46e78b8d9..30ad89746f 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -118,11 +118,16 @@ static const char x11_icon_64[] =
#include "video/out/x11_icon_64.inc"
;
+static const char x11_icon_128[] =
+ #include "video/out/x11_icon_128.inc"
+;
+
#define ICON_ENTRY(var) { (char *)var, sizeof(var) }
static const struct bstr x11_icons[] = {
ICON_ENTRY(x11_icon_16),
ICON_ENTRY(x11_icon_32),
ICON_ENTRY(x11_icon_64),
+ ICON_ENTRY(x11_icon_128),
{0}
};
diff --git a/wscript_build.py b/wscript_build.py
index c6fa552164..12ef2c5490 100644
--- a/wscript_build.py
+++ b/wscript_build.py
@@ -77,6 +77,12 @@ def build(ctx):
ctx(
features = "file2string",
+ source = "etc/mpv-icon-8bit-128x128.png",
+ target = "video/out/x11_icon_128.inc",
+ )
+
+ ctx(
+ features = "file2string",
source = "etc/input.conf",
target = "input/input_conf.h",
)