Merge branch 'master' into dev

diff --cc BUILDING.md
index 3346886dc7d5b1c091cb7bf7992da8a9e82a94df,9d05f0baf93e57a43f1df0006a672d44d3230356..ab06435c1c49f4f3e1710a9a8d177a1447e645a9
--- 1/BUILDING.md
--- 2/BUILDING.md
+++ b/BUILDING.md
@@@ -10,22 -10,21 +10,22 @@@ Build Requirement
  - libtool 1.4 or later
    * If using Xcode 4.3 or later on OS X, autoconf and automake are no longer
      provided.  The easiest way to obtain them is from
-     [MacPorts](http://www.MacPorts.org).
+     [MacPorts](http://www.MacPorts.org) or [Homebrew](http://brew.sh/).
  
- - NASM or YASM (if building x86 or x86-64 SIMD extensions)
+ - [NASM](http://www.nasm.us) or [YASM](http://yasm.tortall.net)
+   (if building x86 or x86-64 SIMD extensions)
    * If using NASM, 0.98, or 2.01 or later is required for an x86 build (0.99
      and 2.00 do not work properly with libjpeg-turbo's x86 SIMD code.)
 -  * If using NASM, 2.00 or later is required for an x86-64 build.
 -  * If using NASM, 2.07 or later (except 2.11.08) is required for an x86-64
 +  * If using NASM, 2.10 or later is required for an x86-64 build.
 +  * If using NASM, 2.10 or later (except 2.11.08) is required for an x86-64
      Mac build (2.11.08 does not work properly with libjpeg-turbo's x86-64 SIMD
      code when building macho64 objects.)  NASM or YASM can be obtained from
-     [MacPorts](http://www.macports.org/).
+     [MacPorts](http://www.macports.org/) or [Homebrew](http://brew.sh/).
 +  * If using YASM, 1.2.0 or later is required for an x86-64 build.
  
    The binary RPMs released by the NASM project do not work on older Linux
-   systems, such as Red Hat Enterprise Linux 4.  On such systems, you can
-    easily build and install NASM from a source RPM by downloading one of the
-   SRPMs from
+   systems, such as Red Hat Enterprise Linux 5.  On such systems, you can easily
+   build and install NASM from a source RPM by downloading one of the SRPMs from
  
    <http://www.nasm.us/pub/nasm/releasebuilds>
  
@@@ -206,8 -177,9 +178,9 @@@ Ad
  
      --host x86_64-apple-darwin NASM=/opt/local/bin/nasm
  
- to the `configure` command line.  NASM 2.10 or later from MacPorts must be
- installed.
 -to the `configure` command line.  NASM 2.07 or later from MacPorts or Homebrew
++to the `configure` command line.  NASM 2.10 or later from MacPorts or Homebrew
+ must be installed.  If using Homebrew, then replace `/opt/local` with
+ `/usr/local`.
  
  
  ### 32-bit Build on 64-bit OS X
@@@ -227,8 -199,9 +200,9 @@@ Ad
        CFLAGS='-mmacosx-version-min=10.5 -O3' \
        LDFLAGS='-mmacosx-version-min=10.5'
  
- to the `configure` command line.  NASM 2.10 or later from MacPorts must be
- installed.
 -to the `configure` command line.  NASM 2.07 or later from MacPorts or Homebrew
++to the `configure` command line.  NASM 2.10 or later from MacPorts or Homebrew
+ must be installed.  If using Homebrew, then replace `/opt/local` with
+ `/usr/local`.
  
  
  ### 32-bit Backward-Compatible Build on OS X
@@@ -458,9 -475,8 +476,9 @@@ Build Requirement
  
  - [NASM](http://www.nasm.us) or [YASM](http://yasm.tortall.net)
    * If using NASM, 0.98 or later is required for an x86 build.
 -  * If using NASM, 2.05 or later is required for an x86-64 build.
 +  * If using NASM, 2.10 or later is required for an x86-64 build.
 +  * If using YASM, 1.2.0 or later is required for an x86-64 build.
-   * nasm.exe/yasm.exe should be in your `PATH`.
+   * **nasm.exe**/**yasm.exe** should be in your `PATH`.
  
  - Microsoft Visual C++ 2005 or later
  

diff --cc CMakeLists.txt
Simple merge