From ce3105df9fa0f4a78693bb4638b8841a26ba6327 Mon Sep 17 00:00:00 2001 From: Asher Oto <49938263+asheroto@users.noreply.github.com> Date: Mon, 18 Nov 2019 16:18:02 -0600 Subject: [PATCH] Adjusted text sizing & lists for easier readability --- README.md | 60 ++++++++++++++++++++++--------------------------------- 1 file changed, 24 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index c6206b10c5..e3d32f7e3c 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ + MEGA Sync Client ================ @@ -19,58 +20,45 @@ git clone --recursive https://github.com/meganz/MEGAsync.git # Windows compilation -##### Requirements: +#### Requirements: * Visual Studio 2015 * QT 5.6.3 * Qt Creator -##### Preparation: -1.- Prepare QTCreator to use the Visual Studio 2015 toolchain and QT 5.6.3 - 32 bits - -2.- Clone or download this repo +#### Preparation: -3.- Create a folder `Release_x32` inside the root of the code that you have just downloaded - -4.- Download the required third party libraries from this link: + 1. Prepare **QTCreator** to use the **Visual Studio 2015 toolchain and QT 5.6.3 - 32 bits** + 2. Clone or download this repo + 3. Create a folder `Release_x32` inside the root of the code that you have just downloaded + 4. Download the required third party libraries from this link: https://mega.nz/#!8tZglCTR!cZ_B39i9YxLgt3_8x9LsOpFhFDHuAh4jdz78IuQTQT4 - -5.- Uncompress that file into `src\MEGASync\mega\bindings\qt` - -6.- Open the project `src/MEGA.pro` with QTCreator - -7.- Select the folder `Release_x32` as the target for Release and Debug builds - -8.- Build the project - -9.- Copy or move the .dll files from the folder `src\MEGASync\mega\bindings\qt\3rdparty\bin` to the folder `Release_x32\MEGASync` - -10.- Enjoy! +5. Uncompress that file into `src\MEGASync\mega\bindings\qt` +6. Open the project `src/MEGA.pro` with QTCreator +7. Select the folder `Release_x32` as the target for Release and Debug builds +8. Build the project +9. Copy or move the .dll files from the folder `src\MEGASync\mega\bindings\qt\3rdparty\bin` to the folder `Release_x32\MEGASync` +10. Enjoy! It's recommended to go to `Project -> Run` in QTCreator and disable the option `Run in terminal` # OS X compilation -##### Requirements: +#### Requirements: * Xcode 8.3 * QT 5.6.3 -##### Preparation: -1.- Install Xcode in your system - -2.- Clone or download this repo - -3.- Download the required third party libraries and configuration file (`config.h`) from this link: +#### Preparation: +1. Install **Xcode** in your system +2. Clone or download this repo +3. Download the required third party libraries and configuration file (`config.h`) from this link: https://mega.nz/#!T14B0Y4T!EXGg9dRtacgz9_vCUtVq5tj6C3PBpkOHgXG289EBxBM - -4.- Uncompress that file and move the folder `3rdparty` into `src/MEGASync/mega/bindings/qt`/ and the file `config.h` into `src/MEGASync/mega/include/mega/` - -5.- Run the script `installer_mac.sh` to build the project and generate the application bundle for MEGAsync. If you want to generate an Apple disk image (DMG file), add the flag `--create-dmg`. Build directory is `Release_x64` - -6.- Enjoy! +4. Uncompress that file and move the folder `3rdparty` into `src/MEGASync/mega/bindings/qt`/ and the file `config.h` into `src/MEGASync/mega/include/mega/` +5. Run the script `installer_mac.sh` to build the project and generate the application bundle for MEGAsync. If you want to generate an Apple disk image (DMG file), add the flag `--create-dmg`. Build directory is `Release_x64` +6. Enjoy! ## Linux compilation -Preparation: +#### Preparation: First install dependencies. e.g., for a debian/ubuntu with QT >= 5.6 (e.g: Ubuntu 18.04): ``` @@ -98,8 +86,8 @@ lrelease MEGASync/MEGASync.pro make ``` -Note: when compiling for Fedora/RHEL/CentOS and alike, `qmake` and `lrelease` might be missing for qt4. Use `qmake-qt4` and `lrelease-qt4` instead. Also, adding `-q` to `configure` is recommended in order to download and build cryptopp for RHEL and CentOS. +**Note:** when compiling for Fedora/RHEL/CentOS and alike, `qmake` and `lrelease` might be missing for qt4. Use `qmake-qt4` and `lrelease-qt4` instead. Also, adding `-q` to `configure` is recommended in order to download and build cryptopp for RHEL and CentOS. Known Issues ------------ -For Solus, c-ares might not compile do to a CFLAG defined by gcc: -D_FORTIFY_SOURCE=2. This issue and its possible solution is described here https://github.com/c-ares/c-ares/issues/58 and http://ma.tc/ehuboqatec.md. +For Solus, c-ares *might not compile* do to a CFLAG defined by gcc: -D_FORTIFY_SOURCE=2. This issue and its possible solution is described here https://github.com/c-ares/c-ares/issues/58 and http://ma.tc/ehuboqatec.md.