Skip to content
Snippets Groups Projects
Commit 5cb854e1 authored by Diego Biurrun's avatar Diego Biurrun
Browse files

Move MinGW special casing for shared lib creation to configure.

Originally committed as revision 5921 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 2965f17b
No related branches found
No related tags found
No related merge requests found
...@@ -22,9 +22,7 @@ $(SLIBNAME): $(SLIBNAME_WITH_MAJOR) ...@@ -22,9 +22,7 @@ $(SLIBNAME): $(SLIBNAME_WITH_MAJOR)
$(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS) $(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
$(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS) $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS)
ifeq ($(CONFIG_MINGW),yes) $(SLIB_EXTRA_CMD)
-lib /machine:i386 /def:$(@:.dll=.def)
endif
%.o: %.c %.o: %.c
$(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
......
...@@ -884,6 +884,7 @@ EOF ...@@ -884,6 +884,7 @@ EOF
EXESUF=".exe" EXESUF=".exe"
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)' SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(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_prefix" != yes; then PREFIX="$PROGRAMFILES/FFmpeg"; fi
if test "$force_libdir" != yes; then bindir="$PREFIX"; fi if test "$force_libdir" != yes; then bindir="$PREFIX"; fi
fi fi
...@@ -1739,6 +1740,7 @@ if test "$lshared" = "yes" ; then ...@@ -1739,6 +1740,7 @@ if test "$lshared" = "yes" ; then
echo "SLIBNAME=${SLIBNAME}" >> config.mak echo "SLIBNAME=${SLIBNAME}" >> config.mak
echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
echo "SLIBNAME_WITH_MAJOR=${SLIBNAME_WITH_MAJOR}" >> config.mak echo "SLIBNAME_WITH_MAJOR=${SLIBNAME_WITH_MAJOR}" >> config.mak
echo "SLIB_EXTRA_CMD=${SLIB_EXTRA_CMD}" >> config.mak
fi fi
echo "EXTRALIBS=$extralibs" >> config.mak echo "EXTRALIBS=$extralibs" >> config.mak
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment