diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-08-03 16:27:30 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-08-03 16:27:30 +0000 |
| commit | 5cb854e1c68330f5dd0ca13cabb2a9a58b53b7eb (patch) | |
| tree | 9fb5de3750bfb6fb12af196434a9f6f678e11d4e | |
| parent | 2965f17b4fd371438fbc2cb401f1562cdda6df5b (diff) | |
| download | ffmpeg-5cb854e1c68330f5dd0ca13cabb2a9a58b53b7eb.tar.gz | |
Move MinGW special casing for shared lib creation to configure.
Originally committed as revision 5921 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | common.mak | 4 | ||||
| -rwxr-xr-x | configure | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common.mak b/common.mak index 41cac95ca1..2748e5ed46 100644 --- a/common.mak +++ b/common.mak @@ -22,9 +22,7 @@ $(SLIBNAME): $(SLIBNAME_WITH_MAJOR) $(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS) $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS) -ifeq ($(CONFIG_MINGW),yes) - -lib /machine:i386 /def:$(@:.dll=.def) -endif + $(SLIB_EXTRA_CMD) %.o: %.c $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< @@ -884,6 +884,7 @@ EOF EXESUF=".exe" SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)' SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)' + SLIB_EXTRA_CMD='-lib /machine:i386 /def:$(@:.dll=.def)' if test "$force_prefix" != yes; then PREFIX="$PROGRAMFILES/FFmpeg"; fi if test "$force_libdir" != yes; then bindir="$PREFIX"; fi fi @@ -1739,6 +1740,7 @@ if test "$lshared" = "yes" ; then echo "SLIBNAME=${SLIBNAME}" >> config.mak echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak echo "SLIBNAME_WITH_MAJOR=${SLIBNAME_WITH_MAJOR}" >> config.mak + echo "SLIB_EXTRA_CMD=${SLIB_EXTRA_CMD}" >> config.mak fi echo "EXTRALIBS=$extralibs" >> config.mak |