summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2005-06-27 00:55:29 +0000
committerMichael Niedermayer <michaelni@gmx.at>2005-06-27 00:55:29 +0000
commit80581e9887ce9968516ec4d7a6a450eeec6e4ade (patch)
tree074650375c16b1d696a66798d3757f08e008b509 /libavcodec
parent16423e179bf2da7e961f60c2efb59fb31f671cc7 (diff)
x86_64 + PIC fix by (Jacob Meuser: jakemsr, jakemsr com)
Originally committed as revision 4397 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/Makefile4
-rw-r--r--libavcodec/libpostproc/Makefile2
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 9e38eefdc9..d7c7227d1a 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -409,10 +409,10 @@ libpostproc/libpostproc.a:
$(MAKE) -C libpostproc
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $<
+ $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
%.o: %.S
- $(CC) $(CFLAGS) -c -o $@ $<
+ $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
depend: $(SRCS)
$(CC) -MM $(CFLAGS) $^ 1>.depend
diff --git a/libavcodec/libpostproc/Makefile b/libavcodec/libpostproc/Makefile
index 0f4147896c..a12bc721e1 100644
--- a/libavcodec/libpostproc/Makefile
+++ b/libavcodec/libpostproc/Makefile
@@ -21,7 +21,7 @@ CFLAGS = $(OPTFLAGS) $(MLIB_INC) -I. -I.. $(EXTRA_INC)
# .PHONY: all clean
.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)