diff --git a/.github/build.sh b/.github/build.sh index 41a425aff..588519cba 100755 --- a/.github/build.sh +++ b/.github/build.sh @@ -387,10 +387,10 @@ if [[ $PACKAGE_MODE == appimage ]]; then mkdir -p $appdir/usr/share/icons cp powder $appdir/usr/bin/powder mv AppRun $appdir/AppRun - cp ../resources/icon/powder-128.png $appdir/powder.png + cp ../resources/icon/powder-128.png $appdir/powdertoy-powder.png cp resources/powder.desktop $appdir/uk.co.powdertoy.tpt.desktop cp appdata.xml $appdir/usr/share/metainfo/uk.co.powdertoy.tpt.appdata.xml - cp $appdir/powder.png $appdir/usr/share/icons/powder.png + cp $appdir/powdertoy-powder.png $appdir/usr/share/icons/powdertoy-powder.png cp $appdir/uk.co.powdertoy.tpt.desktop $appdir/usr/share/applications/uk.co.powdertoy.tpt.desktop ./appimagetool $appdir $ASSET_PATH fi diff --git a/data/IntroText.h b/data/IntroText.h index 5e3bfd8f8..b3597b520 100644 --- a/data/IntroText.h +++ b/data/IntroText.h @@ -37,17 +37,8 @@ const char *const introTextData = #elif MOD_ID > 0 " MODVER " MTOS(SNAPSHOT_ID) #endif -#ifdef X86 - " X86" -#endif -#ifdef X86_SSE - " X86_SSE" -#endif -#ifdef X86_SSE2 - " X86_SSE2" -#endif -#ifdef X86_SSE3 - " X86_SSE3" +#if defined(X86_SSE) || defined(X86_SSE2) || defined(X86_SSE3) + " " IDENT_BUILD #endif #ifdef LUACONSOLE " LUACONSOLE" @@ -57,5 +48,14 @@ const char *const introTextData = #endif #ifdef REALISTIC " REALISTIC" +#endif +#ifdef NOHTTP + " NOHTTP" +#endif +#ifdef DEBUG + " DEBUG" +#endif +#ifdef ENFORCE_HTTPS + " HTTPS" #endif ; diff --git a/resources/powder.template.desktop b/resources/powder.template.desktop index e8e225a9b..fce48c223 100644 --- a/resources/powder.template.desktop +++ b/resources/powder.template.desktop @@ -5,4 +5,4 @@ Comment=@APPCOMMENT@ MimeType=application/vnd.powdertoy.save;x-scheme-handler/ptsave; Categories=Game;Simulation; Exec=@APPEXE@ %u -Icon=@APPEXE@ +Icon=@APPVENDOR@-@APPEXE@