From b872cfc40fd9393c716dbd1873ded7d6c22c2479 Mon Sep 17 00:00:00 2001 From: Lethosor Date: Wed, 27 Nov 2013 10:11:19 -0500 Subject: [PATCH 1/3] Update Compatibility section OS X has been supported since 0.34.11r3 --- Readme.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Readme.rst b/Readme.rst index a2b400206..e1365cbf1 100644 --- a/Readme.rst +++ b/Readme.rst @@ -28,15 +28,15 @@ All new releases are announced in the bay12 thread: http://tinyurl.com/dfhack-ng ============= Compatibility ============= -DFHack works on Windows XP, Vista, 7 or any modern Linux distribution. -OSX is not supported due to lack of developers with a Mac. +DFHack works on Windows XP, Vista, 7, any modern Linux distribution, or OS X +10.6.8-10.9. Currently, version 0.34.11 is supported (and tested). If you need DFHack for older versions, look for older releases. On Windows, you have to use the SDL version of DF. -It is possible to use the Windows DFHack under wine/OSX. +It is also possible to use the Windows DFHack with Wine under Linux and OS X. ==================== Installation/Removal From dc1a25799288e37766a50bfb4e9a525280c55736 Mon Sep 17 00:00:00 2001 From: Lethosor Date: Tue, 18 Feb 2014 19:23:09 -0500 Subject: [PATCH 2/3] Installation instructions for Homebrew --- Compile.rst | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/Compile.rst b/Compile.rst index ddff30aeb..0417ae061 100644 --- a/Compile.rst +++ b/Compile.rst @@ -89,16 +89,24 @@ If you are building on 10.6, please read the subsection below titled "Snow Leopa 1. Download and unpack a copy of the latest DF 2. Install Xcode from Mac App Store 3. Open Xcode, go to Preferences > Downloads, and install the Command Line Tools. -4. Install MacPorts. -5. Install dependencies from MacPorts: +4. Install dependencies - * ``sudo port install gcc45 +universal cmake +universal git-core +universal`` - - This will take some time—maybe hours, depending on your machine. + Option 1: Using MacPorts: + + * `Install MacPorts `_ + * Run ``sudo port install gcc45 +universal cmake +universal git-core +universal`` + 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. - * At some point during this process, it may ask you to install a Java environment; let it do so. + Option 2: Using Homebrew: + + * `Install Homebrew `_ and run: + * ``brew install git`` + * ``brew install cmake`` + * ``brew install gcc45 --enable-multilib`` -6. Install perl dependencies +5. Install perl dependencies 1. ``sudo cpan`` @@ -108,14 +116,14 @@ If you are building on 10.6, please read the subsection below titled "Snow Leopa 2. ``install XML::LibXML`` 3. ``install XML::LibXSLT`` -7. Get the dfhack source:: +6. Get the dfhack source:: git clone https://github.com/danaris/dfhack.git cd dfhack git submodule init git submodule update -8. Build dfhack:: +7. Build dfhack:: mkdir build-osx cd build-osx From fdbe888b2ccb96149ee95019adab5233308b6ab9 Mon Sep 17 00:00:00 2001 From: Lethosor Date: Mon, 24 Feb 2014 17:46:08 -0500 Subject: [PATCH 3/3] Add paths for Homebrew's gcc and g++ --- Compile.rst | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Compile.rst b/Compile.rst index 0417ae061..5fa64e998 100644 --- a/Compile.rst +++ b/Compile.rst @@ -123,12 +123,22 @@ If you are building on 10.6, please read the subsection below titled "Snow Leopa git submodule init git submodule update -7. Build dfhack:: +7. Set environment variables: + + Macports:: - mkdir build-osx - cd build-osx export CC=/opt/local/bin/gcc-mp-4.5 export CXX=/opt/local/bin/g++-mp-4.5 + + Homebrew:: + + export CC=/usr/local/bin/gcc-4.5 + export CXX=/usr/local/bin/g++-4.5 + +8. Build dfhack:: + + mkdir build-osx + cd build-osx cmake .. -DCMAKE_BUILD_TYPE:string=Release -DCMAKE_INSTALL_PREFIX=/path/to/DF/directory make make install