diff options
| author | Stephen Torri <storri@users.sourceforge.net> | 2002-10-09 05:13:38 +0000 |
|---|---|---|
| committer | Stephen Torri <storri@users.sourceforge.net> | 2002-10-09 05:13:38 +0000 |
| commit | 174abfc85ddc0220efecd4b7cda27816ef999c10 (patch) | |
| tree | bea33d1e79ecede96198db8ea09966e0537831ad /src/libw32dll | |
| parent | 64090090df11d9179eac3f19b784f544cdb7cce5 (diff) | |
| download | xine-lib-174abfc85ddc0220efecd4b7cda27816ef999c10.tar.gz xine-lib-174abfc85ddc0220efecd4b7cda27816ef999c10.tar.bz2 | |
configure.ac:
- OpenGL header GL/gl.h is checked to see if its exists with wrong
header name (GL/GL.h). Test failed despite the file required by
src/video_out/video_out_opengl.c was GL/gl.h
- Ascii-Art library version incorrect. Required version is 1.4
(contains aalib-config)
m4/aa.m4:
- Changed aalib version to 1.4
src/audio_out/Makefile.am:
src/demuxers/Makefile.am:
src/dxr3/Makefile.am:
src/input/Makefile.am:
src/input/libdvdnav/Makefile.am:
src/input/libdvdread/Makefile.am:
src/libffmpeg/libavcodec/Makefile.am:
src/libffmpeg/libavcodec/i386/Makefile.am:
src/libffmpeg/libavcodec/mlib/Makefile.am:
src/libmad/Makefile.am:
src/libmpeg2/Makefile.am:
src/libvorbis/Makefile.am:
src/libw32dll/Makefile.am:
src/libw32dll/wine/Makefile.am:
src/libxineadec/Makefile.am:
src/libxvid/Makefile.am:
src/video_out/Makefile.am:
src/video_out/libdha/Makefile.am:
src/video_out/vidix/Makefile.am:
src/xine-engine/Makefile.am:
src/xine-utils/Makefile.am:
- Removed @CFLAGS@ from all AM_CFLAGS. @CFLAGS@ are added in Makefile.in.
Adding it here was redundant. Thanks to Mike and others for pointing this
out.
CVS patchset: 2805
CVS date: 2002/10/09 05:13:38
Diffstat (limited to 'src/libw32dll')
| -rw-r--r-- | src/libw32dll/DirectShow/Makefile.am | 10 | ||||
| -rw-r--r-- | src/libw32dll/Makefile.am | 4 | ||||
| -rw-r--r-- | src/libw32dll/wine/Makefile.am | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/libw32dll/DirectShow/Makefile.am b/src/libw32dll/DirectShow/Makefile.am index 6a6526639..688060d88 100644 --- a/src/libw32dll/DirectShow/Makefile.am +++ b/src/libw32dll/DirectShow/Makefile.am @@ -1,13 +1,13 @@ -CFLAGS = @CFLAGS@ $(X_CFLAGS) -fno-omit-frame-pointer \ +AM_CFLAGS = $(X_CFLAGS) -fno-omit-frame-pointer \ -Wmissing-prototypes -Wimplicit-function-declaration \ -DWIN32_PATH=\"@w32_path@\" -DNOAVIFILE_HEADERS \ -I$(srcdir)/.. -I$(srcdir)/../wine -DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(X_CFLAGS) -fno-omit-frame-pointer \ - -Wmissing-prototypes -Wimplicit-function-declaration \ - -DWIN32_PATH=\\\"@w32_path@\\\" -DNOAVIFILE_HEADERS \ - -I$(srcdir)/.. -I$(srcdir)/../wine +#DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(X_CFLAGS) -fno-omit-frame-pointer \ +# -Wmissing-prototypes -Wimplicit-function-declaration \ +# -DWIN32_PATH=\\\"@w32_path@\\\" -DNOAVIFILE_HEADERS \ +# -I$(srcdir)/.. -I$(srcdir)/../wine if HAVE_W32DLL ds_filter_lib = libds_filter.la diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am index 10cfcd4a7..aa7990bdb 100644 --- a/src/libw32dll/Makefile.am +++ b/src/libw32dll/Makefile.am @@ -1,6 +1,6 @@ -CFLAGS = @CFLAGS@ -I$(srcdir)/wine +AM_CFLAGS = -I$(srcdir)/wine -DEBUG_CFLAGS = @DEBUG_CFLAGS@ -I$(srcdir)/wine +#DEBUG_CFLAGS = @DEBUG_CFLAGS@ -I$(srcdir)/wine SUBDIRS = wine DirectShow diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am index ef6665398..ecae2cdaa 100644 --- a/src/libw32dll/wine/Makefile.am +++ b/src/libw32dll/wine/Makefile.am @@ -4,15 +4,15 @@ noinst_LTLIBRARIES = $(wine_lib) ## ## -CFLAGS = @CFLAGS@ $(X_CFLAGS) -fno-omit-frame-pointer \ +AM_CFLAGS = $(X_CFLAGS) -fno-omit-frame-pointer \ -Wmissing-prototypes -Wimplicit-function-declaration \ -DWIN32_PATH=\"@w32_path@\" -I$(srcdir)/.. -D__WINE__ \ -Ddbg_printf=__vprintf -DTRACE=__vprintf -fno-omit-frame-pointer -DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(X_CFLAGS) -fno-omit-frame-pointer \ - -Wmissing-prototypes -Wimplicit-function-declaration \ - -DWIN32_PATH=\\\"@w32_path@\\\" -I$(srcdir)/.. -D__WINE__ \ - -Ddbg_printf=__vprintf -DTRACE=__vprintf -fno-omit-frame-pointer +#DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(X_CFLAGS) -fno-omit-frame-pointer \ +# -Wmissing-prototypes -Wimplicit-function-declaration \ +# -DWIN32_PATH=\\\"@w32_path@\\\" -I$(srcdir)/.. -D__WINE__ \ +# -Ddbg_printf=__vprintf -DTRACE=__vprintf -fno-omit-frame-pointer if HAVE_W32DLL |