diff --git a/CMakeLists.txt b/CMakeLists.txt index 33795b98ea..902fce4ea1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1613,7 +1613,7 @@ endif() if (TargetBin) if (IOS OR APPLE) if (APPLE AND NOT IOS) - set(ICON_PATH_ABS ${CMAKE_CURRENT_SOURCE_DIR}/assets/ppsspp.icns) + set(ICON_PATH_ABS ${CMAKE_CURRENT_SOURCE_DIR}/icons/ppsspp.icns) set( MACOSX_BUNDLE_ICON_FILE ppsspp.icns ) set_source_files_properties(${ICON_PATH_ABS} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") endif() diff --git a/Qt/Platform/linux.pri b/Qt/Platform/linux.pri index 1fafda6281..2e005fa298 100644 --- a/Qt/Platform/linux.pri +++ b/Qt/Platform/linux.pri @@ -10,22 +10,22 @@ linux-*|hpux-*|solaris-*: LIBS += -lrt # clock_gettime # Packaging - icon16.files = $$P/assets/unix-icons/hicolor/16x16/apps/ppsspp.png + icon16.files = $$P/icons/hicolor/16x16/apps/ppsspp.png icon16.path = $$DESTDIR$$PREFIX/share/icons/hicolor/16x16/apps - icon32.files = $$P/assets/unix-icons/hicolor/32x32/apps/ppsspp.png + icon32.files = $$P/icons/hicolor/32x32/apps/ppsspp.png icon32.path = $$DESTDIR$$PREFIX/share/icons/hicolor/32x32/apps - icon64.files = $$P/assets/unix-icons/hicolor/64x64/apps/ppsspp.png + icon64.files = $$P/icons/hicolor/64x64/apps/ppsspp.png icon64.path = $$DESTDIR$$PREFIX/share/icons/hicolor/64x64/apps - icon96.files = $$P/assets/unix-icons/hicolor/96x96/apps/ppsspp.png + icon96.files = $$P/icons/hicolor/96x96/apps/ppsspp.png icon96.path = $$DESTDIR$$PREFIX/share/icons/hicolor/96x96/apps - icon256.files = $$P/assets/unix-icons/hicolor/256x256/apps/ppsspp.png + icon256.files = $$P/icons/hicolor/256x256/apps/ppsspp.png icon256.path = $$DESTDIR$$PREFIX/share/icons/hicolor/256x256/apps - icon512.files = $$P/assets/unix-icons/hicolor/512x512/apps/ppsspp.png + icon512.files = $$P/icons/hicolor/512x512/apps/ppsspp.png icon512.path = $$DESTDIR$$PREFIX/share/icons/hicolor/512x512/apps applications.files = $$P/debian/ppsspp.desktop diff --git a/assets/unix-icons/convert-to-png.sh b/icons/convert-to-png.sh old mode 100755 new mode 100644 similarity index 95% rename from assets/unix-icons/convert-to-png.sh rename to icons/convert-to-png.sh index 4cd715380b..0ac8460e85 --- a/assets/unix-icons/convert-to-png.sh +++ b/icons/convert-to-png.sh @@ -15,7 +15,7 @@ # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Very simple bash script to convert svg to png files, you can choose inkscape or imagemagick ('convert' command) and the path to icons export. -# Only converts assets/unix-icons/icon-512.svg +# Only converts icons/icon-512.svg # Needs improvement, yeah, i know, it is not so good... at least it work :) @@ -27,7 +27,7 @@ # Default options software_option="inkscape" # sometimes imagemagick does not convert very well, so inkscape is default -path="icons" # i.e. assets/unix-icons/icons/ +path="icons" # i.e. icons/icons/ echo -e @@ -56,7 +56,7 @@ while [ "$1" != "" ]; do done -# Creating assets/unix-icons/icons/ if user does not choose any directory +# Creating icons/icons/ if user does not choose any directory if [ "$path" == "icons" ] && [ ! -d "$path" ]; then mkdir icons/ fi diff --git a/assets/unix-icons/hicolor/128x128/apps/ppsspp.png b/icons/hicolor/128x128/apps/ppsspp.png similarity index 100% rename from assets/unix-icons/hicolor/128x128/apps/ppsspp.png rename to icons/hicolor/128x128/apps/ppsspp.png diff --git a/assets/unix-icons/hicolor/16x16/apps/ppsspp.png b/icons/hicolor/16x16/apps/ppsspp.png similarity index 100% rename from assets/unix-icons/hicolor/16x16/apps/ppsspp.png rename to icons/hicolor/16x16/apps/ppsspp.png diff --git a/assets/unix-icons/hicolor/24x24/apps/ppsspp.png b/icons/hicolor/24x24/apps/ppsspp.png similarity index 100% rename from assets/unix-icons/hicolor/24x24/apps/ppsspp.png rename to icons/hicolor/24x24/apps/ppsspp.png diff --git a/assets/unix-icons/hicolor/256x256/apps/ppsspp.png b/icons/hicolor/256x256/apps/ppsspp.png similarity index 100% rename from assets/unix-icons/hicolor/256x256/apps/ppsspp.png rename to icons/hicolor/256x256/apps/ppsspp.png diff --git a/assets/unix-icons/hicolor/32x32/apps/ppsspp.png b/icons/hicolor/32x32/apps/ppsspp.png similarity index 100% rename from assets/unix-icons/hicolor/32x32/apps/ppsspp.png rename to icons/hicolor/32x32/apps/ppsspp.png diff --git a/assets/unix-icons/hicolor/48x48/apps/ppsspp.png b/icons/hicolor/48x48/apps/ppsspp.png similarity index 100% rename from assets/unix-icons/hicolor/48x48/apps/ppsspp.png rename to icons/hicolor/48x48/apps/ppsspp.png diff --git a/assets/unix-icons/hicolor/512x512/apps/ppsspp.png b/icons/hicolor/512x512/apps/ppsspp.png similarity index 100% rename from assets/unix-icons/hicolor/512x512/apps/ppsspp.png rename to icons/hicolor/512x512/apps/ppsspp.png diff --git a/assets/unix-icons/hicolor/64x64/apps/ppsspp.png b/icons/hicolor/64x64/apps/ppsspp.png similarity index 100% rename from assets/unix-icons/hicolor/64x64/apps/ppsspp.png rename to icons/hicolor/64x64/apps/ppsspp.png diff --git a/assets/unix-icons/hicolor/96x96/apps/ppsspp.png b/icons/hicolor/96x96/apps/ppsspp.png similarity index 100% rename from assets/unix-icons/hicolor/96x96/apps/ppsspp.png rename to icons/hicolor/96x96/apps/ppsspp.png diff --git a/assets/icon-114.png b/icons/icon-114.png similarity index 100% rename from assets/icon-114.png rename to icons/icon-114.png diff --git a/assets/unix-icons/icon-16.svg b/icons/icon-16.svg similarity index 100% rename from assets/unix-icons/icon-16.svg rename to icons/icon-16.svg diff --git a/assets/unix-icons/icon-512.svg b/icons/icon-512.svg similarity index 100% rename from assets/unix-icons/icon-512.svg rename to icons/icon-512.svg diff --git a/assets/icon.svg b/icons/icon.svg similarity index 100% rename from assets/icon.svg rename to icons/icon.svg diff --git a/assets/unix-icons/notes.txt b/icons/notes.txt similarity index 100% rename from assets/unix-icons/notes.txt rename to icons/notes.txt diff --git a/assets/ppsspp.icns b/icons/ppsspp.icns similarity index 100% rename from assets/ppsspp.icns rename to icons/ppsspp.icns