From a15d9ed0b61b5798b6e58c617f341afcf9ce97b2 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 6 Sep 2014 10:41:45 -0400 Subject: [PATCH] Migrate PNGs from DolphinWX to the Data/Sys/Resources directory. * Aren't used by anything (yet) as DolphinWX compiles XPM versions into the build * Moved the .desktop file as well, adjusted INSTALL rule accordingly --- CMakeLists.txt | 6 +++--- .../resources => Data/Sys/Resources}/Dolphin.png | Bin .../Sys/Resources}/Platform_Gamecube.png | Bin .../Sys/Resources}/Platform_Wad.png | Bin .../Sys/Resources}/Platform_Wii.png | Bin .../Sys/Resources}/dolphin_logo.png | Bin .../resources => Data/Sys/Resources}/rating0.png | Bin .../resources => Data/Sys/Resources}/rating1.png | Bin .../resources => Data/Sys/Resources}/rating2.png | Bin .../resources => Data/Sys/Resources}/rating3.png | Bin .../resources => Data/Sys/Resources}/rating4.png | Bin .../resources => Data/Sys/Resources}/rating5.png | Bin .../Sys/Themes/Boomy}/toolbar_add_breakpoint.png | Bin .../Sys/Themes/Boomy}/toolbar_add_memorycheck.png | Bin .../Sys/Themes/Boomy}/toolbar_debugger_delete.png | Bin .../resources => Installer}/dolphin-emu.desktop | 0 .../Dolphin.xpm => Installer/dolphin-emu.xpm | 0 17 files changed, 3 insertions(+), 3 deletions(-) rename {Source/Core/DolphinWX/resources => Data/Sys/Resources}/Dolphin.png (100%) rename {Source/Core/DolphinWX/resources => Data/Sys/Resources}/Platform_Gamecube.png (100%) rename {Source/Core/DolphinWX/resources => Data/Sys/Resources}/Platform_Wad.png (100%) rename {Source/Core/DolphinWX/resources => Data/Sys/Resources}/Platform_Wii.png (100%) rename {Source/Core/DolphinWX/resources => Data/Sys/Resources}/dolphin_logo.png (100%) rename {Source/Core/DolphinWX/resources => Data/Sys/Resources}/rating0.png (100%) rename {Source/Core/DolphinWX/resources => Data/Sys/Resources}/rating1.png (100%) rename {Source/Core/DolphinWX/resources => Data/Sys/Resources}/rating2.png (100%) rename {Source/Core/DolphinWX/resources => Data/Sys/Resources}/rating3.png (100%) rename {Source/Core/DolphinWX/resources => Data/Sys/Resources}/rating4.png (100%) rename {Source/Core/DolphinWX/resources => Data/Sys/Resources}/rating5.png (100%) rename {Source/Core/DolphinWX/resources => Data/Sys/Themes/Boomy}/toolbar_add_breakpoint.png (100%) rename {Source/Core/DolphinWX/resources => Data/Sys/Themes/Boomy}/toolbar_add_memorycheck.png (100%) rename {Source/Core/DolphinWX/resources => Data/Sys/Themes/Boomy}/toolbar_debugger_delete.png (100%) rename {Source/Core/DolphinWX/resources => Installer}/dolphin-emu.desktop (100%) rename Source/Core/DolphinWX/resources/Dolphin.xpm => Installer/dolphin-emu.xpm (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a9d0b2123..25cac0851e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -762,9 +762,9 @@ if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|Darwin")) endif() if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") # Install the application icon and menu item - install(FILES Source/Core/DolphinWX/resources/Dolphin.xpm - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps RENAME dolphin-emu.xpm) - install(FILES Source/Core/DolphinWX/resources/dolphin-emu.desktop + install(FILES Installer/dolphin-emu.xpm + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps) + install(FILES Installer/dolphin-emu.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) endif() diff --git a/Source/Core/DolphinWX/resources/Dolphin.png b/Data/Sys/Resources/Dolphin.png similarity index 100% rename from Source/Core/DolphinWX/resources/Dolphin.png rename to Data/Sys/Resources/Dolphin.png diff --git a/Source/Core/DolphinWX/resources/Platform_Gamecube.png b/Data/Sys/Resources/Platform_Gamecube.png similarity index 100% rename from Source/Core/DolphinWX/resources/Platform_Gamecube.png rename to Data/Sys/Resources/Platform_Gamecube.png diff --git a/Source/Core/DolphinWX/resources/Platform_Wad.png b/Data/Sys/Resources/Platform_Wad.png similarity index 100% rename from Source/Core/DolphinWX/resources/Platform_Wad.png rename to Data/Sys/Resources/Platform_Wad.png diff --git a/Source/Core/DolphinWX/resources/Platform_Wii.png b/Data/Sys/Resources/Platform_Wii.png similarity index 100% rename from Source/Core/DolphinWX/resources/Platform_Wii.png rename to Data/Sys/Resources/Platform_Wii.png diff --git a/Source/Core/DolphinWX/resources/dolphin_logo.png b/Data/Sys/Resources/dolphin_logo.png similarity index 100% rename from Source/Core/DolphinWX/resources/dolphin_logo.png rename to Data/Sys/Resources/dolphin_logo.png diff --git a/Source/Core/DolphinWX/resources/rating0.png b/Data/Sys/Resources/rating0.png similarity index 100% rename from Source/Core/DolphinWX/resources/rating0.png rename to Data/Sys/Resources/rating0.png diff --git a/Source/Core/DolphinWX/resources/rating1.png b/Data/Sys/Resources/rating1.png similarity index 100% rename from Source/Core/DolphinWX/resources/rating1.png rename to Data/Sys/Resources/rating1.png diff --git a/Source/Core/DolphinWX/resources/rating2.png b/Data/Sys/Resources/rating2.png similarity index 100% rename from Source/Core/DolphinWX/resources/rating2.png rename to Data/Sys/Resources/rating2.png diff --git a/Source/Core/DolphinWX/resources/rating3.png b/Data/Sys/Resources/rating3.png similarity index 100% rename from Source/Core/DolphinWX/resources/rating3.png rename to Data/Sys/Resources/rating3.png diff --git a/Source/Core/DolphinWX/resources/rating4.png b/Data/Sys/Resources/rating4.png similarity index 100% rename from Source/Core/DolphinWX/resources/rating4.png rename to Data/Sys/Resources/rating4.png diff --git a/Source/Core/DolphinWX/resources/rating5.png b/Data/Sys/Resources/rating5.png similarity index 100% rename from Source/Core/DolphinWX/resources/rating5.png rename to Data/Sys/Resources/rating5.png diff --git a/Source/Core/DolphinWX/resources/toolbar_add_breakpoint.png b/Data/Sys/Themes/Boomy/toolbar_add_breakpoint.png similarity index 100% rename from Source/Core/DolphinWX/resources/toolbar_add_breakpoint.png rename to Data/Sys/Themes/Boomy/toolbar_add_breakpoint.png diff --git a/Source/Core/DolphinWX/resources/toolbar_add_memorycheck.png b/Data/Sys/Themes/Boomy/toolbar_add_memorycheck.png similarity index 100% rename from Source/Core/DolphinWX/resources/toolbar_add_memorycheck.png rename to Data/Sys/Themes/Boomy/toolbar_add_memorycheck.png diff --git a/Source/Core/DolphinWX/resources/toolbar_debugger_delete.png b/Data/Sys/Themes/Boomy/toolbar_debugger_delete.png similarity index 100% rename from Source/Core/DolphinWX/resources/toolbar_debugger_delete.png rename to Data/Sys/Themes/Boomy/toolbar_debugger_delete.png diff --git a/Source/Core/DolphinWX/resources/dolphin-emu.desktop b/Installer/dolphin-emu.desktop similarity index 100% rename from Source/Core/DolphinWX/resources/dolphin-emu.desktop rename to Installer/dolphin-emu.desktop diff --git a/Source/Core/DolphinWX/resources/Dolphin.xpm b/Installer/dolphin-emu.xpm similarity index 100% rename from Source/Core/DolphinWX/resources/Dolphin.xpm rename to Installer/dolphin-emu.xpm