diff options
| author | bunnei <bunneidev@gmail.com> | 2014-12-31 06:47:06 +0100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-12-31 06:47:06 +0100 |
| commit | 746fcf5a590039aa285caefbef6f00365eb7d541 (patch) | |
| tree | 9fa5391d85bf3336544a860fc8d05d1fcb69c306 | |
| 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 yuzu-746fcf5a590039aa285caefbef6f00365eb7d541.tar.gz yuzu-746fcf5a590039aa285caefbef6f00365eb7d541.tar.bz2 yuzu-746fcf5a590039aa285caefbef6f00365eb7d541.tar.lz yuzu-746fcf5a590039aa285caefbef6f00365eb7d541.tar.xz yuzu-746fcf5a590039aa285caefbef6f00365eb7d541.tar.zst yuzu-746fcf5a590039aa285caefbef6f00365eb7d541.zip | |
| -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 Binary files differnew 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 Binary files differindex 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 Binary files differnew file mode 100644 index 000000000..dd6f834f5 --- /dev/null +++ b/src/citra_qt/citra-qt.rc |