Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename FFSLDFLAGS variable to FFSERVERLDFLAGS to lessen confusion.

Browse Source 
Originally committed as revision 5817 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Diego Biurrun 19 years ago
parent d8cfa5534a
commit c536cb09f9
2 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Makefile
  2. 10
      configure

2
Makefile
Unescape View File

@ -72,7 +72,7 @@ ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
$(CC) $(FFLIBDIRS) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(CC) $(FFLIBDIRS) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
ffserver$(EXESUF): ffserver.o .libs ffserver$(EXESUF): ffserver.o .libs
$(CC) $(FFLIBDIRS) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS) $(CC) $(FFLIBDIRS) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
$(CC) $(FFLIBDIRS) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS) $(CC) $(FFLIBDIRS) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)

10
configure vendored
Unescape View File

@ -444,7 +444,7 @@ ffserver="yes"
ffplay="yes" ffplay="yes"
LIBOBJFLAGS="" LIBOBJFLAGS=""
FFLDFLAGS=-Wl,--warn-common FFLDFLAGS=-Wl,--warn-common
FFSLDFLAGS=-Wl,-E FFSERVERLDFLAGS=-Wl,-E
LDCONFIG="ldconfig" LDCONFIG="ldconfig"
LIBPREF="lib" LIBPREF="lib"
LIBSUF=".a" LIBSUF=".a"
@ -506,7 +506,7 @@ audio_oss="no"
dv1394="no" dv1394="no"
make="gmake" make="gmake"
FFLDFLAGS="" FFLDFLAGS=""
FFSLDFLAGS="" FFSERVERLDFLAGS=""
SHFLAGS="-shared -Wl,-h,\$@" SHFLAGS="-shared -Wl,-h,\$@"
need_inet_aton="yes" need_inet_aton="yes"
extralibs="$extralibs -lsocket -lnsl" extralibs="$extralibs -lsocket -lnsl"
@ -575,7 +575,7 @@ FFLDFLAGS="-Wl,-dynamic,-search_paths_first"
SLIBSUF=".dylib" SLIBSUF=".dylib"
SLIBNAME_WITH_FULLVERSION='$(SLIBPREF)$(NAME).$(LIBVERSION)$(SLIBSUF)' SLIBNAME_WITH_FULLVERSION='$(SLIBPREF)$(NAME).$(LIBVERSION)$(SLIBSUF)'
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME).$(LIBMAJOR)$(SLIBSUF)' SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME).$(LIBMAJOR)$(SLIBSUF)'
FFSLDFLAGS=-Wl,-bind_at_load FFSERVERLDFLAGS=-Wl,-bind_at_load
;; ;;
MINGW32*) MINGW32*)
# Note: the rest of the mingw32 config is done afterwards as mingw32 # Note: the rest of the mingw32 config is done afterwards as mingw32
@ -614,7 +614,7 @@ strip="echo ignoring strip"
CFLAGS="$CFLAGS -Zomf" CFLAGS="$CFLAGS -Zomf"
FFLDFLAGS="-Zomf -Zstack 16384 -s" FFLDFLAGS="-Zomf -Zstack 16384 -s"
SHFLAGS="-Zdll -Zomf" SHFLAGS="-Zdll -Zomf"
FFSLDFLAGS="" FFSERVERLDFLAGS=""
LIBPREF="" LIBPREF=""
LIBSUF=".lib" LIBSUF=".lib"
SLIBPREF="" SLIBPREF=""
@ -1586,7 +1586,7 @@ echo "OPTFLAGS=$CFLAGS" >> config.mak
echo "SHCFLAGS=$SHCFLAGS">>config.mak echo "SHCFLAGS=$SHCFLAGS">>config.mak
echo "LDFLAGS=$LDFLAGS" >> config.mak echo "LDFLAGS=$LDFLAGS" >> config.mak
echo "LDCONFIG=$LDCONFIG" >> config.mak echo "LDCONFIG=$LDCONFIG" >> config.mak
echo "FFSLDFLAGS=$FFSLDFLAGS" >> config.mak echo "FFSERVERLDFLAGS=$FFSERVERLDFLAGS" >> config.mak
echo "SHFLAGS=$SHFLAGS" >> config.mak echo "SHFLAGS=$SHFLAGS" >> config.mak
echo "VHOOKFLAGS=$VHOOKFLAGS" >> config.mak echo "VHOOKFLAGS=$VHOOKFLAGS" >> config.mak
echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak

Write Preview
Loading…
Cancel
Save