From 45d941d62e2accea92f5b5183afe760e69a618ac Mon Sep 17 00:00:00 2001 From: Jannik Vogel Date: Sat, 3 Dec 2016 21:08:02 +0100 Subject: Support mingw cross-compile --- src/citra/citra.cpp | 2 +- src/citra/citra.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/citra') 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 +#include #endif #include "citra/config.h" diff --git a/src/citra/citra.rc b/src/citra/citra.rc index b0edb2e6b..86ad2c643 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" +GLFW_ICON ICON "../../dist/citra.ico" -- cgit v1.2.3 From d2c39bdb295fae07c700975f89e9a06a9ef3f7f2 Mon Sep 17 00:00:00 2001 From: Jannik Vogel Date: Sun, 4 Dec 2016 23:34:44 +0100 Subject: Unify Windows ICON resource name --- src/citra/citra.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/citra') diff --git a/src/citra/citra.rc b/src/citra/citra.rc index 86ad2c643..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" -- cgit v1.2.3