aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMohamed Naufal <naufal22@gmail.com>2011-08-31 04:11:25 +0530
committerMohamed Naufal <naufal22@gmail.com>2011-08-31 04:54:50 +0530
commit006d2ab4844e4fa96e5abd0a2bb4a6a8edc6b8a8 (patch)
tree21f64c425b2dbb8661876f335620b4e7aa636796 /Makefile
parent2e2594ca5ba64705114bc26bbb264af245352a73 (diff)
downloadffmpeg-006d2ab4844e4fa96e5abd0a2bb4a6a8edc6b8a8.tar.gz
C++ Support ;)
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 28ca055aad..954d5b6ffc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
include config.mak
vpath %.c $(SRC_PATH)
+vpath %.cpp $(SRC_PATH)
vpath %.h $(SRC_PATH)
vpath %.S $(SRC_PATH)
vpath %.asm $(SRC_PATH)
@@ -10,7 +11,7 @@ vpath %.texi $(SRC_PATH)
ifndef V
Q = @
ECHO = printf "$(1)\t%s\n" $(2)
-BRIEF = CC AS YASM AR LD HOSTCC
+BRIEF = CC CXX AS YASM AR LD HOSTCC
SILENT = DEPCC YASMDEP RM RANLIB
MSG = $@
M = @$(call ECHO,$(TAG),$@);
@@ -26,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)
@@ -36,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)