Commit 814109aa authored by mru's avatar mru

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.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19409 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 7cd36a7a
...@@ -21,7 +21,7 @@ ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale ...@@ -21,7 +21,7 @@ ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale
CPPFLAGS += -DHAVE_AV_CONFIG_H -I$(BUILD_ROOT_REL) -I$(SRC_PATH) CPPFLAGS += -DHAVE_AV_CONFIG_H -I$(BUILD_ROOT_REL) -I$(SRC_PATH)
%.o: %.c %.o: %.c
$(CC) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< $(CC) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -c $(CC_O) $<
%.o: %.S %.o: %.S
$(AS) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< $(AS) $(CPPFLAGS) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
......
...@@ -1263,6 +1263,8 @@ SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)' ...@@ -1263,6 +1263,8 @@ SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)' SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(LIBDIR)/$(LIBNAME)"' LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(LIBDIR)/$(LIBNAME)"'
CC_O='-o $@'
host_cflags='-O3 -g -Wall' host_cflags='-O3 -g -Wall'
host_libs='-lm' host_libs='-lm'
...@@ -2493,6 +2495,7 @@ enabled stripping && ...@@ -2493,6 +2495,7 @@ enabled stripping &&
echo "CPPFLAGS?=$CPPFLAGS" >> config.mak echo "CPPFLAGS?=$CPPFLAGS" >> config.mak
echo "CFLAGS=$CFLAGS" >> config.mak echo "CFLAGS=$CFLAGS" >> config.mak
echo "CC_O=$CC_O" >> config.mak
echo "LDFLAGS=$LDFLAGS" >> config.mak echo "LDFLAGS=$LDFLAGS" >> config.mak
echo "FFSERVERLDFLAGS=$FFSERVERLDFLAGS" >> config.mak echo "FFSERVERLDFLAGS=$FFSERVERLDFLAGS" >> config.mak
echo "SHFLAGS=$SHFLAGS" >> config.mak echo "SHFLAGS=$SHFLAGS" >> config.mak
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment