Fix references to icon files

This commit is contained in:
Henrik Rydgård
2025-09-18 11:40:04 -06:00
parent bceb989811
commit 7891d12c48
5 changed files with 7 additions and 17 deletions
-2
View File
@@ -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
+4 -4
View File
@@ -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("");
+3 -3
View File
@@ -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;
-4
View File
@@ -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
-4
View File
@@ -34,8 +34,4 @@
<point key="canvasLocation" x="52.623688155922046" y="373.60000000000002"/>
</scene>
</scenes>
<resources>
<image name="icon_regular_72.png" width="72" height="72"/>
<image name="logo.png" width="166" height="58"/>
</resources>
</document>