From 46a144e7cd4e1078d630bedd52730b5099986bd5 Mon Sep 17 00:00:00 2001
From: Timothee 'TTimo' Besset <ttimo@ttimo.net>
Date: Sat, 28 Dec 2013 10:17:42 -0600
Subject: [PATCH] updated OSX instructions

---
 apple/README.md | 51 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/apple/README.md b/apple/README.md
index 22e32eaf..c292a9f5 100644
--- a/apple/README.md
+++ b/apple/README.md
@@ -1,33 +1,48 @@
 GtkRadiant for Apple OSX
-====
+========================
+
 This directory provides packaging steps for GtkRadiant for OSX. This document describes compiling the application on OSX as well as generating distributable bundles using the framework provided in this directory.
 
 Dependencies & Compilation
-----
-Compiling GtkRadiant on OSX requires [MacPorts](http://macports.org). Homebrew is not yet supported. Install the following dependencies:
+--------------------------
 
-    sudo port install dylibbundler gcc47 gtkglext scons
+Directions for OSX Mavericks 10.9 - your mileage may vary:
 
-You should then be able to compile and run GtkRadiant from the `install` directory.
+- Install [MacPorts](http://macports.org).
+- Install [XQuartz](http://xquartz.macosforge.org/)
 
-    scons config=debug
-    ./install/radiant.bin &
+- Install dependencies with MacPorts:
 
-See the [GtkRadiant developers guide]() for details on build configurations and targets.
+[code]
+sudo port install dylibbundler gcc48 gtkglext scons
+[/code]
+
+- Get the GtkRadiant code and compile:
+
+[code]
+git clone https://github.com/TTimo/GtkRadiant.git
+cd GtkRadiant/
+scons cc=gcc-mp-4.8 cxx=g++-mp-4.8
+[/code]
+
+- Run the build:
+
+(from the GtkRadiant/ directory)
+[code]
+./install/radiant.bin
+[/code]
+
+XQuartz note: on my configuration XQuartz doesn't automatically start for some reason. I have to open another terminal, and run the following command: /Applications/Utilities/XQuartz.app/Contents/MacOS/X11.bin, then start radiant. 
     
 Building GtkRadiant.app
-----
-The `Makefile` in this directory will produce a distributable .app bundle for GtkRadiant using `dylibbundler`:
+-----------------------
+
+The `Makefile` in the 'apple/' directory will produce a distributable .app bundle for GtkRadiant using `dylibbundler`:
 
     make
     make image
 
-You may encounter an error or two as `dylibbundler` attempts to fix up shared libraries that GtkRadiant depends on. This is because `dylibbundler` attempts to rewrite the load commands in these libraries, but not all libraries have enough space allocated for this purpose. Recompile the relevant ports with additional header space.
+Getting help
+------------
 
-For example:
-
-    export LDFLAGS=-headerpad_max_install_names
-    sudo port clean --work --archive pango 
-    sudo port -n upgrade --force pango
-
-Repeat this process for any shared libraries which `dylibbundler` complains about. As of July 2nd 2013, Pango is the only port requiring this treatment.
+Get on irc: Quakenet #radiant, or ask on the mailing list, or post something on the issue tracker..