summaryrefslogtreecommitdiffstats
path: root/player
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 /player
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 'player')
-rw-r--r--player/javascript.c2
-rw-r--r--player/lua.c12
-rw-r--r--player/main.c2
3 files changed, 8 insertions, 8 deletions
diff --git a/player/javascript.c b/player/javascript.c
index fedd09b3e5..6d41fd0ee3 100644
--- a/player/javascript.c
+++ b/player/javascript.c
@@ -51,7 +51,7 @@
// All these are generated from player/javascript/*.js
static const char *const builtin_files[][3] = {
{"@/defaults.js",
-# include "player/javascript/defaults.js.inc"
+# include "generated/player/javascript/defaults.js.inc"
},
{0}
};
diff --git a/player/lua.c b/player/lua.c
index 99402fd2ce..04110c79c6 100644
--- a/player/lua.c
+++ b/player/lua.c
@@ -57,22 +57,22 @@
// All these are generated from player/lua/*.lua
static const char * const builtin_lua_scripts[][2] = {
{"mp.defaults",
-# include "player/lua/defaults.inc"
+# include "generated/player/lua/defaults.lua.inc"
},
{"mp.assdraw",
-# include "player/lua/assdraw.inc"
+# include "generated/player/lua/assdraw.lua.inc"
},
{"mp.options",
-# include "player/lua/options.inc"
+# include "generated/player/lua/options.lua.inc"
},
{"@osc.lua",
-# include "player/lua/osc.inc"
+# include "generated/player/lua/osc.lua.inc"
},
{"@ytdl_hook.lua",
-# include "player/lua/ytdl_hook.inc"
+# include "generated/player/lua/ytdl_hook.lua.inc"
},
{"@stats.lua",
-# include "player/lua/stats.inc"
+# include "generated/player/lua/stats.lua.inc"
},
{"@console.lua",
# include "player/lua/console.inc"
diff --git a/player/main.c b/player/main.c
index cb5ebcb99d..71f5d14b53 100644
--- a/player/main.c
+++ b/player/main.c
@@ -66,7 +66,7 @@
#include "screenshot.h"
static const char def_config[] =
-#include "player/builtin_conf.inc"
+#include "generated/etc/builtin.conf.inc"
;
#if HAVE_COCOA