Merge pull request #817 from linkmauve/citra.ico

Move src/assets/citra.ico and doc-icon.png to dist
2015-05-29 13:56:58 -07:00 · 2015-05-29 13:56:58 -07:00 · fb597b6d68
commit fb597b6d68
parent 3c47522e67 c319d1ada7
5 changed files with 10 additions and 10 deletions
--- a/2
+++ b/2
@ -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
--- a/src/assets/citra.ico
+++ b/src/assets/citra.ico
--- a/dist/doc-icon.png
+++ b/dist/doc-icon.png
--- 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"
+
--- a/src/citra_qt/citra-qt.rc
+++ b/src/citra_qt/citra-qt.rc