Update OS X build instructions to use Qt 5
This commit is contained in:
parent
8d0fd46460
commit
06b24240cd
1 changed files with 6 additions and 10 deletions
|
@ -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 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
|
||||
dependencies.
|
||||
|
||||
|
@ -38,7 +32,9 @@ Instructions: 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
|
||||
|
||||
|
@ -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:
|
||||
```
|
||||
$ 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:
|
||||
|
@ -73,7 +69,7 @@ After exiting, you'll get a warning that the install is keg-only, which means it
|
|||
2. Build bitcoind:
|
||||
|
||||
./autogen.sh
|
||||
./configure
|
||||
./configure --with-gui=qt5
|
||||
make
|
||||
|
||||
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
|
||||
-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.
|
||||
|
||||
Running
|
||||
|
|
Loading…
Reference in a new issue