diff options
| author |  Sebastian Valle | 2016-12-11 14:44:21 -0500 |
|---|---|---|
| committer |  GitHub | 2016-12-11 14:44:21 -0500 |
| commit | 2589c30cbee4e90b717cb8f42e1f25e2eabc119f (patch) | |
| tree | 92f4d13a3c2cca41664f8d4a31c09ad9dd3e80ae /src/citra | |
| parent | Merge pull request #2154 from mailwl/apt-getstartupargument (diff) | |
| parent | gdbstub: Remove unused include (diff) | |
| download | yuzu-2589c30cbee4e90b717cb8f42e1f25e2eabc119f.tar.gz yuzu-2589c30cbee4e90b717cb8f42e1f25e2eabc119f.tar.xz yuzu-2589c30cbee4e90b717cb8f42e1f25e2eabc119f.zip | |
Merge pull request #2267 from JayFoxRox/fix-mingw-cc
Support mingw cross-compilation
Diffstat (limited to 'src/citra')
| -rw-r--r-- | src/citra/citra.cpp | 2 | ||||
| -rw-r--r-- | src/citra/citra.rc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index f9387e61c..3114a71db 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | #endif | 18 | #endif |
| 19 | 19 | ||
| 20 | #ifdef _WIN32 | 20 | #ifdef _WIN32 |
| 21 | #include <Windows.h> | 21 | #include <windows.h> |
| 22 | #endif | 22 | #endif |
| 23 | 23 | ||
| 24 | #include "citra/config.h" | 24 | #include "citra/config.h" |
diff --git a/src/citra/citra.rc b/src/citra/citra.rc index b0edb2e6b..fea603004 100644 --- a/src/citra/citra.rc +++ b/src/citra/citra.rc | |||
| @@ -5,5 +5,5 @@ | |||
| 5 | 5 | ||
| 6 | // Icon with lowest ID value placed first to ensure application icon | 6 | // Icon with lowest ID value placed first to ensure application icon |
| 7 | // remains consistent on all systems. | 7 | // remains consistent on all systems. |
| 8 | GLFW_ICON ICON "..\\..\\dist\\citra.ico" | 8 | CITRA_ICON ICON "../../dist/citra.ico" |
| 9 | 9 | ||