Commit fcc20e92 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Remove recursion into modules/codec/loader/

parent 65bb5e96
......@@ -3980,8 +3980,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 ],[-I\\\${top_srcdir}/modules/codec/loader])
VLC_ADD_LIBS([dmo quicktime ],[\\\${top_builddir}/modules/codec/loader/libloader.la])
VLC_ADD_CPPFLAGS([dmo quicktime ],[-I\\\$(srcdir)/loader])
VLC_ADD_LIBS([dmo quicktime ],[libloader.la])
VLC_ADD_LIBS([dmo quicktime], [-lpthread])
])
......@@ -4065,7 +4065,6 @@ AC_CONFIG_FILES([
modules/audio_mixer/Makefile
modules/audio_output/Makefile
modules/codec/Makefile
modules/codec/loader/Makefile
modules/control/Makefile
modules/demux/Makefile
modules/gui/Makefile
......
SUBDIRS = loader
noinst_HEADERS =
SOURCES_a52 = a52.c a52.h
......@@ -146,3 +145,35 @@ libiomx_plugin_la_LIBADD = $(libomxil_plugin_la_LIBADD)
libvlc_LTLIBRARIES += $(LTLIBomxil) $(LTLIBiomx)
EXTRA_LTLIBRARIES += libomxil_plugin.la libiomx_plugin.la
### Windows DLL loader ###
# TODO: real check for vsscanf() and <sys/mmap.h>
noinst_HEADERS += loader/com.h loader/driver.h loader/ext.h loader/ldt_keeper.h
loader/loader.h loader/registry.h \
loader/win32.h loader/wineacm.h loader/wrapper.h \
loader/qtx/qtxsdk/components.h \
loader/wine/avifmt.h loader/wine/basetsd.h loader/wine/debugtools.h \
loader/wine/driver.h loader/wine/heap.h loader/wine/mmreg.h \
loader/wine/module.h loader/wine/msacmdrv.h loader/wine/msacm.h \
loader/wine/pe_image.h loader/wine/poppack.h loader/wine/pshpack1.h \
loader/wine/pshpack2.h loader/wine/vfw.h loader/wine/winbase.h \
loader/wine/windef.h loader/wine/winerror.h \
loaeder/wine/winestring.h loader/wine/winnt.h loader/wine/winreg.h \
loader/wine/winuser.h
libloader_la_CPPFLAGS = -D__WINE__ -DHAVE_SYS_MMAN_H=1 -DHAVE_VSSCANF=1 \
-DWIN32_PATH=\"\" -DTRACE\(...\)=\(void\)0
libloader_la_CFLAGS = -fno-PIC -U_FILE_OFFSET_BITS \
-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
libloader_la_SOURCES = loader/ldt_keeper.c loader/pe_image.c loader/module.c \
loader/ext.c loader/win32.c loader/driver.c loader/pe_resource.c \
loader/resource.c loader/registry.c loader/afl.c loader/vfl.c \
loader/wrapper.S loader/stubs.s loader/kludge.c
libloader_la_LIBADD = -lpthread
libloader_la_LDFLAGS = -static
if LOADER
noinst_LTLIBRARIES = libloader.la
libdmo_plugin_la_DEPENDENCIES = libloader.la
libquicktime_plugin_la_DEPENDENCIES = libloader.la
endif
# Makefile to build MPlayer's DLL loader
# from VLC trunk
#
# by Rémi Denis-Courmont <rem # videolan.org>
# $Id$
#
# All other files in this directory (and subdirectories) are copyrighted
# 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 \
-DWIN32_PATH=\"\" -DTRACE\(...\)=\(void\)0
AM_CFLAGS = -fno-PIC -U_FILE_OFFSET_BITS \
-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
noinst_HEADERS = com.h driver.h ext.h ldt_keeper.h loader.h registry.h \
win32.h wineacm.h wrapper.h qtx/qtxsdk/components.h \
wine/avifmt.h wine/basetsd.h wine/debugtools.h wine/driver.h \
wine/heap.h wine/mmreg.h wine/module.h wine/msacmdrv.h wine/msacm.h \
wine/pe_image.h wine/poppack.h wine/pshpack1.h wine/pshpack2.h \
wine/vfw.h wine/winbase.h wine/windef.h wine/winerror.h \
wine/winestring.h wine/winnt.h wine/winreg.h wine/winuser.h
libloader_la_SOURCES = ldt_keeper.c pe_image.c module.c ext.c win32.c \
driver.c pe_resource.c resource.c registry.c afl.c vfl.c \
wrapper.S stubs.s kludge.c
libloader_la_LIBADD = -lpthread
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