Merge the 5.1 branch into the trunk.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@422 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 39 insertions, 5 deletions

diff --git a/BUILD b/BUILD
index 8f4788ad9..87cfc9f15 100644
--- a/BUILD
+++ b/BUILD
@@ -2,8 +2,8 @@ $Id: BUILD,v 1.11 2005/10/23 01:35:59 titer Exp $
 
 BUILD file for HandBrake <http://handbrake.m0k.org/>
 
-Building HandBrake
-==================
+Building HandBrake with jam
+===========================
 
 You can build HandBrake on BeOS, MacOS X, Linux, and on Windows using Cygwin.
 If you'd like to port it to another OS, email me ([email protected]).
@@ -45,13 +45,47 @@ Step 2: build
 Run `./configure && jam'. This will build every library HandBrake
 requires, then HandBrake itself.
 
+-----------------------------------------------------------------------------------------------------
 
-Experimental UB build on MacOsX
-===============================
+Building HandBrake with make
+============================
+
+Step 1: get needed tools
+========================
+
++ gcc and g++
+    There are usually included in your OS' dev tools. On BeOS/Zeta, the
+    default gcc isn't enough, gcc 2.95.3 is required.
+
++ nasm (Only for x86. On Mac OS X Intel, Xcode 2.4.1 include it)
+
+Cygwin setup:
+    There are a couple extra things required to make the code build for Cygwin.
+    Make sure you have /bin and /usr/bin on your path *first*, before
+    the Windows paths.  Otherwise the Cygwin find.exe won't be used, and
+    lame won't build.
+    Also, I have not tried to build this with MinGW, I've only built it with
+    the Cygwin environment, so you should build with Cygwin gcc and dev tools.
+    Unfortunately this means you need to have cygwin1.dll around to run the
+    HBTest.exe program, but that's the way it is for now, until I get time
+    to try building it with MinGW.  If you want to try making it work with
+    MinGW, then go for it!
+
+
+
+
+Step 2: configuration
+=====================
+
+The HB_BUILD and HB_VERSION are defined in a single file, the Makefile correct the values in Xcode too.
+
+The file where the informations are stored is Makefile.config
+
+Step 3: build
+=============
 
 Run `make'. This will build libmediafork, MediaFork and MediaForkCLI as Universal Binary.
 This build method use precompiled contrib libraries. Script to build those binaries are provided too.
 All the build is handled by Xcode 2.4.1, should work on powerPC and Intel Macs.
 
 
-