diff options
| author |  bunnei | 2014-12-31 00:47:06 -0500 |
|---|---|---|
| committer | bunnei | 2014-12-31 00:47:06 -0500 |
| commit | 746fcf5a590039aa285caefbef6f00365eb7d541 (patch) | |
| tree | 9fa5391d85bf3336544a860fc8d05d1fcb69c306 /src/citra | |
| parent | Merge pull request #374 from bunnei/dyncom-cleanup-2 (diff) | |
| parent | Add citra icon to Windows executable and title bar (diff) | |
| download | yuzu-746fcf5a590039aa285caefbef6f00365eb7d541.tar.gz yuzu-746fcf5a590039aa285caefbef6f00365eb7d541.tar.xz yuzu-746fcf5a590039aa285caefbef6f00365eb7d541.zip | |
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 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 | |||