From 412ba8e98a6c45a1044a44d4afdde2e211a6cb9f Mon Sep 17 00:00:00 2001
From: Alexander Gavrilov <angavrilov@gmail.com>
Date: Sat, 12 Apr 2014 17:21:10 +0400
Subject: [PATCH] Generate html files.

---
 Compile.html | 47 ++++++++++++++++++++++++++++++++++++-----------
 Compile.rst  |  2 +-
 Readme.html  |  6 +++---
 3 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/Compile.html b/Compile.html
index 7ae0df1c1..e031fd87a 100644
--- a/Compile.html
+++ b/Compile.html
@@ -451,16 +451,27 @@ rm libs/libstdc++.so.6
 </li>
 <li><p class="first">Open Xcode, go to Preferences &gt; Downloads, and install the Command Line Tools.</p>
 </li>
-<li><p class="first">Install MacPorts.</p>
-</li>
-<li><p class="first">Install dependencies from MacPorts:</p>
-<ul>
-<li><p class="first"><tt class="docutils literal">sudo port install gcc45 +universal cmake +universal <span class="pre">git-core</span> +universal</tt></p>
-<p>This will take some time—maybe hours, depending on your machine.</p>
-</li>
-<li><p class="first">At some point during this process, it may ask you to install a Java environment; let it do so.</p>
-</li>
+<li><p class="first">Install dependencies</p>
+<blockquote>
+<p>Option 1: Using MacPorts:</p>
+<blockquote>
+<ul class="simple">
+<li><a class="reference external" href="http://www.macports.org/">Install MacPorts</a></li>
+<li>Run <tt class="docutils literal">sudo port install gcc45 +universal cmake +universal <span class="pre">git-core</span> +universal</tt>
+This will take some time—maybe hours, depending on your machine.</li>
 </ul>
+<p>At some point during this process, it may ask you to install a Java environment; let it do so.</p>
+</blockquote>
+<p>Option 2: Using Homebrew:</p>
+<blockquote>
+<ul class="simple">
+<li><a class="reference external" href="http://brew.sh/">Install Homebrew</a> and run:</li>
+<li><tt class="docutils literal">brew install git</tt></li>
+<li><tt class="docutils literal">brew install cmake</tt></li>
+<li><tt class="docutils literal">brew install gcc45 <span class="pre">--enable-multilib</span></tt></li>
+</ul>
+</blockquote>
+</blockquote>
 </li>
 <li><p class="first">Install perl dependencies</p>
 <blockquote>
@@ -484,12 +495,26 @@ git submodule init
 git submodule update
 </pre>
 </li>
+<li><p class="first">Set environment variables:</p>
+</li>
+</ol>
+<blockquote>
+<p>Macports:</p>
+<pre class="literal-block">
+export CC=/opt/local/bin/gcc-mp-4.5
+export CXX=/opt/local/bin/g++-mp-4.5
+</pre>
+<p>Homebrew:</p>
+<pre class="literal-block">
+export CC=/usr/local/bin/gcc-4.5
+export CXX=/usr/local/bin/g++-4.5
+</pre>
+</blockquote>
+<ol class="arabic" start="8">
 <li><p class="first">Build dfhack:</p>
 <pre class="literal-block">
 mkdir build-osx
 cd build-osx
-export CC=/opt/local/bin/gcc-mp-4.5
-export CXX=/opt/local/bin/g++-mp-4.5
 cmake .. -DCMAKE_BUILD_TYPE:string=Release -DCMAKE_INSTALL_PREFIX=/path/to/DF/directory
 make
 make install
diff --git a/Compile.rst b/Compile.rst
index 343d2933f..63686d663 100644
--- a/Compile.rst
+++ b/Compile.rst
@@ -95,7 +95,7 @@ If you are building on 10.6, please read the subsection below titled "Snow Leopa
     
         * `Install MacPorts <http://www.macports.org/>`_
         * Run ``sudo port install gcc45 +universal cmake +universal git-core +universal``
-        This will take some time—maybe hours, depending on your machine.
+          This will take some time—maybe hours, depending on your machine.
         
         At some point during this process, it may ask you to install a Java environment; let it do so.
 
diff --git a/Readme.html b/Readme.html
index 8962ce2bf..98139cb50 100644
--- a/Readme.html
+++ b/Readme.html
@@ -599,12 +599,12 @@ at <a class="reference external" href="http://github.com/peterix/dfhack">http://
 </div>
 <div class="section" id="compatibility">
 <h1><a class="toc-backref" href="#id4">Compatibility</a></h1>
-<p>DFHack works on Windows XP, Vista, 7 or any modern Linux distribution.
-OSX is not supported due to lack of developers with a Mac.</p>
+<p>DFHack works on Windows XP, Vista, 7, any modern Linux distribution, or OS X
+10.6.8-10.9.</p>
 <p>Currently, version 0.34.11 is supported (and tested). If you need DFHack
 for older versions, look for older releases.</p>
 <p>On Windows, you have to use the SDL version of DF.</p>
-<p>It is possible to use the Windows DFHack under wine/OSX.</p>
+<p>It is also possible to use the Windows DFHack with Wine under Linux and OS X.</p>
 </div>
 <div class="section" id="installation-removal">
 <h1><a class="toc-backref" href="#id5">Installation/Removal</a></h1>