mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 03:59:43 +00:00
Move MinGW special casing for shared lib creation to configure.
Originally committed as revision 5921 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
2965f17b4f
commit
5cb854e1c6
@ -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 $@ $<
|
||||
|
2
configure
vendored
2
configure
vendored
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user