diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-29 13:56:58 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-29 13:56:58 -0700 |
| commit | fb597b6d68ea07b3b692f9108d4be9c23c8c2585 (patch) | |
| tree | 2bb6189f41188c654c8b85dfbf8156addb676ada | |
| parent | 3c47522e67ab80f69b29969ff2027cf5f8181c8c (diff) | |
| parent | c319d1ada7409c396a8724ff62a81b7e41e1a911 (diff) | |
Merge pull request #817 from linkmauve/citra.ico
Move src/assets/citra.ico and doc-icon.png to dist
| -rw-r--r-- | Doxyfile | 2 | ||||
| -rw-r--r-- | dist/citra.ico (renamed from src/assets/citra.ico) | bin | 509287 -> 509287 bytes | |||
| -rw-r--r-- | dist/doc-icon.png (renamed from doc-icon.png) | bin | 8791 -> 8791 bytes | |||
| -rw-r--r-- | src/citra/citra.rc | 18 | ||||
| -rw-r--r-- | src/citra_qt/citra-qt.rc | bin | 566 -> 275 bytes |
5 files changed, 10 insertions, 10 deletions
@@ -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 Binary files differindex 4fef651e2a..4fef651e2a 100644 --- a/src/assets/citra.ico +++ b/dist/citra.ico diff --git a/doc-icon.png b/dist/doc-icon.png Binary files differindex 420b1546f9..420b1546f9 100644 --- a/doc-icon.png +++ b/dist/doc-icon.png diff --git a/src/citra/citra.rc b/src/citra/citra.rc index 0165e93da9..b0edb2e6b9 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 Binary files differindex dd6f834f5c..3c7239853b 100644 --- a/src/citra_qt/citra-qt.rc +++ b/src/citra_qt/citra-qt.rc |
