Now works with --disable-stripping.
Unified · Split
| @@ -97,8 +97,12 @@ include $(SRC_PATH)/doc/examples/Makefile · 96 unmodified lines | |||
| 97 | libavcodec/utils.o libavformat/utils.o libavdevice/avdevice.o libavfilter/avfilter.o libavutil/utils.o libpostproc/postprocess.o libswresample/swresample.o libswscale/utils.o : libavutil/ffversion.h | 97 | libavcodec/utils.o libavformat/utils.o libavdevice/avdevice.o libavfilter/avfilter.o libavutil/utils.o libpostproc/postprocess.o libswresample/swresample.o libswscale/utils.o : libavutil/ffversion.h |
| 98 | 98 | ||
| 99 | $(PROGS): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF) | 99 | $(PROGS): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF) |
| 100 | ifeq ($(STRIPTYPE),direct) | ||
| 101 | $(STRIP) -o $@ $< | ||
| 102 | else | ||
| 100 | $(CP) $< $@ | 103 | $(CP) $< $@ |
| 101 | $(STRIP) $@ | 104 | $(STRIP) $@ |
| 105 | endif | ||
| 102 | 106 | ||
| 103 | %$(PROGSSUF)_g$(EXESUF): $(FF_DEP_LIBS) | 107 | %$(PROGSSUF)_g$(EXESUF): $(FF_DEP_LIBS) |
| 104 | $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS) | 108 | $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS) |
| @@ -3363,6 +3363,7 @@ x86asmexe_default="nasm" · 3362 unmodified lines | |||
| 3363 | windres_default="windres" | 3363 | windres_default="windres" |
| 3364 | nvcc_default="nvcc" | 3364 | nvcc_default="nvcc" |
| 3365 | nvccflags_default="-gencode arch=compute_30,code=sm_30 -O2" | 3365 | nvccflags_default="-gencode arch=compute_30,code=sm_30 -O2" |
| 3366 | striptype="direct" | ||
| 3366 | 3367 | ||
| 3367 | # OS | 3368 | # OS |
| 3368 | target_os_default=$(tolower $(uname -s)) | 3369 | target_os_default=$(tolower $(uname -s)) |
| @@ -5089,6 +5090,7 @@ case $target_os in · 1720 unmodified lines | |||
| 5089 | ;; | 5090 | ;; |
| 5090 | os/2*) | 5091 | os/2*) |
| 5091 | strip="lxlite -CS" | 5092 | strip="lxlite -CS" |
| 5093 | striptype="" | ||
| 5092 | objformat="aout" | 5094 | objformat="aout" |
| 5093 | add_cppflags -D_GNU_SOURCE | 5095 | add_cppflags -D_GNU_SOURCE |
| 5094 | add_ldflags -Zomf -Zbin-files -Zargs-wild -Zhigh-mem -Zmap | 5096 | add_ldflags -Zomf -Zbin-files -Zargs-wild -Zhigh-mem -Zmap |
| @@ -6834,6 +6836,7 @@ fi # test "$quiet" != "yes" · 1739 unmodified lines | |||
| 6834 | test -e Makefile || echo "include $source_path/Makefile" > Makefile | 6836 | test -e Makefile || echo "include $source_path/Makefile" > Makefile |
| 6835 | 6837 | ||
| 6836 | enabled stripping || strip="echo skipping strip" | 6838 | enabled stripping || strip="echo skipping strip" |
| 6839 | enabled stripping || striptype="" | ||
| 6837 | 6840 | ||
| 6838 | config_files="$TMPH ffbuild/config.mak doc/config.texi" | 6841 | config_files="$TMPH ffbuild/config.mak doc/config.texi" |
| 6839 | 6842 | ||
| @@ -6877,6 +6880,7 @@ ARFLAGS=$arflags · 37 unmodified lines | |||
| 6877 | AR_O=$ar_o | 6880 | AR_O=$ar_o |
| 6878 | RANLIB=$ranlib | 6881 | RANLIB=$ranlib |
| 6879 | STRIP=$strip | 6882 | STRIP=$strip |
| 6883 | STRIPTYPE=$striptype | ||
| 6880 | NVCC=$nvcc | 6884 | NVCC=$nvcc |
| 6881 | CP=cp -p | 6885 | CP=cp -p |
| 6882 | LN_S=$ln_s | 6886 | LN_S=$ln_s |