Commit a1ba0abd authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

osdmenu: fix data path on Linux

Optimize for installed VLC rather than running from $(top_srcdir).
This patch does not support relocation, so there is potential for
further improvements.
(cherry picked from commit 09e0d5d7d3c23b61fd225423894a70a15f1925c2)

Conflicts:

	modules/video_filter/Modules.am
parent e4eae314
SUBDIRS = dynamicoverlay
SOURCES_mosaic = mosaic.c mosaic.h
SOURCES_transform = transform.c
SOURCES_invert = invert.c
......@@ -16,8 +17,13 @@ SOURCES_scale = scale.c
SOURCES_marq = marq.c
SOURCES_rss = rss.c
SOURCES_motiondetect = motiondetect.c
SOURCES_rv32 = rv32.c
SOURCES_osdmenu = osdmenu.c
libosdmenu_plugin_la_SOURCES = osdmenu.c
libosdmenu_plugin_la_CFLAGS = $(AM_CFLAGS) -DPKGDATADIR=\"$(vlcdatadir)\"
libosdmenu_plugin_la_LIBADD = $(AM_LIBADD)
libosdmenu_plugin_la_DEPENDENCIES =
EXTRA_LTLIBRARIES += libosdmenu_plugin.la
SOURCES_remoteosd = remoteosd.c remoteosd_rfbproto.h
SOURCES_magnify = magnify.c
SOURCES_wave = wave.c
......
......@@ -105,7 +105,7 @@ static int MouseEvent( vlc_object_t *, char const *,
#if defined( WIN32 ) || defined( UNDER_CE )
#define OSD_DEFAULT_CFG "osdmenu/default.cfg"
#else
#define OSD_DEFAULT_CFG "share/osdmenu/default.cfg"
#define OSD_DEFAULT_CFG PKGDATADIR"/osdmenu/default.cfg"
#endif
#define OSD_UPDATE_MIN 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment