Revert 7e16bf2eaaf8e8f9cb635998abc76b8ad1e7d3ed^...7e16bf2eaaf8e8f9cb635998abc76b8ad1e7d3ed on Windows Build

Dante38490 2015-01-05 03:26:29 +01:00
parent 7e16bf2eaa
commit fd511f7eaf

@ -4,13 +4,14 @@ On Windows, all light-weight dependencies are automatically included within the
* **[Visual Studio 2013 Express (Windows Desktop)](http://www.microsoft.com/en-us/download/details.aspx?%0Aid=40787)** - NOTE: Must be the "Windows Desktop" one, as the "Windows" one requires Windows 8 / metro mode
* **[CMake](http://www.cmake.org/cmake/resources/software.html)** - Used to generate Visual Studio project files.
* **Git** - I recommend [msysgit](http://msysgit.github.io/). While installing it, you can 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 executable is, since it's used to include version info into the built executable.
* **[TortoiseGit] (https://code.google.com/p/tortoisegit/wiki/Download)** - I recommend TortoiseGit for Clone Git simplicity
### Debugger Dependencies
For the debugger/Qt GUI, you'll need to install [Qt 5.3.1](http://qt-project.org/downloads):
For the debugger/Qt GUI, you'll need to install [Qt 5.4](http://qt-project.org/downloads):
* 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.
* Optionally, set your `QTDIR` environment variable to the directory which contains the `bin`, `include` and `lib` folders. (e.g. `C:\Qt\5.3\msvc2013_opengl`) This will avoid the need to manually set them in CMake.
* For running Citra builds, you'll need to have `icudt52.dll`, `icuin52.dll`, `icuuc52.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.3\msvc2013_opengl\bin`. For debug builds use the dlls with a 'd' appended to the name. (e.g. `Qt5Cored.dll`)
* Optionally, set your `QTDIR` environment variable to the directory which contains the `bin`, `include` and `lib` folders. (e.g. `C:\Qt\5.4\msvc2013_64_opengl`) This will avoid the need to manually set them in CMake.
* 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`)
### Cloning Citra in Git:
@ -18,13 +19,16 @@ For the debugger/Qt GUI, you'll need to install [Qt 5.3.1](http://qt-project.org
git clone --recursive https://github.com/citra-emu/citra.git
cd citra
```
Or with TortoiseGit
```
Right click and select Git Clone and enter URL https://github.com/citra-emu/citra
```
### Building
* Open cmake-gui and point it to the Citra source code (the citra root directory, not the `src` sub-directory).
* For the build directory, use a `build/` subdirectory inside the source directory or some other directory of your choice. (Tell CMake to create it.)
* Click the "Configure" button and choose "Visual Studio 12 2013" or "Visual Studio 12 2013 Win64".
* Check if CMake detected all libraries and paths correctly and, if necessary, make any adjustments and click "Configure" again.
* Qt 5.3.0 is known to fail at this step. Make sure you have 5.3.1.
* Qt 5.4 is known to fail at this step. Make sure you have 5.4.
* Click "Generate" to create the project files.
* Open the solution file (citra.sln) in Visual Studio 2013
* 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".