diff --git a/Makefile b/Makefile index 4169b0bb..74796043 100644 --- a/Makefile +++ b/Makefile @@ -124,7 +124,7 @@ install: all strip openbios $(CP) third_party/noto/* $(PREFIX)/share/pcsx-redux/fonts $(CP) i18n/*.po $(PREFIX)/share/pcsx-redux/i18n $(CP) resources/*.ico $(PREFIX)/share/pcsx-redux/resources - convert resources/pcsx.ico[0] -alpha on -background none $(PREFIX)/share/icons/hicolor/256x256/apps/pcsx.png + convert resources/pcsx-redux.ico[0] -alpha on -background none $(PREFIX)/share/icons/hicolor/256x256/apps/pcsx-redux.png third_party/luajit/src/libluajit.a: $(MAKE) $(MAKEOPTS) -C third_party/luajit/src amalg CC=$(CC) BUILDMODE=static CFLAGS=$(LUAJIT_CFLAGS) XCFLAGS=-DLUAJIT_ENABLE_GC64 MACOSX_DEPLOYMENT_TARGET=10.15 diff --git a/resources/pcsx.ico b/resources/pcsx-redux.ico similarity index 100% rename from resources/pcsx.ico rename to resources/pcsx-redux.ico diff --git a/resources/pcsx-redux.rc b/resources/pcsx-redux.rc index c2319e44..4e245ba2 100644 --- a/resources/pcsx-redux.rc +++ b/resources/pcsx-redux.rc @@ -52,7 +52,7 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_ICON1 ICON "pcsx.ico" +IDI_ICON1 ICON "pcsx-redux.ico" #endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/src/gui/resources-unix.cc b/src/gui/resources-unix.cc index daeed352..bc4a52df 100644 --- a/src/gui/resources-unix.cc +++ b/src/gui/resources-unix.cc @@ -23,7 +23,7 @@ #include "support/file.h" void PCSX::Resources::loadIcon(std::function process) { - std::filesystem::path fname = "pcsx.ico"; + std::filesystem::path fname = "pcsx-redux.ico"; std::filesystem::path dir = "resources"; File* ico = nullptr; ico = new File(fname); diff --git a/vsprojects/mainthunk/mainthunk.vcxproj b/vsprojects/mainthunk/mainthunk.vcxproj index 56ebd215..d7a70751 100644 --- a/vsprojects/mainthunk/mainthunk.vcxproj +++ b/vsprojects/mainthunk/mainthunk.vcxproj @@ -306,7 +306,7 @@ - + diff --git a/vsprojects/mainthunk/mainthunk.vcxproj.filters b/vsprojects/mainthunk/mainthunk.vcxproj.filters index 8ca66199..16fabc39 100644 --- a/vsprojects/mainthunk/mainthunk.vcxproj.filters +++ b/vsprojects/mainthunk/mainthunk.vcxproj.filters @@ -23,7 +23,7 @@ - + Resource Files