[osx] - update readme

1 files changed, 67 insertions, 31 deletions

diff --git a/docs/README.osx b/docs/README.osx
index 51703f405e..6375e0f148 100644
--- a/docs/README.osx
+++ b/docs/README.osx
@@ -13,10 +13,11 @@ TOC
 1. Introduction
 -----------------------------------------------------------------------------
 
-This is a platform port of XBMC for the Apple OSX operating system. Both 10.5
-and 10.6 Intel development platforms are supported. Xcode 4.x is not supported.
-The current build system is Xcode 3.2.5 There are two ways to build XBMC for Mac,
-from command-line or from Xcode.
+This is a platform port of XBMC for the Apple OSX operating system. Both 10.6
+and 10.7 Intel development platforms are supported. Xcode 3.2.6 and 4.3 and newer
+are the recommended versions.
+There are 3 ways to build XBMC for Mac, from command-line with make, from command-line
+using xcodebuild or from Xcode.
 
 Generally, Xcode is the easiest as it presents the build system in a GUI environment.
 The command-line build is still under development.
@@ -24,6 +25,9 @@ The command-line build is still under development.
 XBMC for Mac is composed of a main binary with numerous dynamic libraries and
 codecs that support a multitude of music and video formats.
 
+On Snow Leopard (OSX 10.6.x) we recommend using Xcode 3.2.6.
+On Lion (OSX 10.7.x) we recommend using Xcode 4.3.x.
+
 NOTE TO NEW OS X USERS: All lines that are prefixed with the '$' character are
 commands that need to be typed into a Terminal window. Note that the '$'
 character itself should NOT be typed as part of the command.
@@ -39,39 +43,61 @@ character itself should NOT be typed as part of the command.
 -----------------------------------------------------------------------------
 3.0 Install XCODE
 -----------------------------------------------------------------------------
-Install latest Xcode. You can download it from Apple's site after registration at
-(http://developer.apple.com/tools/download). You also need to install the 10.4
-sdk. If using Xcode 3.x, you MUST use Xcode 3.1.2 or a newer version, so update
-your existing version. if you are running a previous Xcode 3.x version. 
-Xcode 3.x only runs on 10.5 and above. If you are running 10.7, DO NOT USE Xcode 4.x,
-it will fail. Use Xcode 3.x under 10.7.
+Install latest Xcode (4.3.2 or 3.2.6 as of the writing). You can download it from 
+
+1. Apple's site after registration at http://developer.apple.com/tools/download (Xcode 3.2.6)
+2. In the MacOSX AppStore (Xcode 4.3.x). 
+
+If you are using XCode 4.3.x you also need to install the "Command Line Tools". To do so
+after installing Xcode you have to go to "Xcode->Preferences->Downloads" and install the
+package "Command Line Tools".
+
+Xcode 3.2.6 only runs on 10.6.x (Snow Leopard). 
+Xcode 4.3.x only runs on 10.7.x (Lion).
 
 -----------------------------------------------------------------------------
 3.1 Install XBMC build depends
 -----------------------------------------------------------------------------
 
+3.1.1 Compiling as 32 Bit binary
  $ cd $HOME/XBMC
  $ cd tools/darwin/depends
  $ ./bootstrap
  $ ./configure --with-darwin=osx
  $ make
 
+3.1.2 Compiling as 64 Bit binary
+ $ cd $HOME/XBMC
+ $ cd tools/darwin/depends
+ $ ./bootstrap
+ $ ./configure --with-darwin=osx --with-arch=x86_64
+ $ make
+
+
 -----------------------------------------------------------------------------
 4. How to compile
 -----------------------------------------------------------------------------
 Both Xcode and Terminal compilation require that build environment be setup
 first. This is a simple step and involves the following:
 
+4.a Compilation by using command-line building via xcodebuild or
+    by compiling via Xcode GUI
+
  $ cd $HOME/XBMC
  $ make -C tools/darwin/depends/xbmc
  $ make clean
  $ make xcode_depends
 
+4.b Compilation by using command-line building via make (experimental)
+
+ $ cd $HOME/XBMC
+ $ make -C tools/darwin/depends/xbmc
+ $ make clean
+
 The configure operation will setup the build environment for codecs and
 internal libraries that are used by XBMC. This step is required for both Xcode
 and command-line building. The "make clean" ensures that there are no stale
-binaries from git that might cause problems. The last step will pre-build
-the majority of the codecs and libs:
+binaries from git that might cause problems.
 
 -----------------------------------------------------------------------------
 4.1 Using Xcode
@@ -81,19 +107,27 @@ For development, XBMC is run from the $HOME/XBMC directory and needs to have
 the XBMC_HOME environment variable set to know where that directory is located.
 To set XBMC_HOME environment variable:
 
-Menu -> Project -> Edit Active Executable "XBMC", click "Arguments" tab and
-add "XBMC_HOME" as an enviroment variable. Set the value to the path to the
-XBMC root folder. For example, "/Users/bigdog/Documents/XBMC"
+Xcode 3.2.6
+ Menu -> Project -> Edit Active Executable "XBMC", click "Arguments" tab and
+ add "XBMC_HOME" as an enviroment variable. Set the value to the path to the
+ XBMC root folder. For example, "/Users/bigdog/Documents/XBMC"
 
-There are two build targets "XBMC" and "XBMC.app" with debug and release
-settings. The "XBMC" target is used for rapid build and debug cycles while
-the "XBMC.app" target is used to build a self contained OSX application.
+Xcode 4.3.x
+ Menu -> Product -> Edit Sheme -> "Run XBMC"/"Debug" -> Add XBMC_HOME into 
+ the List of "Environment Variables".Set the value to the path to thev XBMC 
+ root folder. For example, "/Users/bigdog/Documents/XBMC"	
 
-Set the build target to "XBMC" or "XBMC.app", then build. The build process
-will take a long time when builting the first time. You can see the progress
-in "Build Results". There are a large number of static and dynamic libaries
-that will need to be built. Once these are built, subsequent builds will be
-faster.
+There are two build targets "XBMC" and "XBMC.app" (each in 32Bit and 64Bit flavour) 
+with debug and release settings. The "XBMC" target is used for rapid build and 
+debug cycles while the "XBMC.app" target is used to build a self contained 
+OSX application.
+
+Set the build target to "XBMC" or "XBMC.app" and be sure to select the same 
+architecture as selected in step 3.1 (either i386 for 32Bit or x86_64 for 64Bit), 
+then build. The build process will take a long time when building the first time. 
+You can see the progress in "Build Results". There are a large number of static 
+and dynamic libaries that will need to be built. Once these are built, 
+subsequent builds will be faster.
 
 After the build, you can ether run XBMC for Mac from Xcode or run it from
 the command-line. If you run it from the command-line, make sure your set
@@ -108,9 +142,11 @@ $ ./build/Release/XBMC
 
 You can also build via Xcode from the command-line using the following:
 
-$ xcodebuild -configuration Release -target "XBMC.app" -project XBMC.xcodeproj
+$ xcodebuild -configuration Release -arch i386 -target "XBMC.app" -project XBMC.xcodeproj
 
-You can specify "Release" instead of "Debug" as a configuration.
+You can specify "Release" instead of "Debug" as a configuration. Be sure to set -arch 
+to the same architecture as selected in step 3.1 (either i386 for 32Bit or x86_64 for 
+64Bit)
 
 -----------------------------------------------------------------------------
 4.2 Using Terminal (command-line) (this is a work in progress and might fail)
@@ -118,20 +154,20 @@ You can specify "Release" instead of "Debug" as a configuration.
 There are two methods, a) make/Xcode and b) make (which might fail as it's under
 construction).
 
-If you want to build a cross-compiled version that can run under 10.5/10.4/AppleTV, 
-then you'll need to follow the additional steps listed in $HOME/XBMC/tools/XBMCTex/README.osx
-before running xcodebuild from the command-line.
+If you want to build a cross-compiled version that can run under 10.6/10.7, 
+you could try xcodebuild from the command-line (normally unneeded - for advanced
+developers).
 
  a)
  $ cd $HOME/XBMC
  $ export XBMC_HOME=`pwd`
  $ make xcode_depends
- $ xcodebuild -sdk macosx10.4 -project XBMC.xcodeproj -target XBMC.app -configuration Release build
+ $ xcodebuild -sdk macosx10.7 -project XBMC.xcodeproj -target XBMC.app -arch x86_64 -configuration Release build
 
- b)
+ b) building via make
  $ cd $HOME/XBMC
  $ export XBMC_HOME=`pwd`
- $ make xbmc
+ $ make
  $ ./xbmc.bin
 
 -----------------------------------------------------------------------------