summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2019-06-22 00:03:31 +0200
committerwm4 <wm4@nowhere>2020-06-04 16:59:05 +0200
commit07b0c18bad6cb168191d390f10db998eb7201b67 (patch)
tree657b634fddaefa1fc4c8b552ccf3fd86a269c5aa /video
parentc67f36dd18f22dc027af129098a998866e4c2a33 (diff)
downloadmpv-07b0c18bad6cb168191d390f10db998eb7201b67.tar.bz2
mpv-07b0c18bad6cb168191d390f10db998eb7201b67.tar.xz
build: change filenames of generated files
Force them into a more consistent naming schema.
Diffstat (limited to 'video')
-rw-r--r--video/out/cocoa_common.m2
-rw-r--r--video/out/wayland_common.c8
-rw-r--r--video/out/x11_common.c8
3 files changed, 9 insertions, 9 deletions
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index 1940861dca..09637c41a5 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -163,7 +163,7 @@ static void disable_power_management(struct vo_cocoa_state *s)
}
static const char macosx_icon[] =
-#include "osdep/macosx_icon.inc"
+#include "generated/TOOLS/osxbundle/mpv.app/Contents/Resources/icon.icns.inc"
;
static void set_application_icon(NSApplication *app)
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
index 3995db3270..6058c1e631 100644
--- a/video/out/wayland_common.c
+++ b/video/out/wayland_common.c
@@ -31,16 +31,16 @@
#include "wayland_common.h"
// Generated from xdg-shell.xml
-#include "video/out/wayland/xdg-shell.h"
+#include "generated/wayland/xdg-shell.h"
// Generated from idle-inhibit-unstable-v1.xml
-#include "video/out/wayland/idle-inhibit-v1.h"
+#include "generated/wayland/idle-inhibit-v1.h"
// Generated from xdg-decoration-unstable-v1.xml
-#include "video/out/wayland/xdg-decoration-v1.h"
+#include "generated/wayland/xdg-decoration-v1.h"
// Generated from presentation-time.xml
-#include "video/out/wayland/presentation-time.h"
+#include "generated/wayland/presentation-time.h"
#define OPT_BASE_STRUCT struct wayland_opts
const struct m_sub_options wayland_conf = {
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index c209472657..9b326674dc 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -107,19 +107,19 @@ typedef struct
} MotifWmHints;
static const char x11_icon_16[] =
-#include "video/out/x11_icon_16.inc"
+#include "generated/etc/mpv-icon-8bit-16x16.png.inc"
;
static const char x11_icon_32[] =
-#include "video/out/x11_icon_32.inc"
+#include "generated/etc/mpv-icon-8bit-32x32.png.inc"
;
static const char x11_icon_64[] =
-#include "video/out/x11_icon_64.inc"
+#include "generated/etc/mpv-icon-8bit-64x64.png.inc"
;
static const char x11_icon_128[] =
- #include "video/out/x11_icon_128.inc"
+#include "generated/etc/mpv-icon-8bit-128x128.png.inc"
;
#define ICON_ENTRY(var) { (char *)var, sizeof(var) }