Skip to content

V
vlc
Commit 007245ad authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Don't set DATA_PATH when building plugins - fixes #1464

parent b4c31357
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
extras/buildsystem/cmake/CMakeLists/root_CMakeLists.txt
View file @ 007245ad
...@@ -14,7 +14,6 @@ include( config ) ...@@ -14,7 +14,6 @@ include( config )
# Global definitions # Global definitions
add_definitions(-DHAVE_CONFIG_H) add_definitions(-DHAVE_CONFIG_H)
add_definitions(-D__LIBVLC__) add_definitions(-D__LIBVLC__)
add_definitions(-DDATA_PATH=\\"${CMAKE_INSTALL_PREFIX}/share/vlc\\")
# Large file support for Solaris and Linux: # Large file support for Solaris and Linux:
add_definitions(-D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE) add_definitions(-D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE)
# Thread safety: # Thread safety:
......
src/Makefile.am
View file @ 007245ad
...@@ -145,7 +145,8 @@ endif ...@@ -145,7 +145,8 @@ endif
libvlc_la_SOURCES = $(SOURCES_libvlc) libvlc_la_SOURCES = $(SOURCES_libvlc)
nodist_libvlc_la_SOURCES = misc/revision.c nodist_libvlc_la_SOURCES = misc/revision.c
libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
-DDATA_PATH=\"$(pkgdatadir)\"
libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc` libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc` libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc`
libvlc_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \ libvlc_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
......
vlc-config.in.in
View file @ 007245ad
...@@ -103,7 +103,6 @@ cppflags="${cppflags} -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURC ...@@ -103,7 +103,6 @@ cppflags="${cppflags} -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURC
# Gettext, data and plugin location # Gettext, data and plugin location
# #
cppflags="${cppflags} -DLOCALEDIR=\"@datadir@/locale\"" cppflags="${cppflags} -DLOCALEDIR=\"@datadir@/locale\""
cppflags="${cppflags} -DDATA_PATH=\"@datadir@/vlc\""
cppflags="${cppflags} -DPLUGIN_PATH=\"@libdir@/vlc\"" cppflags="${cppflags} -DPLUGIN_PATH=\"@libdir@/vlc\""
# #
......
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