Merge pull request #817 from linkmauve/citra.ico

Move src/assets/citra.ico and doc-icon.png to dist
This commit is contained in:
Yuri Kunde Schlesner 2015-05-29 13:56:58 -07:00
commit fb597b6d68
5 changed files with 10 additions and 10 deletions

View file

@ -51,7 +51,7 @@ PROJECT_BRIEF = "Nintendo 3DS emulator/debugger"
# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo # and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
# to the output directory. # 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 # 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 # into which the generated documentation will be written. If a relative path is

View file

Before

Width:  |  Height:  |  Size: 497 KiB

After

Width:  |  Height:  |  Size: 497 KiB

View file

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

View file

@ -1,9 +1,9 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// Icon // Icon
// //
// Icon with lowest ID value placed first to ensure application icon // Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems. // remains consistent on all systems.
GLFW_ICON ICON "..\\assets\\citra.ico" GLFW_ICON ICON "..\\..\\dist\\citra.ico"

Binary file not shown.