diff options
| author | Sebastian Valle <subv2112@gmail.com> | 2016-12-11 14:44:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-11 14:44:21 -0500 |
| commit | 2589c30cbee4e90b717cb8f42e1f25e2eabc119f (patch) | |
| tree | 92f4d13a3c2cca41664f8d4a31c09ad9dd3e80ae /src/citra | |
| parent | 77fd4f42376c115d0082dbc8fed6b3ed588f37bf (diff) | |
| parent | 0aee903adab317a11209aed4f4cb176cf62ca6d9 (diff) | |
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 @@ #endif #ifdef _WIN32 -#include <Windows.h> +#include <windows.h> #endif #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 @@ // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -GLFW_ICON ICON "..\\..\\dist\\citra.ico" +CITRA_ICON ICON "../../dist/citra.ico" |