正在显示
1 个修改的文件
包含
6 行增加
和
4 行删除
| @@ -2,17 +2,19 @@ CXX = -O2 -Wall -D__STDC_CONSTANT_MACROS | @@ -2,17 +2,19 @@ CXX = -O2 -Wall -D__STDC_CONSTANT_MACROS | ||
| 2 | SRCDIR = pip | 2 | SRCDIR = pip |
| 3 | OBJDIR = obj | 3 | OBJDIR = obj |
| 4 | BINDIR = bin | 4 | BINDIR = bin |
| 5 | +FFMPEGDIR = /home/hubin/ffmpeg/ffmpeg-build-script/workspace | ||
| 5 | 6 | ||
| 6 | SRCS = AudioDecoder.cpp AVDecoder.cpp AVTranscoder.cpp merge_pip.cpp tools.cpp VideoDecoder.cpp | 7 | SRCS = AudioDecoder.cpp AVDecoder.cpp AVTranscoder.cpp merge_pip.cpp tools.cpp VideoDecoder.cpp |
| 7 | OBJS = $(SRCS:%.cpp=$(OBJDIR)/%.o) | 8 | OBJS = $(SRCS:%.cpp=$(OBJDIR)/%.o) |
| 8 | 9 | ||
| 9 | -LIBS = avfilter avdevice avformat avcodec swresample avutil pthread rtmp m z x264 swscale fdk-aac postproc swresample ogg speex ssl crypto dl rt | ||
| 10 | -LIBDIRS = /home/hubin/ffmpeg-thin/build-ffmpeg/build/lib/ | ||
| 11 | -#LIBDIRS = /home/hubin/ffmpeg_build/lib/ | 10 | +LIBS = avfilter avdevice avformat avcodec swresample avutil pthread m z x264 x265 mp3lame vpx swscale fdk-aac postproc swresample ogg dl rt |
| 11 | +LIBDIRS = $(FFMPEGDIR)/lib/ | ||
| 12 | + | ||
| 12 | LIBFLAGS = $(LIBS:%=-l%) | 13 | LIBFLAGS = $(LIBS:%=-l%) |
| 13 | LIBDIRFLAGS = $(LIBDIRS:%=-L%) | 14 | LIBDIRFLAGS = $(LIBDIRS:%=-L%) |
| 14 | 15 | ||
| 15 | -INCFLAGS = -Iinclude -I/home/hubin/ffmpeg-thin/build-ffmpeg/build/include | 16 | + |
| 17 | +INCFLAGS = -Iinclude -I$(FFMPEGDIR)/include | ||
| 16 | 18 | ||
| 17 | BIN_TRGTS = $(BINDIR)/merge_pip | 19 | BIN_TRGTS = $(BINDIR)/merge_pip |
| 18 | 20 |
-
请 注册 或 登录 后发表评论