Merge pull request #5656

06b2424 Update OS X build instructions to use Qt 5 (Michael Ford)
This commit is contained in:
Wladimir J. van der Laan 2015-01-14 14:19:22 +01:00
commit ddb512a321
No known key found for this signature in database
GPG key ID: 74810B012346C9A6

View file

@ -21,12 +21,6 @@ Xcode 4.3 or later, you'll need to install its command line tools. This can
be done in `Xcode > Preferences > Downloads > Components` and generally must be done in `Xcode > Preferences > Downloads > Components` and generally must
be re-done or updated every time Xcode is updated. be re-done or updated every time Xcode is updated.
There's also an assumption that you already have `git` installed. If
not, it's the path of least resistance to install [Github for Mac](https://mac.github.com/)
(OS X 10.7+) or
[Git for OS X](https://code.google.com/p/git-osx-installer/). It is also
available via Homebrew.
You will also need to install [Homebrew](http://brew.sh) in order to install library You will also need to install [Homebrew](http://brew.sh) in order to install library
dependencies. dependencies.
@ -38,7 +32,9 @@ Instructions: Homebrew
#### Install dependencies using Homebrew #### Install dependencies using Homebrew
brew install autoconf automake libtool boost miniupnpc openssl pkg-config protobuf qt brew install autoconf automake libtool boost miniupnpc openssl pkg-config protobuf qt5
NOTE: Building with Qt4 is still supported, however, could result in a broken UI. As such, building with Qt5 is recommended.
#### Installing berkeley-db4 using Homebrew #### Installing berkeley-db4 using Homebrew
@ -46,7 +42,7 @@ The homebrew package for berkeley-db4 has been broken for some time. It will in
Running this command takes you into brew's interactive mode, which allows you to configure, make, and install by hand: Running this command takes you into brew's interactive mode, which allows you to configure, make, and install by hand:
``` ```
$ brew install https://raw.github.com/mxcl/homebrew/master/Library/Formula/berkeley-db4.rb -without-java $ brew install https://raw.github.com/homebrew/homebrew/master/Library/Formula/berkeley-db4.rb -without-java
``` ```
The rest of these commands are run inside brew interactive mode: The rest of these commands are run inside brew interactive mode:
@ -73,7 +69,7 @@ After exiting, you'll get a warning that the install is keg-only, which means it
2. Build bitcoind: 2. Build bitcoind:
./autogen.sh ./autogen.sh
./configure ./configure --with-gui=qt5
make make
3. It is also a good idea to build and run the unit tests: 3. It is also a good idea to build and run the unit tests:
@ -115,7 +111,7 @@ All dependencies should be compiled with these flags:
-arch x86_64 -arch x86_64
-isysroot $(xcode-select --print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk -isysroot $(xcode-select --print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
Once dependencies are compiled, see release-process.md for how the Bitcoin-Qt.app Once dependencies are compiled, see [doc/release-process.md](release-process.md) for how the Bitcoin-Qt.app
bundle is packaged and signed to create the .dmg disk image that is distributed. bundle is packaged and signed to create the .dmg disk image that is distributed.
Running Running