virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

x86_64 + PIC fix by (Jacob Meuser: jakemsr, jakemsr com)

Browse Source 
Originally committed as revision 4397 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2005-06-27 00:55:29 +00:00
parent 16423e179b
commit 80581e9887
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@ -197,6 +197,7 @@ netserver="no"
need_inet_aton="no" need_inet_aton="no"
ffserver="yes" ffserver="yes"
ffplay="yes" ffplay="yes"
LIBOBJFLAGS=""
LDFLAGS=-Wl,--warn-common LDFLAGS=-Wl,--warn-common
FFSLDFLAGS=-Wl,-E FFSLDFLAGS=-Wl,-E
LDCONFIG="ldconfig" LDCONFIG="ldconfig"
@ -276,7 +277,7 @@ bktr="yes"
audio_oss="yes" audio_oss="yes"
dv1394="no" dv1394="no"
make="gmake" make="gmake"
CFLAGS="$CFLAGS \$(PIC)" LIBOBJFLAGS="\$(PIC)"
LDFLAGS="$LDFLAGS -export-dynamic -pthread" LDFLAGS="$LDFLAGS -export-dynamic -pthread"
LDCONFIG="ldconfig -m \$(libdir)" LDCONFIG="ldconfig -m \$(libdir)"
extralibs="$extralibs -lossaudio" extralibs="$extralibs -lossaudio"
@ -1103,6 +1104,16 @@ if test "$optimize" = "yes"; then
fi fi
fi fi
# PIC flags for shared library objects where they are needed
if test "$lshared" = "yes" ; then
# LIBOBJFLAGS may have already been set in the OS configuration
if test -z "$LIBOBJFLAGS" ; then
if test "$cpu" = "x86_64" ; then
LIBOBJFLAGS="\$(PIC)"
fi
fi
fi
if test x"$bindir" = x""; then if test x"$bindir" = x""; then
bindir="${prefix}/bin" bindir="${prefix}/bin"
fi fi
@ -1219,6 +1230,7 @@ echo "LDFLAGS=$LDFLAGS" >> config.mak
echo "LDCONFIG=$LDCONFIG" >> config.mak echo "LDCONFIG=$LDCONFIG" >> config.mak
echo "FFSLDFLAGS=$FFSLDFLAGS" >> config.mak echo "FFSLDFLAGS=$FFSLDFLAGS" >> config.mak
echo "SHFLAGS=$SHFLAGS" >> config.mak echo "SHFLAGS=$SHFLAGS" >> config.mak
echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak
echo "BUILDSUF=$BUILDSUF" >> config.mak echo "BUILDSUF=$BUILDSUF" >> config.mak
echo "LIBPREF=$LIBPREF" >> config.mak echo "LIBPREF=$LIBPREF" >> config.mak
echo "LIBSUF=\${BUILDSUF}$LIBSUF" >> config.mak echo "LIBSUF=\${BUILDSUF}$LIBSUF" >> config.mak

4
libavcodec/Makefile
View File

@ -409,10 +409,10 @@ libpostproc/libpostproc.a:
$(MAKE) -C libpostproc $(MAKE) -C libpostproc
%.o: %.c %.o: %.c
$(CC) $(CFLAGS) -c -o $@ $< $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
%.o: %.S %.o: %.S
$(CC) $(CFLAGS) -c -o $@ $< $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
depend: $(SRCS) depend: $(SRCS)
$(CC) -MM $(CFLAGS) $^ 1>.depend $(CC) -MM $(CFLAGS) $^ 1>.depend

2
libavcodec/libpostproc/Makefile
View File

@ -21,7 +21,7 @@ CFLAGS = $(OPTFLAGS) $(MLIB_INC) -I. -I.. $(EXTRA_INC)
# .PHONY: all clean # .PHONY: all clean
.c.o: .c.o:
$(CC) -c $(CFLAGS) -I$(SRC_PATH)/libavcodec -I../.. -o $@ $< $(CC) -c $(CFLAGS) $(LIBOBJFLAGS) -I$(SRC_PATH)/libavcodec -I../.. -o $@ $<
all: $(SWSLIB) $(PPLIB) $(SPPLIB) all: $(SWSLIB) $(PPLIB) $(SPPLIB)

2
libavformat/Makefile
View File

@ -134,7 +134,7 @@ install-headers:
install -m 644 ../libavformat.pc $(libdir)/pkgconfig install -m 644 ../libavformat.pc $(libdir)/pkgconfig
%.o: %.c %.o: %.c
$(CC) $(CFLAGS) -c -o $@ $< $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
# BeOS: remove -Wall to get rid of all the "multibyte constant" warnings # BeOS: remove -Wall to get rid of all the "multibyte constant" warnings
%.o: %.cpp %.o: %.cpp