summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChin <chin.bimbo@gmail.com>2014-12-24 06:07:30 +0100
committerChin <chin.bimbo@gmail.com>2014-12-31 06:38:03 +0100
commit3aeb5970e59b82399a11d3477dc257233e8063f6 (patch)
tree9b6e560f424f1fac21d2a256cbb7e7955d7adde3 /src
parentMerge pull request #369 from darkf/mingw_ (diff)
downloadyuzu-3aeb5970e59b82399a11d3477dc257233e8063f6.tar
yuzu-3aeb5970e59b82399a11d3477dc257233e8063f6.tar.gz
yuzu-3aeb5970e59b82399a11d3477dc257233e8063f6.tar.bz2
yuzu-3aeb5970e59b82399a11d3477dc257233e8063f6.tar.lz
yuzu-3aeb5970e59b82399a11d3477dc257233e8063f6.tar.xz
yuzu-3aeb5970e59b82399a11d3477dc257233e8063f6.tar.zst
yuzu-3aeb5970e59b82399a11d3477dc257233e8063f6.zip
Diffstat (limited to 'src')
-rw-r--r--src/assets/citra.icobin0 -> 509287 bytes
-rw-r--r--src/citra/CMakeLists.txt1
-rw-r--r--src/citra/citra.rcbin3146 -> 566 bytes
-rw-r--r--src/citra_qt/CMakeLists.txt1
-rw-r--r--src/citra_qt/citra-qt.rcbin0 -> 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
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
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
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
Binary files differ