virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

Fix building with C++ objects, variable names were inconsistent.

Browse Source 
Originally committed as revision 12608 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
François Revol
2008-03-27 16:10:18 +00:00
parent 9e81a0ce00
commit 0d14ab27a8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common.mak
View File

@@ -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)

4
libavdevice/Makefile
View File

@@ -20,7 +20,7 @@ OBJS-$(CONFIG_X11_GRAB_DEVICE_DEMUXER) += x11grab.o
# external libraries
OBJS-$(CONFIG_LIBDC1394_DEMUXER) += libdc1394.o
CPPOBJS-$(CONFIG_AUDIO_BEOS_DEMUXER) += beosaudio.o
CPPOBJS-$(CONFIG_AUDIO_BEOS_MUXER) += beosaudio.o
CPP_OBJS-$(CONFIG_AUDIO_BEOS_DEMUXER) += beosaudio.o
CPP_OBJS-$(CONFIG_AUDIO_BEOS_MUXER) += beosaudio.o
include ../common.mak