Merge pull request #817 from linkmauve/citra.ico

Move src/assets/citra.ico and doc-icon.png to dist

5 files changed, 10 insertions, 10 deletions

diff --git a/Doxyfile b/Doxyfile
index 5c2e09246..92faa0b2a 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -51,7 +51,7 @@ PROJECT_BRIEF          = "Nintendo 3DS emulator/debugger"
 # and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
 # to the output directory.
 
-PROJECT_LOGO           = doc-icon.png
+PROJECT_LOGO           = dist/doc-icon.png
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
diff --git a/src/assets/citra.ico b/dist/citra.ico
index 4fef651e2..4fef651e2 100644
--- a/src/assets/citra.ico
+++ b/dist/citra.ico
diff --git a/doc-icon.png b/dist/doc-icon.png
index 420b1546f..420b1546f 100644
--- a/doc-icon.png
+++ b/dist/doc-icon.png
diff --git a/src/citra/citra.rc b/src/citra/citra.rc
index 0165e93da..b0edb2e6b 100644
--- a/src/citra/citra.rc
+++ b/src/citra/citra.rc
@@ -1,9 +1,9 @@
-/////////////////////////////////////////////////////////////////////////////

-//

-// Icon

-//

-

-// Icon with lowest ID value placed first to ensure application icon

-// remains consistent on all systems.

-GLFW_ICON               ICON                    "..\\assets\\citra.ico"

-

+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+GLFW_ICON               ICON                    "..\\..\\dist\\citra.ico"
+
diff --git a/src/citra_qt/citra-qt.rc b/src/citra_qt/citra-qt.rc
index dd6f834f5..3c7239853 100644
--- a/src/citra_qt/citra-qt.rc
+++ b/src/citra_qt/citra-qt.rc