mirror of
https://github.com/videolan/vlc.git
synced 2025-01-25 17:15:46 +08:00
Don't set DATA_PATH when building plugins - fixes #1464
This commit is contained in:
parent
b4c3135730
commit
007245adca
@ -14,7 +14,6 @@ include( config )
|
||||
# Global definitions
|
||||
add_definitions(-DHAVE_CONFIG_H)
|
||||
add_definitions(-D__LIBVLC__)
|
||||
add_definitions(-DDATA_PATH=\\"${CMAKE_INSTALL_PREFIX}/share/vlc\\")
|
||||
# Large file support for Solaris and Linux:
|
||||
add_definitions(-D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE)
|
||||
# Thread safety:
|
||||
|
@ -145,7 +145,8 @@ endif
|
||||
|
||||
libvlc_la_SOURCES = $(SOURCES_libvlc)
|
||||
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_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc`
|
||||
libvlc_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
|
||||
|
@ -103,7 +103,6 @@ cppflags="${cppflags} -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURC
|
||||
# Gettext, data and plugin location
|
||||
#
|
||||
cppflags="${cppflags} -DLOCALEDIR=\"@datadir@/locale\""
|
||||
cppflags="${cppflags} -DDATA_PATH=\"@datadir@/vlc\""
|
||||
cppflags="${cppflags} -DPLUGIN_PATH=\"@libdir@/vlc\""
|
||||
|
||||
#
|
||||
|
Loading…
Reference in New Issue
Block a user