diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-14 01:23:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-14 01:23:16 +0200 |
| commit | 15240feb992b6b41ca4afba928b9cb6edb0dc9fb (patch) | |
| tree | 32426c5114bb571a7dba06412ac737a66c1bdd0a /common.mak | |
| parent | f27f68eb4f7cb43a4d023ce5d1ebd2292313bd9f (diff) | |
| parent | 9c29ab58517cae8d56c7ed7fd5070d8f8c8d429e (diff) | |
| download | ffmpeg-15240feb992b6b41ca4afba928b9cb6edb0dc9fb.tar.gz | |
Merge remote-tracking branch 'hexene/scratchpad'
* hexene/scratchpad:
Move & Rename buildscript, remove tabs
Fix regular build
Support (H/W accelerated) H.264 decoding on Android via Stagefright
Add build-script for Android
C++ Support ;)
Conflicts:
Changelog
Makefile
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'common.mak')
| -rw-r--r-- | common.mak | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/common.mak b/common.mak index 0b44034ca1..bad86fde3b 100644 --- a/common.mak +++ b/common.mak @@ -10,7 +10,7 @@ ifndef SUBDIR ifndef V Q = @ ECHO = printf "$(1)\t%s\n" $(2) -BRIEF = CC AS YASM AR LD HOSTCC STRIP CP +BRIEF = CC CXX AS YASM AR LD HOSTCC STRIP CP SILENT = DEPCC YASMDEP RM RANLIB MSG = $@ M = @$(call ECHO,$(TAG),$@); @@ -27,6 +27,7 @@ IFLAGS := -I. -I$(SRC_PATH)/ CPPFLAGS := $(IFLAGS) $(CPPFLAGS) CFLAGS += $(ECFLAGS) CCFLAGS = $(CFLAGS) +CXXFLAGS := $(CFLAGS) $(CXXFLAGS) YASMFLAGS += $(IFLAGS) -I$(SRC_PATH)/libavutil/x86/ -Pconfig.asm HOSTCFLAGS += $(IFLAGS) LDFLAGS := $(ALLFFLIBS:%=-Llib%) $(LDFLAGS) @@ -37,11 +38,15 @@ define COMPILE endef COMPILE_C = $(call COMPILE,CC) +COMPILE_CXX = $(call COMPILE,CXX) COMPILE_S = $(call COMPILE,AS) %.o: %.c $(COMPILE_C) +%.o: %.cpp + $(COMPILE_CXX) + %.o: %.S $(COMPILE_S) |