Move a bunch of resources into the resources folder.

Also, cat is no longer mysterious. It's just FLUFFY!
This commit is contained in:
Petr Mrázek 2014-01-19 05:21:09 +01:00
parent d8413fa5ec
commit 2fe033c4a0
5 changed files with 4 additions and 4 deletions

View File

@ -528,7 +528,7 @@ resources/instances/instances.qrc
######## Windows resource files ########
IF(WIN32)
SET(MULTIMC_RCS multimc.rc)
SET(MULTIMC_RCS resources/multimc.rc)
ENDIF()
####### X11 Stuff #######
@ -670,7 +670,7 @@ FILE(WRITE \"\${CMAKE_INSTALL_PREFIX}/${QTCONF_DEST_DIR}/qt.conf\" \"\")
# ICNS file for OS X
IF(APPLE)
INSTALL(FILES MultiMC.icns DESTINATION MultiMC.app/Contents/Resources)
INSTALL(FILES resources/MultiMC.icns DESTINATION MultiMC.app/Contents/Resources)
ENDIF()
CONFIGURE_FILE(

View File

@ -469,7 +469,7 @@
<string>Meow</string>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600; color:#ff0004;&quot;&gt;Catnarok!&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;Or just a cat with a ball of yarn?&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;WHO KNOWS?!&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;img src=&quot;:/icons/instances/tnt&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;It's a fluffy kitty :3&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</action>
<action name="actionCopyInstance">

View File

@ -3,7 +3,7 @@
#endif
#include <windows.h>
IDI_ICON1 ICON DISCARDABLE "resources/icons/MultiMC.ico"
IDI_ICON1 ICON DISCARDABLE "MultiMC.ico"
1 RT_MANIFEST "MultiMC.manifest"
VS_VERSION_INFO VERSIONINFO