summaryrefslogtreecommitdiff
path: root/src/libw32dll
diff options
context:
space:
mode:
Diffstat (limited to 'src/libw32dll')
-rw-r--r--src/libw32dll/DirectShow/Makefile.am33
-rw-r--r--src/libw32dll/Makefile.am32
-rw-r--r--src/libw32dll/dmo/Makefile.am23
-rw-r--r--src/libw32dll/wine/Makefile.am50
4 files changed, 59 insertions, 79 deletions
diff --git a/src/libw32dll/DirectShow/Makefile.am b/src/libw32dll/DirectShow/Makefile.am
index a74c65815..414e6764f 100644
--- a/src/libw32dll/DirectShow/Makefile.am
+++ b/src/libw32dll/DirectShow/Makefile.am
@@ -1,16 +1,25 @@
include $(top_srcdir)/misc/Makefile.common
-AM_CFLAGS = $(X_CFLAGS) -fno-omit-frame-pointer \
- -Wmissing-prototypes -Wimplicit-function-declaration \
- -DWIN32_PATH=\"@w32_path@\" -DNOAVIFILE_HEADERS \
+AM_CFLAGS = $(X_CFLAGS) -fno-omit-frame-pointer
+AM_CPPFLAGS = -DWIN32_PATH=\"$(w32_path)\" -DNOAVIFILE_HEADERS \
-I$(srcdir)/.. -I$(srcdir)/../wine
+noinst_HEADERS = \
+ allocator.h \
+ cmediasample.h \
+ guids.h \
+ inputpin.h \
+ interfaces.h \
+ iunk.h \
+ outputpin.h \
+ DS_AudioDecoder.h \
+ DS_Filter.h \
+ DS_VideoDecoder.h
+
if HAVE_W32DLL
-ds_filter_lib = libds_filter.la
+noinst_LTLIBRARIES = libds_filter.la
endif
-noinst_LTLIBRARIES = $(ds_filter_lib)
-
libds_filter_la_SOURCES = \
allocator.c \
cmediasample.c \
@@ -20,15 +29,3 @@ libds_filter_la_SOURCES = \
DS_Filter.c \
DS_AudioDecoder.c \
DS_VideoDecoder.c
-
-noinst_HEADERS = \
- allocator.h \
- cmediasample.h \
- guids.h \
- inputpin.h \
- interfaces.h \
- iunk.h \
- outputpin.h \
- DS_AudioDecoder.h \
- DS_Filter.h \
- DS_VideoDecoder.h
diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am
index 8da0e1c84..94dae4ab9 100644
--- a/src/libw32dll/Makefile.am
+++ b/src/libw32dll/Makefile.am
@@ -1,39 +1,29 @@
include $(top_srcdir)/misc/Makefile.common
-AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
-AM_CPPFLAGS = -I$(srcdir)/wine -DWIN32_PATH=\"@w32_path@\"
-AM_LDFLAGS = $(xineplug_ldflags)
+AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_CPPFLAGS = -I$(srcdir)/wine -DWIN32_PATH=\"$(w32_path)\"
+AM_LDFLAGS = $(xineplug_ldflags)
SUBDIRS = wine DirectShow dmo qtx
-if HAVE_W32DLL
-w32dll_codec = xineplug_decode_w32dll.la
-qt_codec = xineplug_decode_qt.la
-endif
+EXTRA_DIST = common.c
-xineplug_LTLIBRARIES = $(w32dll_codec) $(qt_codec)
+noinst_HEADERS = libwin32.h w32codec.h
-EXTRA_DIST = common.c
+if HAVE_W32DLL
+xineplug_LTLIBRARIES = xineplug_decode_w32dll.la xineplug_decode_qt.la
+endif
xineplug_decode_w32dll_la_SOURCES = w32codec.c
-xineplug_decode_w32dll_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS)
xineplug_decode_w32dll_la_DEPS = $(XDG_BASEDIR_DEPS)
xineplug_decode_w32dll_la_LIBADD = \
$(top_builddir)/src/libw32dll/wine/libwine.la \
- $(XINE_LIB) \
- $(PTHREAD_LIBS) \
- -lm \
$(top_builddir)/src/libw32dll/DirectShow/libds_filter.la \
$(top_builddir)/src/libw32dll/dmo/libdmo_filter.la \
- @KSTAT_LIBS@ \
- $(XDG_BASEDIR_LIBS)
+ $(XINE_LIB) $(PTHREAD_LIBS) -lm $(KSTAT_LIBS) $(XDG_BASEDIR_LIBS)
+xineplug_decode_w32dll_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS)
xineplug_decode_qt_la_SOURCES = qt_decoder.c
xineplug_decode_qt_la_LIBADD = \
$(top_builddir)/src/libw32dll/wine/libwine.la \
- $(XINE_LIB) \
- $(PTHREAD_LIBS) \
- -lm \
- @KSTAT_LIBS@
-
-noinst_HEADERS = libwin32.h w32codec.h
+ $(XINE_LIB) $(PTHREAD_LIBS) -lm $(KSTAT_LIBS)
diff --git a/src/libw32dll/dmo/Makefile.am b/src/libw32dll/dmo/Makefile.am
index 2b7cd3e37..663e179a9 100644
--- a/src/libw32dll/dmo/Makefile.am
+++ b/src/libw32dll/dmo/Makefile.am
@@ -1,27 +1,24 @@
include $(top_srcdir)/misc/Makefile.common
AM_CFLAGS = $(X_CFLAGS) -fno-omit-frame-pointer \
- -Wmissing-prototypes -Wimplicit-function-declaration \
- -DWIN32_PATH=\"@w32_path@\" -DNOAVIFILE_HEADERS \
+AM_CPPFLAGS = -DWIN32_PATH=\"$(w32_path)\" -DNOAVIFILE_HEADERS \
-I$(srcdir)/.. -I$(srcdir)/../wine
+
+noinst_HEADERS = \
+ DMO_AudioDecoder.h \
+ dmo_guids.h \
+ dmo_interfaces.h \
+ DMO_Filter.h \
+ dmo.h \
+ DMO_VideoDecoder.h
if HAVE_W32DLL
-dmo_filter_lib = libdmo_filter.la
+noinst_LTLIBRARIES = libdmo_filter.la
endif
-noinst_LTLIBRARIES = $(dmo_filter_lib)
-
libdmo_filter_la_SOURCES = \
buffer.c \
DMO_AudioDecoder.c \
dmo.c \
dmo_guids.c \
DMO_VideoDecoder.c
-
-noinst_HEADERS = \
- DMO_AudioDecoder.h \
- dmo_guids.h \
- dmo_interfaces.h \
- DMO_Filter.h \
- dmo.h \
- DMO_VideoDecoder.h
diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am
index 05f15f908..b9a28a151 100644
--- a/src/libw32dll/wine/Makefile.am
+++ b/src/libw32dll/wine/Makefile.am
@@ -1,37 +1,13 @@
include $(top_srcdir)/misc/Makefile.common
-EXTRA_DIST = stubs.s wrapper.S
-
-noinst_LTLIBRARIES = $(wine_lib)
-
# disable -fomit-frame-pointer, -finline-functions, and -frename-registers
# because they cause bad behavior of wine
-AM_CFLAGS = $(DEFAULT_OCFLAGS) $(X_CFLAGS) @W32_NO_OPTIMIZE@ \
+AM_CFLAGS = $(DEFAULT_OCFLAGS) $(X_CFLAGS) @W32_NO_OPTIMIZE@ \
-fno-omit-frame-pointer -fno-inline-functions -fno-rename-registers
-AM_CPPFLAGS = -DWIN32_PATH=\"@w32_path@\" -I$(srcdir)/.. -D__WINE__ \
+AM_CPPFLAGS = -DWIN32_PATH=\"$(w32_path)\" -I$(srcdir)/.. -D__WINE__ \
-Ddbg_printf=__vprintf -DTRACE=__vprintf
-
-if HAVE_W32DLL
-wine_lib = libwine.la
-endif
-
-libwine_la_SOURCES = \
- afl.c \
- driver.c \
- elfdll.c \
- ext.c \
- ldt_keeper.c \
- module.c \
- pe_image.c \
- pe_resource.c \
- resource.c \
- registry.c \
- vfl.c \
- win32.c \
- stubs.s \
- wrapper.S
-libwine_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS)
+EXTRA_DIST = stubs.s wrapper.S
noinst_HEADERS = \
avifmt.h \
@@ -71,3 +47,23 @@ noinst_HEADERS = \
winuser.h \
wrapper.h
+if HAVE_W32DLL
+noinst_LTLIBRARIES = libwine.la
+endif
+
+libwine_la_SOURCES = \
+ afl.c \
+ driver.c \
+ elfdll.c \
+ ext.c \
+ ldt_keeper.c \
+ module.c \
+ pe_image.c \
+ pe_resource.c \
+ resource.c \
+ registry.c \
+ vfl.c \
+ win32.c \
+ stubs.s \
+ wrapper.S
+libwine_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS)
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-16 10:08:53 +0000