mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
Fix OSX readme format to match Linux instructions
This commit is contained in:
parent
cfeeb03c5b
commit
59d1416d96
44
INSTALL.md
44
INSTALL.md
|
@ -241,36 +241,45 @@ Compiling qTox on OS X for development requires 3 tools, [Xcode](https://develop
|
||||||
###Required Libraries
|
###Required Libraries
|
||||||
|
|
||||||
First, let's install the dependencies available via brew.
|
First, let's install the dependencies available via brew.
|
||||||
* ```brew install git ffmpeg qrencode```
|
```bash
|
||||||
|
brew install git ffmpeg qrencode
|
||||||
|
```
|
||||||
|
|
||||||
Next, install [filter_audio](https://github.com/irungentoo/filter_audio) (you may delete the directory it creates afterwards):
|
Next, install [filter_audio](https://github.com/irungentoo/filter_audio) (you may delete the directory it creates afterwards):
|
||||||
* ```git clone https://github.com/irungentoo/filter_audio.git```
|
```bash
|
||||||
* ```cd filter_audio```
|
git clone https://github.com/irungentoo/filter_audio.git
|
||||||
* ```sudo make install```
|
cd filter_audio
|
||||||
* ```cd ../```
|
sudo make install
|
||||||
|
cd ../
|
||||||
|
```
|
||||||
|
|
||||||
Finally, clone qTox and copy all dependencies:
|
Then, clone qTox:
|
||||||
* ```git clone https://github.com/tux3/qTox``
|
```bash
|
||||||
* ```cd qTox```
|
git clone https://github.com/tux3/qTox``
|
||||||
|
```
|
||||||
|
|
||||||
Finally, copy all required files. Whenever you update your brew packages, you may skip all of the above steps and simply run the following script:
|
Finally, copy all required files. Whenever you update your brew packages, you may skip all of the above steps and simply run the following commands:
|
||||||
* ```sudo bash bootstrap-osx.sh```
|
```bash
|
||||||
|
cd qTox
|
||||||
|
sudo bash bootstrap-osx.sh
|
||||||
|
```
|
||||||
|
|
||||||
###Compiling
|
###Compiling
|
||||||
|
|
||||||
Either open Qt creator and hit build or run qmake && make in your qTox folder and it'll just work™
|
Either open Qt creator and hit build or run ```qmake && make``` in your qTox folder and it'll just work™.
|
||||||
|
|
||||||
Note that if you use the CLI to build you'll need to add Qt5's bins to your path.
|
Note that if you use the CLI to build you'll need to add Qt5's bins to your path.
|
||||||
```export PATH=$PATH:~/Qt/5.4/clang_64/bin/```
|
```bash
|
||||||
|
export PATH=$PATH:~/Qt/5.4/clang_64/bin/
|
||||||
|
```
|
||||||
|
|
||||||
###Fixing things up
|
###Fixing things up
|
||||||
|
|
||||||
The bad news is that Qt breaks our linker paths so we need to fix those.
|
The bad news is that Qt breaks our linker paths so we need to fix those. First cd in to your qtox.app directory, if you used Qt Creator it's in ```~/build-qtox-Desktop_Qt_5_4_1_clang_64bit-Release``` most likely, otherwise it's in your qTox folder.
|
||||||
First cd in to your qtox.app directory, if you used Qt Creator it's in ```~/build-qtox-Desktop_Qt_5_4_1_clang_64bit-Release``` most likely, otherwise it's in your qTox folder.
|
|
||||||
|
|
||||||
Install qTox so we can copy its libraries and shove the following in a script somewhere:
|
Install qTox so we can copy its libraries and shove the following in a script somewhere:
|
||||||
|
|
||||||
```
|
```bash
|
||||||
~macdeployqt qtox.app
|
~macdeployqt qtox.app
|
||||||
cp -r /Applications/qtox.app qtox_old.app
|
cp -r /Applications/qtox.app qtox_old.app
|
||||||
cp qtox.app/Contents/MacOS/qtox qtox_old.app/Contents/MacOS/qtox
|
cp qtox.app/Contents/MacOS/qtox qtox_old.app/Contents/MacOS/qtox
|
||||||
|
@ -281,9 +290,12 @@ mv qtox_old.app qtox.app
|
||||||
* cd in to the folder with qtox.app
|
* cd in to the folder with qtox.app
|
||||||
* run ```bash ~/deploy.qtox.sh```
|
* run ```bash ~/deploy.qtox.sh```
|
||||||
|
|
||||||
|
|
||||||
###Running qTox
|
###Running qTox
|
||||||
You've got 2 choices, either click on the qTox app that suddenly exists, or do the following:
|
You've got 2 choices, either click on the qTox app that suddenly exists, or do the following:
|
||||||
* ``qtox.app/Contents/MacOS/qtox``
|
```bash
|
||||||
|
qtox.app/Contents/MacOS/qtox
|
||||||
|
```
|
||||||
* Enjoy the snazzy CLI output as your friends and family congratulate you on becoming a hacker
|
* Enjoy the snazzy CLI output as your friends and family congratulate you on becoming a hacker
|
||||||
|
|
||||||
<a name="windows" />
|
<a name="windows" />
|
||||||
|
|
Loading…
Reference in New Issue
Block a user