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

Move libs/loader to modules/codec/loader

parent 706d4733
......@@ -9,13 +9,10 @@
# - libs/* are needed by modules
BASE_SUBDIRS = po compat src bin modules share doc test
EXTRA_SUBDIRS = m4 \
libs/loader libs/srtp
libs/srtp
DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
SUBDIRS = po compat src
if LOADER
SUBDIRS += libs/loader
endif
if HAVE_GCRYPT
SUBDIRS += libs/srtp
endif
......
......@@ -4175,8 +4175,8 @@ AC_ARG_ENABLE(loader,
AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"])
AS_IF([test "${enable_loader}" = "yes"],
[ VLC_ADD_PLUGIN([dmo])
VLC_ADD_CPPFLAGS([dmo quicktime realvideo],[-I\\\${top_srcdir}/libs/loader])
VLC_ADD_LIBS([dmo quicktime realvideo],[\\\${top_builddir}/libs/loader/libloader.la])
VLC_ADD_CPPFLAGS([dmo quicktime realvideo],[-I\\\${top_srcdir}/modules/codec/loader])
VLC_ADD_LIBS([dmo quicktime realvideo],[\\\${top_builddir}/modules/codec/loader/libloader.la])
VLC_ADD_CPPFLAGS([realvideo], [-DLOADER])
VLC_ADD_LIBS([dmo quicktime], [-lpthread])
])
......@@ -4259,7 +4259,6 @@ AC_SUBST(FILE_LIBVLC_DLL)
AC_CONFIG_FILES([
Makefile
doc/Makefile
libs/loader/Makefile
libs/srtp/Makefile
modules/Makefile
m4/Makefile
......@@ -4288,6 +4287,7 @@ AC_CONFIG_FILES([
modules/codec/Makefile
modules/codec/avcodec/Makefile
modules/codec/dmo/Makefile
modules/codec/loader/Makefile
modules/codec/omxil/Makefile
modules/codec/shine/Makefile
modules/codec/spudec/Makefile
......
SUBDIRS = dmo avcodec shine spudec wmafixed omxil
SUBDIRS = loader dmo avcodec shine spudec wmafixed omxil
SOURCES_a52 = a52.c a52.h
SOURCES_dts = dts.c
SOURCES_flac = flac.c
......
......@@ -9,7 +9,9 @@
# by their respective owner(s).
#
if LOADER
noinst_LTLIBRARIES = libloader.la
endif
# TODO: real check for vsscanf() and <sys/mmap.h>
AM_CPPFLAGS = -D__WINE__ -DHAVE_SYS_MMAN_H=1 -DHAVE_VSSCANF=1 \
......
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