diff options
| author |  bunnei <bunneidev@gmail.com> | 2014-12-31 00:47:06 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-12-31 00:47:06 -0500 |
| commit | 746fcf5a590039aa285caefbef6f00365eb7d541 (patch) | |
| tree | 9fa5391d85bf3336544a860fc8d05d1fcb69c306 /src/citra | |
| parent | c072095a6b0791ea17830bffe4118686b1f04bd2 (diff) | |
| parent | 3aeb5970e59b82399a11d3477dc257233e8063f6 (diff) | |
Merge pull request #338 from chinhodado/master
Add citra icon to executable and window title in Windows
Diffstat (limited to 'src/citra')
| -rw-r--r-- | src/citra/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/citra/citra.rc | bin | 3146 -> 566 bytes |
2 files changed, 1 insertions, 0 deletions
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index dc5e04bf..94f8d13c 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 Binary files differindex c04acc7f..c28e7dbe 100644 --- a/src/citra/citra.rc +++ b/src/citra/citra.rc |