diff options
| author | 2014-12-24 00:07:30 -0500 | |
|---|---|---|
| committer | 2014-12-31 00:38:03 -0500 | |
| commit | 3aeb5970e59b82399a11d3477dc257233e8063f6 (patch) | |
| tree | 9b6e560f424f1fac21d2a256cbb7e7955d7adde3 | |
| parent | Merge pull request #369 from darkf/mingw_ (diff) | |
| download | yuzu-3aeb5970e59b82399a11d3477dc257233e8063f6.tar.gz yuzu-3aeb5970e59b82399a11d3477dc257233e8063f6.tar.xz yuzu-3aeb5970e59b82399a11d3477dc257233e8063f6.zip | |
Add citra icon to Windows executable and title bar
| -rw-r--r-- | src/assets/citra.ico | bin | 0 -> 509287 bytes | |||
| -rw-r--r-- | src/citra/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/citra/citra.rc | bin | 3146 -> 566 bytes | |||
| -rw-r--r-- | src/citra_qt/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/citra_qt/citra-qt.rc | bin | 0 -> 566 bytes |
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 | |||
| Binary files differ | |||
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 | |||
| 2 | emu_window/emu_window_glfw.cpp | 2 | emu_window/emu_window_glfw.cpp |
| 3 | citra.cpp | 3 | citra.cpp |
| 4 | config.cpp | 4 | config.cpp |
| 5 | citra.rc | ||
| 5 | ) | 6 | ) |
| 6 | set(HEADERS | 7 | set(HEADERS |
| 7 | emu_window/emu_window_glfw.h | 8 | 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 | |||
| Binary files differ | |||
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 | |||
| 17 | bootmanager.cpp | 17 | bootmanager.cpp |
| 18 | hotkeys.cpp | 18 | hotkeys.cpp |
| 19 | main.cpp | 19 | main.cpp |
| 20 | citra-qt.rc | ||
| 20 | ) | 21 | ) |
| 21 | 22 | ||
| 22 | set(HEADERS | 23 | 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 | |||
| Binary files differ | |||