ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Sun Sep 2 17:35:51 2018 -0300| [ce265b0bf5d0c77a092a1f5fbeb652c7cdea5fc7] | committer: James Almer
Merge commit '39f3b6f3fc2b46b405b680cce3599f1b370e342d' * commit '39f3b6f3fc2b46b405b680cce3599f1b370e342d': configure: Move add_fooflags() helper functions into canonical order Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ce265b0bf5d0c77a092a1f5fbeb652c7cdea5fc7 --- configure | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configure b/configure index c07ca5a5df..0d6ee0abfc 100755 --- a/configure +++ b/configure @@ -899,14 +899,14 @@ add_cxxflags(){ append CXXFLAGS $($cflags_filter "$@") } -add_asflags(){ - append ASFLAGS $($asflags_filter "$@") -} - add_objcflags(){ append OBJCFLAGS $($objcflags_filter "$@") } +add_asflags(){ + append ASFLAGS $($asflags_filter "$@") +} + add_ldflags(){ append LDFLAGS $($ldflags_filter "$@") } @@ -919,14 +919,14 @@ add_ldsoflags(){ append LDSOFLAGS $($ldflags_filter "$@") } -add_stripflags(){ - append ASMSTRIPFLAGS "$@" -} - add_extralibs(){ prepend extralibs $($ldflags_filter "$@") } +add_stripflags(){ + append ASMSTRIPFLAGS "$@" +} + add_host_cppflags(){ append host_cppflags "$@" } ====================================================================== diff --cc configure index c07ca5a5df,20a839c1d9..0d6ee0abfc --- a/configure +++ b/configure @@@ -895,14 -718,6 +895,10 @@@ add_cflags_headers() append CFLAGS_HEADERS $($cflags_filter "$@") } +add_cxxflags(){ + append CXXFLAGS $($cflags_filter "$@") +} + - add_asflags(){ - append ASFLAGS $($asflags_filter "$@") - } - add_objcflags(){ append OBJCFLAGS $($objcflags_filter "$@") } @@@ -927,6 -742,10 +923,10 @@@ add_extralibs() prepend extralibs $($ldflags_filter "$@") } + add_stripflags(){ - append STRIPFLAGS "$@" ++ append ASMSTRIPFLAGS "$@" + } + add_host_cppflags(){ append host_cppflags "$@" } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
