RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-07 04:57:57 +00:00
Code Issues Projects Releases Wiki Activity

buildsys: fix c++ compilation

Browse Source 
Based on code by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-07-30 17:44:56 +02:00
parent 64a2c51f7b
commit 64f07754fe
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.mak
View File

@ -28,7 +28,7 @@ CPPFLAGS := $(IFLAGS) $(CPPFLAGS)
CFLAGS += $(ECFLAGS) CFLAGS += $(ECFLAGS)
CCFLAGS = $(CPPFLAGS) $(CFLAGS) CCFLAGS = $(CPPFLAGS) $(CFLAGS)
ASFLAGS := $(CPPFLAGS) $(ASFLAGS) ASFLAGS := $(CPPFLAGS) $(ASFLAGS)
CXXFLAGS := $(CFLAGS) $(CXXFLAGS) CXXFLAGS += $(CPPFLAGS) $(CFLAGS)
YASMFLAGS += $(IFLAGS) -I$(SRC_PATH)/libavutil/x86/ -Pconfig.asm YASMFLAGS += $(IFLAGS) -I$(SRC_PATH)/libavutil/x86/ -Pconfig.asm
HOSTCCFLAGS = $(IFLAGS) $(HOSTCFLAGS) HOSTCCFLAGS = $(IFLAGS) $(HOSTCFLAGS)
LDFLAGS := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS) LDFLAGS := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS)

4
configure vendored
View File

@ -688,7 +688,7 @@ check_cxx(){
log check_cxx "$@" log check_cxx "$@"
cat > $TMPCPP cat > $TMPCPP
log_file $TMPCPP log_file $TMPCPP
check_cmd $cxx $CPPFLAGS $CFLAGS $CXXFLAGS "$@" -c -o $TMPO $TMPCPP check_cmd $cxx $CPPFLAGS $CFLAGS $CXXFLAGS "$@" $CXX_C -o $TMPO $TMPCPP
} }
check_cpp(){ check_cpp(){
@ -1977,6 +1977,7 @@ AS_O='-o $@'
CC_C='-c' CC_C='-c'
CC_E='-E -o $@' CC_E='-E -o $@'
CC_O='-o $@' CC_O='-o $@'
CXX_C='-c'
CXX_O='-o $@' CXX_O='-o $@'
LD_O='-o $@' LD_O='-o $@'
HOSTCC_C='-c' HOSTCC_C='-c'
@ -3900,6 +3901,7 @@ AS_C=$AS_C
AS_O=$AS_O AS_O=$AS_O
CC_C=$CC_C CC_C=$CC_C
CC_O=$CC_O CC_O=$CC_O
CXX_C=$CXX_C
CXX_O=$CXX_O CXX_O=$CXX_O
LD_O=$LD_O LD_O=$LD_O
LDFLAGS=$LDFLAGS LDFLAGS=$LDFLAGS