Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
b1ca9642
F
Ffmpeg
项目概览
小白菜888
/
Ffmpeg
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Ffmpeg
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b1ca9642
编写于
4月 01, 2011
作者:
M
Michael Niedermayer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "Remove support for stripping executables"
People did not like this change. This reverts commit
e0be794a
.
上级
607cd90c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
27 addition
and
6 deletion
+27
-6
Makefile
Makefile
+10
-4
common.mak
common.mak
+1
-1
configure
configure
+15
-1
subdir.mak
subdir.mak
+1
-0
未找到文件。
Makefile
浏览文件 @
b1ca9642
...
...
@@ -10,6 +10,7 @@ PROGS-$(CONFIG_FFPROBE) += ffprobe
PROGS-$(CONFIG_FFSERVER)
+=
ffserver
PROGS
:=
$
(
PROGS-yes:%
=
%
$(EXESUF)
)
PROGS_G
=
$
(
PROGS-yes:%
=
%_g
$(EXESUF)
)
OBJS
=
$
(
PROGS-yes:%
=
%.o
)
cmdutils.o
MANPAGES
=
$
(
PROGS-yes:%
=
doc/%.1
)
PODPAGES
=
$
(
PROGS-yes:%
=
doc/%.pod
)
...
...
@@ -20,6 +21,7 @@ HOSTPROGS := $(TESTTOOLS:%=tests/%)
BASENAMES
=
ffmpeg ffplay ffprobe ffserver
ALLPROGS
=
$
(
BASENAMES:%
=
%
$(EXESUF)
)
ALLPROGS_G
=
$
(
BASENAMES:%
=
%_g
$(EXESUF)
)
ALLMANPAGES
=
$(BASENAMES:%=%.1)
FFLIBS-$(CONFIG_AVDEVICE)
+=
avdevice
...
...
@@ -51,6 +53,10 @@ INSTALL_PROGS_TARGETS-$(CONFIG_SHARED) = install-libs
all
:
$(FF_DEP_LIBS) $(PROGS) $(ALL_TARGETS-yes)
$(PROGS)
:
%$(EXESUF): %_g$(EXESUF)
$(CP)
$<
$@
$(STRIP)
$@
config.h
:
.config
.config
:
$(wildcard $(FFLIBS:%=$(SRC_DIR)/lib%/all*.c))
@
-tput
bold 2>/dev/null
...
...
@@ -74,10 +80,10 @@ endef
$(foreach
D,$(FFLIBS),$(eval
$(call
DOSUBDIR,lib$(D))))
ffplay$(EXESUF)
:
FF_EXTRALIBS += $(SDL_LIBS)
ffserver$(EXESUF)
:
FF_LDFLAGS += $(FFSERVERLDFLAGS)
ffplay
_g
$(EXESUF)
:
FF_EXTRALIBS += $(SDL_LIBS)
ffserver
_g
$(EXESUF)
:
FF_LDFLAGS += $(FFSERVERLDFLAGS)
%$(EXESUF)
:
%.o cmdutils.o $(FF_DEP_LIBS)
%
_g
$(EXESUF)
:
%.o cmdutils.o $(FF_DEP_LIBS)
$(LD)
$(FF_LDFLAGS)
-o
$@
$<
cmdutils.o
$(FF_EXTRALIBS)
tools/%$(EXESUF)
:
tools/%.o
...
...
@@ -159,7 +165,7 @@ testclean:
$(RM)
$
(
TESTTOOLS:%
=
tests/%
$(HOSTEXESUF)
)
clean
::
testclean
$(RM)
$(ALLPROGS)
$(RM)
$(ALLPROGS)
$(ALLPROGS_G)
$(RM)
$(CLEANSUFFIXES)
$(RM)
doc/
*
.html doc/
*
.pod doc/
*
.1
$(RM)
$(TOOLS)
...
...
common.mak
浏览文件 @
b1ca9642
...
...
@@ -21,7 +21,7 @@ endif
ifndef
V
Q
=
@
ECHO
=
printf
"
$(1)
\t
%s
\n
"
$(2)
BRIEF
=
CC AS YASM AR LD HOSTCC
BRIEF
=
CC AS YASM AR LD HOSTCC
STRIP CP
SILENT
=
DEPCC YASMDEP RM RANLIB
MSG
=
$@
M
=
@
$(
call
ECHO,
$(TAG)
,
$@
)
;
...
...
configure
浏览文件 @
b1ca9642
...
...
@@ -243,6 +243,7 @@ Developer options (useful when working on FFmpeg itself):
--enable-debug=LEVEL set the debug level [
$debuglevel
]
--disable-optimizations disable compiler optimizations
--enable-extra-warnings enable more compiler warnings
--disable-stripping disable stripping of executables and shared libraries
--samples=PATH location of test samples for FATE, if not set use
\$
FATE_SAMPLES at make invocation time.
...
...
@@ -1146,6 +1147,7 @@ CMDLINE_SELECT="
extra_warnings
logging
optimizations
stripping
symver
yasm
"
...
...
@@ -1183,6 +1185,7 @@ CMDLINE_SET="
pkg_config
samples
source_path
strip
sysinclude
sysroot
target_exec
...
...
@@ -1622,6 +1625,7 @@ nm_default="nm"
objformat
=
"elf"
pkg_config_default
=
pkg-config
ranlib
=
"ranlib"
strip_default
=
"strip"
yasmexe
=
"yasm"
nogas
=
":"
...
...
@@ -1654,6 +1658,7 @@ enable network
enable
optimizations
enable
protocols
enable
static
enable
stripping
enable
swscale
enable
swscale_alpha
...
...
@@ -1830,10 +1835,11 @@ cc_default="${cross_prefix}${cc_default}"
nm_default
=
"
${
cross_prefix
}${
nm_default
}
"
pkg_config_default
=
"
${
cross_prefix
}${
pkg_config_default
}
"
ranlib
=
"
${
cross_prefix
}${
ranlib
}
"
strip_default
=
"
${
cross_prefix
}${
strip_default
}
"
sysinclude_default
=
"
${
sysroot
}
/usr/include"
set_default cc nm pkg_config sysinclude
set_default cc nm pkg_config s
trip s
ysinclude
enabled cross_compile
||
host_cc_default
=
$cc
set_default host_cc
...
...
@@ -2392,6 +2398,7 @@ case $target_os in
;;
bsd/os
)
add_extralibs
-lpoll
-lgnugetopt
strip
=
"strip -d"
;;
darwin
)
enable
malloc_aligned
...
...
@@ -2399,6 +2406,7 @@ case $target_os in
enabled ppc
&&
add_asflags
-force_cpusubtype_ALL
SHFLAGS
=
'-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR)'
enabled x86_32
&&
append SHFLAGS
-Wl
,-read_only_relocs,suppress
strip
=
"
${
strip
}
-x"
add_ldflags
-Wl
,-dynamic,-search_paths_first
SLIBSUF
=
".dylib"
SLIBNAME_WITH_VERSION
=
'$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)'
...
...
@@ -2468,6 +2476,7 @@ case $target_os in
ranlib
=
"echo ignoring ranlib"
;;
os/2
*
)
strip
=
"lxlite -CS"
ln_s
=
"cp -f"
add_ldflags
-Zomf
-Zbin-files
-Zargs-wild
-Zmap
SHFLAGS
=
'$(SUBDIR)$(NAME).def -Zdll -Zomf'
...
...
@@ -3129,6 +3138,7 @@ if enabled sparc; then
echo
"VIS enabled
${
vis
-no
}
"
fi
echo
"debug symbols
${
debug
-no
}
"
echo
"strip symbols
${
stripping
-no
}
"
echo
"optimizations
${
optimizations
-no
}
"
echo
"static
${
static
-no
}
"
echo
"shared
${
shared
-no
}
"
...
...
@@ -3224,6 +3234,8 @@ if enabled source_path_used; then
map
'test -f "$source_path/$v" && $ln_s "$source_path/$v" $v'
$FILES
fi
enabled stripping
||
strip
=
"echo skipping strip"
config_files
=
"
$TMPH
config.mak"
cat
>
config.mak
<<
EOF
...
...
@@ -3251,7 +3263,9 @@ YASM=$yasmexe
YASMDEP=
$yasmexe
AR=
$ar
RANLIB=
$ranlib
CP=cp -p
LN_S=
$ln_s
STRIP=
$strip
CPPFLAGS=
$CPPFLAGS
CFLAGS=
$CFLAGS
ASFLAGS=
$ASFLAGS
...
...
subdir.mak
浏览文件 @
b1ca9642
...
...
@@ -60,6 +60,7 @@ distclean:: clean
install-lib$(NAME)-shared
:
$(SUBDIR)$(SLIBNAME)
$(Q)
mkdir
-p
"
$(SHLIBDIR)
"
$
$(INSTALL)
-m
755
$$
<
"
$(SHLIBDIR)
/
$(SLIBNAME_WITH_VERSION)
"
$
$(STRIP)
"
$(SHLIBDIR)
/
$(SLIBNAME_WITH_VERSION)
"
$(Q)
cd
"
$(SHLIBDIR)
"
&&
\
$(LN_S)
$(SLIBNAME_WITH_VERSION)
$(SLIBNAME_WITH_MAJOR)
$(Q)
cd
"
$(SHLIBDIR)
"
&&
\
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录