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

globalhotkeys: use different names for Win32 and XCB targets

This works around an automake limitation with multiple directory
prefixes.
parent 6d223c4c
...@@ -3059,7 +3059,7 @@ AS_IF([test "${enable_xcb}" != "no"], [ ...@@ -3059,7 +3059,7 @@ AS_IF([test "${enable_xcb}" != "no"], [
dnl xcb-utils dnl xcb-utils
PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms >= 0.3.4], [ PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms >= 0.3.4], [
VLC_ADD_PLUGIN([globalhotkeys]) VLC_ADD_PLUGIN([xcb_hotkeys])
VLC_ADD_CFLAGS([xcb_window], [-DHAVE_XCB_KEYSYMS]) VLC_ADD_CFLAGS([xcb_window], [-DHAVE_XCB_KEYSYMS])
], [ ], [
AC_MSG_WARN([${XCB_KEYSYMS_PKG_ERRORS}. Hotkeys will not work.]) AC_MSG_WARN([${XCB_KEYSYMS_PKG_ERRORS}. Hotkeys will not work.])
......
...@@ -24,6 +24,12 @@ libvlc_LTLIBRARIES += \ ...@@ -24,6 +24,12 @@ libvlc_LTLIBRARIES += \
libhotkeys_plugin.la \ libhotkeys_plugin.la \
liboldrc_plugin.la liboldrc_plugin.la
if HAVE_WIN32
libvlc_LTLIBRARIES += libntservice_plugin.la
else
libvlc_LTLIBRARIES += libmotion_plugin.la
endif
libdbus_plugin_la_SOURCES = \ libdbus_plugin_la_SOURCES = \
dbus/dbus_introspect.h dbus/dbus_common.h \ dbus/dbus_introspect.h dbus/dbus_common.h \
dbus/dbus_root.c dbus/dbus_root.h \ dbus/dbus_root.c dbus/dbus_root.h \
...@@ -36,21 +42,16 @@ if HAVE_DBUS ...@@ -36,21 +42,16 @@ if HAVE_DBUS
libvlc_LTLIBRARIES += libdbus_plugin.la libvlc_LTLIBRARIES += libdbus_plugin.la
endif endif
if !HAVE_WIN32 libxcb_hotkeys_plugin_la_SOURCES = globalhotkeys/xcb.c
libglobalhotkeys_plugin_la_SOURCES = globalhotkeys/xcb.c libxcb_hotkeys_plugin_la_CFLAGS = $(AM_CFLAGS) \
libglobalhotkeys_plugin_la_CFLAGS = $(AM_CFLAGS) $(XCB_KEYSYMS_CFLAGS) $(XCB_CFLAGS) $(XCB_KEYSYMS_CFLAGS) $(XCB_CFLAGS)
libglobalhotkeys_plugin_la_LIBADD = $(AM_LIBADD) $(XCB_KEYSYMS_LIBS) $(XCB_LIBS) libxcb_hotkeys_plugin_la_LIBADD = $(AM_LIBADD) $(XCB_KEYSYMS_LIBS) $(XCB_LIBS)
EXTRA_LTLIBRARIES += libxcb_hotkeys_plugin.la
libvlc_LTLIBRARIES += \ libvlc_LTLIBRARIES += $(LTLIBxcb_hotkeys)
$(LTLIBglobalhotkeys) \
libmotion_plugin.la
else
libglobalhotkeys_plugin_la_SOURCES = globalhotkeys/win32.c
libglobalhotkeys_plugin_la_CFLAGS = $(AM_CFLAGS)
libglobalhotkeys_plugin_la_LIBADD = $(AM_LIBADD)
libglobalhotkeys_plugin_la_DEPENDENCIES = libglobalhotkeys_plugin.rc.o
libvlc_LTLIBRARIES += \ libwin_hotkeys_plugin_la_SOURCES = globalhotkeys/win32.c
libglobalhotkeys_plugin.la \ libwin_hotkeys_plugin_la_CFLAGS = $(AM_CFLAGS)
libntservice_plugin.la libwin_hotkeys_plugin_la_LIBADD = $(AM_LIBADD)
endif if HAVE_WIN32
libvlc_LTLIBRARIES += libwin_hotkeys_plugin.la
endif
...@@ -49,6 +49,7 @@ vlc_module_begin() ...@@ -49,6 +49,7 @@ vlc_module_begin()
set_description( N_("Global Hotkeys interface") ) set_description( N_("Global Hotkeys interface") )
set_capability( "interface", 0 ) set_capability( "interface", 0 )
set_callbacks( Open, Close ) set_callbacks( Open, Close )
add_shortcut( "globalhotkeys" )
vlc_module_end() vlc_module_end()
struct intf_sys_t struct intf_sys_t
......
...@@ -52,6 +52,7 @@ vlc_module_begin() ...@@ -52,6 +52,7 @@ vlc_module_begin()
set_description( N_("Global Hotkeys interface") ) set_description( N_("Global Hotkeys interface") )
set_capability( "interface", 0 ) set_capability( "interface", 0 )
set_callbacks( Open, Close ) set_callbacks( Open, Close )
add_shortcut( "globalhotkeys" )
vlc_module_end() vlc_module_end()
typedef struct typedef struct
......
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