diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d7b7f0a8e..01d6987126 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2789,8 +2789,6 @@ set(NativeAssets assets/sfx_toggle_on.wav assets/sfx_achievement_unlocked.wav assets/sfx_leaderbord_submitted.wav - source_assets/image/logo.png - source_assets/image/icon_regular_72.png ) file(GLOB UIImages CONFIGURE_DEPENDS diff --git a/Qt/mainwindow.cpp b/Qt/mainwindow.cpp index 082624fabd..c0dff25d1c 100644 --- a/Qt/mainwindow.cpp +++ b/Qt/mainwindow.cpp @@ -28,12 +28,12 @@ MainWindow::MainWindow(QWidget *parent, bool fullscreen) : lastUIState(UISTATE_MENU) { #if defined(ASSETS_DIR) - if (QFile::exists(ASSETS_DIR "icon_regular_72.png")) - setWindowIcon(QIcon(ASSETS_DIR "icon_regular_72.png")); + if (QFile::exists(ASSETS_DIR "ui_images/icon.png")) + setWindowIcon(QIcon(ASSETS_DIR "ui_images/icon.png")); else - setWindowIcon(QIcon(qApp->applicationDirPath() + "/assets/icon_regular_72.png")); + setWindowIcon(QIcon(qApp->applicationDirPath() + "/assets/ui_images/icon.png")); #else - setWindowIcon(QIcon(qApp->applicationDirPath() + "/assets/icon_regular_72.png")); + setWindowIcon(QIcon(qApp->applicationDirPath() + "/assets/ui_images/icon.png")); #endif SetGameTitle(""); diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp index 7bd757b9ca..4c29560b75 100644 --- a/SDL/SDLMain.cpp +++ b/SDL/SDLMain.cpp @@ -1723,11 +1723,11 @@ int main(int argc, char *argv[]) { char iconPath[PATH_MAX]; #if defined(ASSETS_DIR) - snprintf(iconPath, PATH_MAX, "%sicon_regular_72.png", ASSETS_DIR); + snprintf(iconPath, PATH_MAX, "%sui_images/icon.png", ASSETS_DIR); if (access(iconPath, F_OK) != 0) - snprintf(iconPath, PATH_MAX, "%sassets/icon_regular_72.png", SDL_GetBasePath() ? SDL_GetBasePath() : ""); + snprintf(iconPath, PATH_MAX, "%sassets/ui_images/icon.png", SDL_GetBasePath() ? SDL_GetBasePath() : ""); #else - snprintf(iconPath, PATH_MAX, "%sassets/icon_regular_72.png", SDL_GetBasePath() ? SDL_GetBasePath() : ""); + snprintf(iconPath, PATH_MAX, "%sassets/ui_images/icon.png", SDL_GetBasePath() ? SDL_GetBasePath() : ""); #endif int width = 0, height = 0; unsigned char *imageData; diff --git a/b-ios.sh b/b-ios.sh index 4bf7c49b46..bebe192e63 100755 --- a/b-ios.sh +++ b/b-ios.sh @@ -50,10 +50,6 @@ fi #cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchains/ios.cmake .. #make -j4 -# When building with Makefile, we're missing these icon image files (may be need to run generate_icons.py first?). Let's use whatever we have (wrong size tho) -#cp -a assets/icon_regular_72.png Payload/PPSSPP.app/AppIcon60x60@2x.png -#cp -a assets/icon_regular_72.png Payload/PPSSPP.app/AppIcon76x76@2x~ipad.png - cp ../ext/vulkan/iOS/Frameworks/libMoltenVK.dylib PPSSPP.app/Frameworks ln -s ./ Payload #ldid -w -S -IlibMoltenVK -K../../certificate.p12 -Upassword PPSSPP.app/Frameworks/libMoltenVK.dylib diff --git a/ios/Launch Screen.storyboard b/ios/Launch Screen.storyboard index 78a1ea3758..00ac8f6f7a 100644 --- a/ios/Launch Screen.storyboard +++ b/ios/Launch Screen.storyboard @@ -34,8 +34,4 @@ - - - -