Updated build instructions to recommend VS2015 and the use of bundled Qt

Yuri Kunde Schlesner 2015-09-08 20:14:03 -03:00
parent 1f95ede917
commit ec93a56673

@ -1,8 +1,7 @@
### Minimal Dependencies
On Windows, all light-weight dependencies are automatically included within the "externals" folder. To build the minimalist Citra (no Qt debugger), you simply need to install:
On Windows, all library dependencies are automatically included within the "externals" folder or can be downloaded on-demand. To build Citra, you simply need to install:
* **[Visual Studio 2013 Community](http://www.visualstudio.com/en-us/news/vs2013-community-vs.aspx)**.
![1](http://i.imgur.com/dKwPHW8.png?2)
* **[Visual Studio 2015 Community](https://www.visualstudio.com/products/visual-studio-community-vs)**.
* **[CMake](http://www.cmake.org/cmake/resources/software.html)** - Used to generate Visual Studio project files.
![2](http://i.imgur.com/JEabR4V.png?2)
* **Git** - We recommend [msysgit](http://msysgit.github.io/).
@ -10,17 +9,6 @@ On Windows, all light-weight dependencies are automatically included within the
* While installing Git Bash, you should tell it to include Git in your system path. (Choose the "Use Git from the Windows Command Prompt" option.) If you missed that, don't worry, you'll just have to manually tell CMake where your git.exe is, since it's used to include version info into the built executable.
![4](http://i.imgur.com/5ojSaQm.png?2)
### Debugger Dependencies
For Qt GUI, you'll need to install [Qt 5](http://qt-project.org/downloads):
![5](http://i.imgur.com/rPEqG4v.png?2)
* Download the Qt Online installer and launch it. When asked which components to install, select the *msvc2013 OpenGL* version for the processor architecture of your choice. (Be careful to use the OpenGL versions, or Citra will fail to initialize.) You might also want to install Qt Designer if you plan on modifying Citra's user interface.
* Set the path for your Qt installation in CMake. Set `QTDIR` variable to the directory which contains the `bin`, `include` and `lib` folders of QT. (e.g. `C:\Qt\5.4\msvc2013_64_opengl`).
![6](http://i.imgur.com/VLp3oj4.png?2)
* For running Citra builds, you'll need to have `icudt53.dll`, `icuin53.dll`, `icuuc53.dll`, `Qt5Core.dll`, `Qt5Gui.dll`, `Qt5OpenGL.dll` and `Qt5Widgets.dll` in either the application directory or in the system PATH. By default, those files are in `C:\Qt\5.4\msvc2013_64_opengl\bin`. For debug builds use the dlls with a 'd' appended to the name. (e.g. `Qt5Cored.dll`)
![7](http://i.imgur.com/21WSjI3.png?2)
* You might also need `platforms/qwindows.dll` in the application directory. It can be found in `C:\Qt\5.4\msvc2013_64_opengl\plugins\platforms`. For the debug version use `qwindowsd.dll`.
![8](http://i.imgur.com/foNxdm9.png?2)
### Cloning Citra in Git:
@ -36,21 +24,30 @@ NOTE: Citra by default downloads to C:\Users\<user-name>\citra
* Open cmake-gui and point it to the Citra directory. Default:C:\Users\<user name>\citra
![10](http://i.imgur.com/hYD7Uho.png?2)
* For the build directory, use a `build/` subdirectory inside the source directory or some other directory of your choice. (Tell CMake to create it.)
![11](http://i.imgur.com/mwes5AV.png?1)
* Click the "Configure" button and choose "Visual Studio 12 2013" or "Visual Studio 12 2013 Win64"depending on your system architecture.
![12](http://i.imgur.com/E6NME69.png?2)
* Check if CMake detected all libraries and paths correctly and, if necessary, make any adjustments and click "Configure" again.
* Click the "Configure" button and choose "Visual Studio 14 2015 Win64".
* When CMake gives you an error, find the CITRA_USE_BUNDLED_GLFW and CITRA_USE_BUNDLED_QT options on the list and check their respective checkboxes. Click configure again. CMake will now download the required libraries.
![13](http://i.imgur.com/scH2BrY.png?2)
* Click "Generate" to create the project files.
![14](http://i.imgur.com/jzWqzgv.png?2)
* Open the solution file citra.sln in Visual Studio 2013
* Open the solution file citra.sln in Visual Studio 2015
![15](http://i.imgur.com/xJdyzF0.png?2)
* Depending on which frontend (GLFW or Qt) you want to build or run, select "citra" or "citra-qt" in the Solution Explorer, right-click and "Set as StartUp Project".
![16](http://i.imgur.com/0TDnsud.png?2)
![17](http://i.imgur.com/tgL92rk.png?2)
* Press F5 or select Build → Rebuild Solution in the menu.
![18](http://i.imgur.com/x30ZhtE.png?2)
* NOTE: Please refer to [Common Issues](https://github.com/citra-emu/citra/wiki/Common-Issues) if any errors. If you didnot find solution feel free to ask us at [freenode](https://webchat.freenode.net/) @ #citra channel.
* 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/).