mirror of
https://github.com/citra-emu/citra.git
synced 2024-11-15 04:50:04 +00:00
fixed various typos
parent
2e383b6340
commit
d1955f700f
@ -50,7 +50,7 @@ NOTE: Citra by default downloads to C:\Users\<user-name>\citra
|
|||||||
|
|
||||||
![17](http://i.imgur.com/FkuAwd8.jpg)
|
![17](http://i.imgur.com/FkuAwd8.jpg)
|
||||||
|
|
||||||
* Select the appropriate build type, Debug for debug purposes or Release for performance (in case of doubt choose the latest).
|
* Select the appropriate build type, Debug for debug purposes or Release for performance (in case of doubt choose the latter).
|
||||||
|
|
||||||
![18](http://i.imgur.com/Gqifkc0.jpg)
|
![18](http://i.imgur.com/Gqifkc0.jpg)
|
||||||
|
|
||||||
@ -60,31 +60,31 @@ NOTE: Citra by default downloads to C:\Users\<user-name>\citra
|
|||||||
|
|
||||||
* NOTE: Please refer to [Common Issues](https://github.com/citra-emu/citra/wiki/Common-Issues) if any errors. If you did not find a solution feel free to ask us in the IRC channel: #citra @ [Freenode](https://webchat.freenode.net/).
|
* NOTE: Please refer to [Common Issues](https://github.com/citra-emu/citra/wiki/Common-Issues) if any errors. If you did not find a solution feel free to ask us in the IRC channel: #citra @ [Freenode](https://webchat.freenode.net/).
|
||||||
|
|
||||||
## Mingw-w64 Build with MSYS2
|
## MinGG-w64 Build with MSYS2
|
||||||
|
|
||||||
### Note that these instructions are a draft, and are dependant on the mingw build changes to be merged
|
### Note that these instructions are a draft, and are dependent on the MinGW build changes to be merged
|
||||||
|
|
||||||
#### Prerequistes to install
|
#### Prerequisites to install
|
||||||
* [MSYS2](http://msys2.github.io/)
|
* [MSYS2](http://msys2.github.io/)
|
||||||
|
|
||||||
Make sure to follow the instructions and update to the latest version by running `pacman -Syu` as many times as needed.
|
Make sure to follow the instructions and update to the latest version by running `pacman -Syu` as many times as needed.
|
||||||
|
|
||||||
#### Install citra dependancies for mingw-w64
|
#### Install Citra dependencies for WinGW-w64
|
||||||
* Open the "MSYS2 MinGW 64-bit" (mingw64.exe) shell
|
* Open the "MSYS2 MinGW 64-bit" (mingw64.exe) shell
|
||||||
* Download and install all dependencies using: `pacman -S mingw-w64-x86_64-toolchain mingw-w64-x86_64-qt5 mingw-w64-x86_64-SDL2 mingw-w64-x86_64-cmake mingw-w64-x86_64-curl git`
|
* Download and install all dependencies using: `pacman -S mingw-w64-x86_64-toolchain mingw-w64-x86_64-qt5 mingw-w64-x86_64-SDL2 mingw-w64-x86_64-cmake mingw-w64-x86_64-curl git`
|
||||||
|
|
||||||
#### Clone the citra repository with git.
|
#### Clone the Citra repository with git.
|
||||||
|
|
||||||
* `git clone --recursive https://github.com/citra-emu/citra.git`
|
* `git clone --recursive https://github.com/citra-emu/citra.git`
|
||||||
* `cd citra`
|
* `cd citra`
|
||||||
|
|
||||||
#### Run the following commands to build citra (dynamic linked build)
|
#### Run the following commands to build Citra (dynamic linked build)
|
||||||
```bash
|
```bash
|
||||||
mkdir build && cd build
|
mkdir build && cd build
|
||||||
cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MAKE_PROGRAM=mingw32-make -DCMAKE_CXX_FLAGS="-DMICROPROFILE_ENABLED=0" -DUSE_SYSTEM_CURL=1 ..
|
cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MAKE_PROGRAM=mingw32-make -DCMAKE_CXX_FLAGS="-DMICROPROFILE_ENABLED=0" -DUSE_SYSTEM_CURL=1 ..
|
||||||
# should we use `make`?
|
# should we use `make`?
|
||||||
mingw32-make -j4
|
mingw32-make -j4
|
||||||
# test citra out with
|
# test Citra out with
|
||||||
./src/citra_qt/citra-qt.exe
|
./src/citra_qt/citra-qt.exe
|
||||||
```
|
```
|
||||||
|
|
||||||
@ -104,19 +104,19 @@ Doesn't require the rather large Qt dependency, but you will lack a GUI frontend
|
|||||||
|
|
||||||
## Clang build using clang-cl
|
## Clang build using clang-cl
|
||||||
|
|
||||||
#### Prerequistes to install
|
#### Prerequisites to install
|
||||||
* **[LLVM](http://releases.llvm.org/download.html#3.9.0)** - The clang compiler
|
* **[LLVM](http://releases.llvm.org/download.html#3.9.0)** - The clang compiler
|
||||||
* **[Visual Studio 2015 Community](https://www.visualstudio.com/products/visual-studio-community-vs)** - **Make sure to select C++ support in the installer**.
|
* **[Visual Studio 2015 Community](https://www.visualstudio.com/products/visual-studio-community-vs)** - **Make sure to select C++ support in the installer**.
|
||||||
* **[CMake](http://www.cmake.org/cmake/resources/software.html)** - Used to generate Visual Studio project files.
|
* **[CMake](http://www.cmake.org/cmake/resources/software.html)** - Used to generate Visual Studio project files.
|
||||||
* **Git** - We recommend [msysgit](http://msysgit.github.io/).
|
* **Git** - We recommend [msysgit](http://msysgit.github.io/).
|
||||||
Follow the installers instructions.
|
Follow the installers instructions.
|
||||||
|
|
||||||
#### Clone the citra repository with git.
|
#### Clone the Citra repository with git.
|
||||||
|
|
||||||
* `git clone --recursive https://github.com/citra-emu/citra.git`
|
* `git clone --recursive https://github.com/citra-emu/citra.git`
|
||||||
* `cd citra`
|
* `cd citra`
|
||||||
|
|
||||||
#### Run the following commands to build citra
|
#### Run the following commands to build Citra
|
||||||
```
|
```
|
||||||
mkdir build
|
mkdir build
|
||||||
cd build
|
cd build
|
||||||
|
Loading…
Reference in New Issue
Block a user