summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-08-01 22:52:28 +0200
committerwm4 <wm4@nowhere>2012-08-01 22:52:28 +0200
commitb35d89d42bbec31d49368b3f014a605408ccb8be (patch)
tree6e28af497bcd5f3efd0a57e6f781d53163802ddc /Makefile
parentd1ccee76b1e056872abd57802ec5e829cafd9131 (diff)
downloadmpv-b35d89d42bbec31d49368b3f014a605408ccb8be.tar.bz2
mpv-b35d89d42bbec31d49368b3f014a605408ccb8be.tar.xz
input: replace internal key binds with included etc/input.conf
The internal array of default key bindings is removed. Include the file etc/input.conf at compile time (using the file2header tool), and parse the default binds from etc/input.conf at startup time. This lowers maintainance overhead, and makes sure the default bindings and etc/input.conf don't deviate. Commit f30bf73bf22ed0542 already made sure etc/input.conf matches the default bindings, so this commit shouldn't change anything user-visible.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 948bc98155..5395be7477 100644
--- a/Makefile
+++ b/Makefile
@@ -519,6 +519,10 @@ codec-cfg.c: codecs.conf.h
codecs.conf.h: TOOLS/file2string.py etc/codecs.conf
./$^ >$@
+input/input.c: input/input_conf.h
+input/input_conf.h: TOOLS/file2string.py etc/input.conf
+ ./$^ >$@
+
libvo/vo_vdpau.c: libvo/vdpau_template.c
libvo/vdpau_template.c: TOOLS/vdpau_functions.py
./$< > $@