[Ffmpeg-devel] time for a release?
Diego Biurrun
diego
Sun Jan 29 17:47:21 CET 2006
On Sat, Jan 28, 2006 at 01:23:02AM +0100, Alexander Strasser wrote:
>
> --- configure 24 Jan 2006 19:57:41 -0000 1.239
> +++ configure 28 Jan 2006 00:15:21 -0000
> @@ -607,6 +617,17 @@
> esac
> done
>
> +# we need to build at least one type of libs
at least one lib type
> +if test "$lstatic" = "no" && test "$lshared" = "no" ; then
> + cat <<EOF
> +At least one type of libs must be build.
dito
> + Specify --enable-static to build the static libs or --enable-shared to build
> +the shared libs too. For only building the shared libs specify --disable-static
> +in addition to --enable-shared.
Why this strange indentation?
> @@ -869,6 +890,15 @@
> fi
>
> if test "$mingw32" = "yes" -o "$mingwce" = "yes"; then
> + if test "$lshared" = "yes" && test "$lstatic" = "yes" ; then
> + cat <<EOF
> +You can only build one type of libs at once on MinGW.
one lib type
> + Specify --disable-static --enable-shared to build
> +the shared libraries only. To build only the static
> +libs you don't need to pass additional options.
dito
> @@ -1364,7 +1395,6 @@
> echo "BUILDSUF=$BUILDSUF" >> config.mak
> echo "LIBPREF=$LIBPREF" >> config.mak
> echo "LIBSUF=\${BUILDSUF}$LIBSUF" >> config.mak
> -echo "LIB=$LIB" >> config.mak
> echo "SLIBPREF=$SLIBPREF" >> config.mak
> echo "SLIBSUF=\${BUILDSUF}$SLIBSUF" >> config.mak
> echo "EXESUF=\${BUILDSUF}$EXESUF" >> config.mak
> @@ -1507,7 +1537,11 @@
>
>
>
> +if test "$lstatic" = "yes" ; then
> + echo "LIB=$LIB" >> config.mak
> +fi
> if test "$lshared" = "yes" ; then
I'd prefer if the LIB thing remained where it was, it would be clearer
to me.
> --- libavcodec/Makefile 26 Jan 2006 23:42:28 -0000 1.229
> +++ libavcodec/Makefile 28 Jan 2006 00:15:21 -0000
> @@ -422,7 +422,7 @@
> $(MAKE) -C libpostproc
> endif
> ifeq ($(CONFIG_WIN32),yes)
> - $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
> + $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def),--out-implib,lib$(SLIBNAME:$(SLIBSUF)=.dll.a) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
This should somehow be moved to configure, it's duplicated in
the other Makefiles as well. The issue is unrelated to this patch,
though, so let's fix it separately.
> --- libavutil/Makefile 26 Jan 2006 23:42:29 -0000 1.11
> +++ libavutil/Makefile 28 Jan 2006 00:15:22 -0000
> @@ -6,7 +6,7 @@
>
> -CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
> +CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -DBUILD_AVUTIL -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
> --- libavutil/common.h 22 Jan 2006 18:34:17 -0000 1.160
> +++ libavutil/common.h 28 Jan 2006 00:15:22 -0000
> @@ -247,6 +247,13 @@
>
> +#if defined(__MINGW32__) && !defined(BUILD_AVUTIL) && defined(BUILD_SHARED_AV)
Maybe I'm just blind, but it looks to me as if BUILD_AVUTIL will always
be defined..
Diego
More information about the ffmpeg-devel
mailing list