diff options
| author | François Revol <revol@free.fr> | 2008-03-27 16:10:18 +0000 |
|---|---|---|
| committer | François Revol <revol@free.fr> | 2008-03-27 16:10:18 +0000 |
| commit | 0d14ab27a805c23b804b6ef9bef6263e092cdfce (patch) | |
| tree | ccbb25fe0f86accffc2bd16d523f569ed5b88894 /common.mak | |
| parent | 9e81a0ce00e2fbbe2f70184e12c9eec17a3ce831 (diff) | |
Fix building with C++ objects, variable names were inconsistent.
Originally committed as revision 12608 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'common.mak')
| -rw-r--r-- | common.mak | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common.mak b/common.mak index a8a8b256b9..11017c01e8 100644 --- a/common.mak +++ b/common.mak @@ -26,8 +26,8 @@ CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ EXTRALIBS := $(addprefix -l,$(addsuffix $(BUILDSUF),$(FFLIBS))) $(EXTRALIBS) LDFLAGS := $(addprefix -L$(BUILD_ROOT)/lib,$(FFLIBS)) $(LDFLAGS) -SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp) -OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS) +SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPP_OBJS:.o=.cpp) +OBJS := $(OBJS) $(ASM_OBJS) $(CPP_OBJS) all: $(LIBNAME) $(SLIBNAME) |