Modified Heimdall Frontend so it can find Heimdall CLI in /usr/local/bin on OS X. Also updated the OS X build files, as well as READMEs for all platforms.

1 files changed, 43 insertions, 33 deletions

diff --git a/OSX/README.txt b/OSX/README.txt
index 47b0bf4..3b33cd4 100644
--- a/OSX/README.txt
+++ b/OSX/README.txt
@@ -19,7 +19,7 @@ Installing Heimdall and Heimdall Frontend Binaries:
     1. Run "Heimdall Suite.pkg" and follow the instructions.
 
     2. Reboot your system.
-		
+
     3. Done
 
 
@@ -187,7 +187,7 @@ Performing a Custom Flash with Heimdall Frontend:
 
 
 Flashing Firmware from Command Line:
-	
+
     1. Fully charge your phone (use the wall charger as it's faster).
 
     2. Download a decrypted device ROM or a Heimdall Firmware Package
@@ -226,7 +226,7 @@ Flashing Firmware from Command Line:
        file you want to flash.
 
        Here is an example that does a full flash and repartition on a GT-I9000:
-		
+
             heimdall flash --repartition --resume --pit s1_odin_20100512.pit --FACTORYFS factoryfs.rfs --CACHE cache.rfs --DBDATA dbdata.rfs --IBL+PBL boot.bin --SBL Sbl.bin --PARAM param.lfs --KERNEL zImage --MODEM modem.bin
 
     9. Heimdall will display the progress as it flashes so that you know things
@@ -479,24 +479,40 @@ be included.
 
 Appendix B - Installing Heimdall from Source:
 
-    1. First make sure you have installed XCode and pkgconfig.
-
-       NOTE: There are several different ways you can install pkgconfig, one
-             option is to use Macports (http://www.macports.org/).
-
-    2. Open a terminal and navigate to the directory you downloaded,
-       or extracted, Heimdall to.
-
-    3. Download, compile and install libusb-1.0:
-
-       http://www.libusb.org/
-
-       NOTE: Alternatively you may install Macport's libusb-devel package.
-
-    4. Enter the following commands to compile libpit.
+    PREREQUISITES:
+    
+          Heimdall requires C++11 (aka C++0x) functionality in order to compile.
+          Unfortunately, XCode includes an old version of GCC which does not
+          include support for C++11. XCode does include clang, which does
+          support C++11. However, clang's C++11 can only target OS X 10.7 or
+          newer. There are also slight compatibility issues between clang and
+          Qt, which is required in order to compile Heimdall Frontend. As such
+          these instructions will utilise GCC 4.7 installed via Homebrew.
+              
+          Xcode can be downloaded through the App store or from Apple's
+          developer website:
+          
+              https://developer.apple.com/xcode/
+          
+          Homebrew install instructions are available at:
+          
+              http://mxcl.github.io/homebrew/
+          
+    1. First make sure you have installed XCode and Homebrew (see above). Then
+       open a terminal and install GCC 4.7, pkgconfig and libusbx via Homebrew:
+    
+            brew tap homebrew/versions
+            brew install gcc47 pkgconfig libusbx
+            
+        NOTE: Installing GCC 4.7 will take a long time.
+
+    2. In a terminal navigate to the directory you downloaded (or extracted)
+       Heimdall to.
+
+    3. Enter the following commands to compile libpit.
 
             cd libpit
-            ./configure
+            ./configure CC=gcc-4.7 CXX=g++-4.7
             make
             cd ..
 
@@ -505,12 +521,12 @@ Appendix B - Installing Heimdall from Source:
     4. Enter the following commands to compile and install Heimdall:
 
             cd heimdall
-            ./configure
+            ./configure CC=gcc-4.7 CXX=g++-4.7
             make
             sudo make install
             cd ..
 
-    5. If you haven't installed the driver before, enter the following:
+    5. If you haven't installed the driver before, do the following:
 
             cd OSX
             sudo ./install-kext.sh
@@ -523,23 +539,17 @@ Appendix C - Installing Heimdall Frontend from Source:
 
     1. Compile and install Heimdall, see Appendix B.
 
-    2. First make sure you have installed XCode from your OS X install DVD.
-       You'll also need Qt 4.7 or later, available from:
+    2. Heimdall Frontend requires Qt (4.7 or later, but prior to 5.0), available
+       from:
 
-          http://qt.nokia.com/downloads/
+          http://qt-project.org/downloads
 
     3. Open a terminal and navigate to the directory you extracted Heimdall to.
 
     4. Enter the following commands to compile and install Heimdall Frontend:
 
             cd heimdall-frontend
-            qmake heimdall-frontend.pro
-
-    5. Open Finder and navigate to the heimdall-frontend sub-directory. Open
-       the newly created XCode project.
-
-    6. From the menu bar select Build -> Build. This outputs heimdall-frontend
-       to /Applications
-
-    7. Done
+            qmake -spec macx-g++ QMAKE_CC=gcc-4.7 QMAKE_CXX=g++-4.7
+            make
 
+    5. Done