Merge pull request #338 from chinhodado/master

Add citra icon to executable and window title in Windows

5 files changed, 2 insertions, 0 deletions

diff --git a/src/assets/citra.ico b/src/assets/citra.ico
new file mode 100644
index 000000000..4fef651e2
--- /dev/null
+++ b/src/assets/citra.ico
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt
index dc5e04bfc..94f8d13c7 100644
--- a/src/citra/CMakeLists.txt
+++ b/src/citra/CMakeLists.txt
@@ -2,6 +2,7 @@ set(SRCS
             emu_window/emu_window_glfw.cpp
             citra.cpp
             config.cpp
+            citra.rc
             )
 set(HEADERS
             emu_window/emu_window_glfw.h
diff --git a/src/citra/citra.rc b/src/citra/citra.rc
index c04acc7ff..c28e7dbe5 100644
--- a/src/citra/citra.rc
+++ b/src/citra/citra.rc
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index 54d0a1271..356ec754f 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -17,6 +17,7 @@ set(SRCS
             bootmanager.cpp
             hotkeys.cpp
             main.cpp
+            citra-qt.rc
             )
 
 set(HEADERS
diff --git a/src/citra_qt/citra-qt.rc b/src/citra_qt/citra-qt.rc
new file mode 100644
index 000000000..dd6f834f5
--- /dev/null
+++ b/src/citra_qt/citra-qt.rc