aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-12 21:05:00 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-12 21:05:00 +0100
commitaa175983a1968f9c390379e0c735910b5e32ac0d (patch)
tree11b28f6087d4fdea47ee8811c7efa861414eb7b3
parent7e6c6c45ec7c27b90b4b9d89d9f4b3f19bf30cb0 (diff)
parentb3c6ee199e75bbad2908253f11e871500dd38531 (diff)
downloadffmpeg-aa175983a1968f9c390379e0c735910b5e32ac0d.tar.gz
Merge commit 'b3c6ee199e75bbad2908253f11e871500dd38531'
* commit 'b3c6ee199e75bbad2908253f11e871500dd38531': configure: Group toolchain options together in help output Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rwxr-xr-xconfigure18
1 files changed, 10 insertions, 8 deletions
diff --git a/configure b/configure
index 026b86501c..3d1b035b77 100755
--- a/configure
+++ b/configure
@@ -259,8 +259,12 @@ External library support:
--disable-xlib disable xlib [autodetect]
--disable-zlib disable zlib [autodetect]
-Advanced options (experts only):
+Toolchain options:
+ --arch=ARCH select architecture [$arch]
+ --cpu=CPU select the minimum required CPU (affects
+ instruction selection, may crash on older CPUs)
--cross-prefix=PREFIX use PREFIX for compilation tools [$cross_prefix]
+ --progs-suffix=SUFFIX program name suffix []
--enable-cross-compile assume a cross-compiler is used
--sysroot=PATH root of cross-build tree
--sysinclude=PATH location of cross-build system headers
@@ -296,21 +300,19 @@ Advanced options (experts only):
--extra-version=STRING version string suffix []
--optflags=OPTFLAGS override optimization-related compiler flags
--build-suffix=SUFFIX library name suffix []
- --malloc-prefix=PREFIX prefix malloc and related names with PREFIX
- --progs-suffix=SUFFIX program name suffix []
- --arch=ARCH select architecture [$arch]
- --cpu=CPU select the minimum required CPU (affects
- instruction selection, may crash on older CPUs)
--enable-pic build position-independent code
- --enable-sram allow use of on-chip SRAM
--enable-thumb compile for Thumb instruction set
+ --enable-lto use link-time optimization
+
+Advanced options (experts only):
+ --malloc-prefix=PREFIX prefix malloc and related names with PREFIX
--disable-symver disable symbol versioning
--enable-hardcoded-tables use hardcoded tables instead of runtime generation
--disable-safe-bitstream-reader
disable buffer boundary checking in bitreaders
(faster, but may crash)
--enable-memalign-hack emulate memalign, interferes with memory debuggers
- --enable-lto use link-time optimization
+ --enable-sram allow use of on-chip SRAM
Optimization options (experts only):
--disable-asm disable all assembler optimizations