aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2009-07-12 13:29:46 +0000
committerMåns Rullgård <mans@mansr.com>2009-07-12 13:29:46 +0000
commit7e6c86e65ddb7cef13f856acf0e10737e10564d3 (patch)
treecf0f728c10c0b17231ebb2a9d73c14a00e6ca74f
parent50567afa5a2afe1e19e75842115749905099bfc7 (diff)
downloadffmpeg-7e6c86e65ddb7cef13f856acf0e10737e10564d3.tar.gz
Allow unusual ways of specifying compiler output file
Some compilers do not use the typical -c -o foo.o style. This allows compiler-specific equivalents to be set by the configure script. Originally committed as revision 19409 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--common.mak2
-rwxr-xr-xconfigure3
2 files changed, 4 insertions, 1 deletions
diff --git a/common.mak b/common.mak
index 20d32ed835..0d3b0d1258 100644
--- a/common.mak
+++ b/common.mak
@@ -21,7 +21,7 @@ ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale
CPPFLAGS += -DHAVE_AV_CONFIG_H -I$(BUILD_ROOT_REL) -I$(SRC_PATH)
%.o: %.c
- $(CC) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -c $(CC_O) $<
%.o: %.S
$(AS) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
diff --git a/configure b/configure
index 8660c40289..f3b2ee6e35 100755
--- a/configure
+++ b/configure
@@ -1263,6 +1263,8 @@ SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(LIBDIR)/$(LIBNAME)"'
+CC_O='-o $@'
+
host_cflags='-O3 -g -Wall'
host_libs='-lm'
@@ -2493,6 +2495,7 @@ enabled stripping &&
echo "CPPFLAGS?=$CPPFLAGS" >> config.mak
echo "CFLAGS=$CFLAGS" >> config.mak
+echo "CC_O=$CC_O" >> config.mak
echo "LDFLAGS=$LDFLAGS" >> config.mak
echo "FFSERVERLDFLAGS=$FFSERVERLDFLAGS" >> config.mak
echo "SHFLAGS=$SHFLAGS" >> config.mak