fixed some more or less irrelevant typos

This commit is contained in:
styke 2018-10-06 17:31:41 +02:00
parent 300852bbf5
commit 44fb3b3e0e
2 changed files with 5 additions and 5 deletions

View file

@ -19,7 +19,7 @@
3. When prompted, copy the OpenSSL DLLS to "The OpenSSL binaries (/bin) directory" 3. When prompted, copy the OpenSSL DLLS to "The OpenSSL binaries (/bin) directory"
4. Copy the OpenSSL 1.0 files from its /bin folder to C:/local/bin (You will need to create the folder) 4. Copy the OpenSSL 1.0 files from its /bin folder to C:/local/bin (You will need to create the folder)
5. Then copy the OpenSSL 1.1 files from its /bin folder to C:/local/bin (Overwrite any duplicate files) 5. Then copy the OpenSSL 1.1 files from its /bin folder to C:/local/bin (Overwrite any duplicate files)
6. Add C:/local/bin to your path folder (Follow guide here if you don't know how to do it: https://www.computerhope.com/issues/ch000549.htm#windows8 ) 6. Add C:/local/bin to your path folder (Follow guide here, if you don't know how to do it: https://www.computerhope.com/issues/ch000549.htm#windows8 )
### Qt ### Qt
1. Download Qt: https://www.qt.io/download 1. Download Qt: https://www.qt.io/download
@ -27,14 +27,14 @@
3. Then select "Download" 3. Then select "Download"
#### When prompted which components to install: #### When prompted which components to install:
1. Under the latest Qt version: 1. Under the latest Qt version:
- Select MSVC 2017 64-bit (or MSVC 2015 64-bit if you still use Visual Studio 2015) - Select MSVC 2017 64-bit (or MSVC 2015 64-bit, if you still use Visual Studio 2015)
- Optionally, enable Qt WebEngine - Optionally, enable Qt WebEngine
2. Under Tools: 2. Under Tools:
- Select Qt Creator, and Qt Creator CDB Debugger Support - Select Qt Creator, and Qt Creator CDB Debugger Support
### Compile with Breakpad support (Optional) ### Compile with Breakpad support (Optional)
1. Open up lib/qBreakpad/handler/handler.pro 1. Open up lib/qBreakpad/handler/handler.pro
2. Build it in whichever mode you wanna build Chatterino (Debug/Profile/Release) 2. Build it in whichever mode you want to build Chatterino (Debug/Profile/Release)
3. Copy the newly built qBreakpad.lib to a folder you create: `lib/qBreakpad/build/handler` 3. Copy the newly built qBreakpad.lib to a folder you create: `lib/qBreakpad/build/handler`
# Windows (Using MSYS2, not recommended) # Windows (Using MSYS2, not recommended)
@ -46,7 +46,7 @@ Building using MSYS2 can be quite easier process. Check out MSYS2 at [msys2.org]
Be sure to add `-j <number of threads>` as a make argument so it will use all your cpu cores to build. [example setup](https://i.imgur.com/qlESlS1.png) Be sure to add `-j <number of threads>` as a make argument so it will use all your cpu cores to build. [example setup](https://i.imgur.com/qlESlS1.png)
You can also add `-o2` to optimize the final binary size but increase compilation time, and add `-pipe` to use more ram in compilation but increase compilation speed You can also add `-o2` to optimize the final binary size but increase compilation time, and add `-pipe` to use more ram in compilation but increase compilation speed
1. open appropriate MSYS2 terminal and do `pacman -S mingw-w64-<arch>-boost mingw-w64-<arch>-qt5 mingw-w64-<arch>-rapidjson` where `<arch>` is `x86_64` or `i686` 1. open appropriate MSYS2 terminal and do `pacman -S mingw-w64-<arch>-boost mingw-w64-<arch>-qt5 mingw-w64-<arch>-rapidjson`, where `<arch>` is `x86_64` or `i686`
2. go into the project directory 2. go into the project directory
3. create build folder `mkdir build && cd build` 3. create build folder `mkdir build && cd build`
4. `qmake .. && mingw32-make` 4. `qmake .. && mingw32-make`

View file

@ -7,7 +7,7 @@ Chatterino 2 is the second installment of the Twitch chat client series "Chatter
## Downloading ## Downloading
You can download the Chatterino 2 Beta over [here](https://chatterino.com/download/Chatterino2BetaInstaller.exe) You can download the Chatterino 2 Beta over [here](https://chatterino.com/download/Chatterino2BetaInstaller.exe)
You might also need to install the [VC++ 2017 Redistributable](https://aka.ms/vs/15/release/vc_redist.x64.exe) from Microsoft if you do not have it installed already. You might also need to install the [VC++ 2017 Redistributable](https://aka.ms/vs/15/release/vc_redist.x64.exe) from Microsoft, if you do not have it installed already.
If you still receive an error about `MSVCR120.dll missing`, then you should install the [VC++ 2017 Restributable](https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x64.exe If you still receive an error about `MSVCR120.dll missing`, then you should install the [VC++ 2017 Restributable](https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x64.exe
). ).