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 /src | |
| 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/assets/citra.ico | bin | 509287 -> 0 bytes | |||
| -rw-r--r-- | src/citra/citra.rc | 18 | ||||
| -rw-r--r-- | src/citra_qt/citra-qt.rc | bin | 566 -> 275 bytes |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/assets/citra.ico b/src/assets/citra.ico Binary files differdeleted file mode 100644 index 4fef651e..00000000 --- a/src/assets/citra.ico +++ /dev/null diff --git a/src/citra/citra.rc b/src/citra/citra.rc index 0165e93d..b0edb2e6 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 dd6f834f..3c723985 100644 --- a/src/citra_qt/citra-qt.rc +++ b/src/citra_qt/citra-qt.rc |