Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Let "make install" do the right thing. #41

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Let "make install" do the right thing. #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff5116f
Let "make install" do the right thing
rderooy Oct 20, 2020
2b62fc6
remove duplicate lines
rderooy Oct 20, 2020
fd1349c
Merge branch 'openMSX:master' into master
rderooy Nov 20, 2021
6d504e6
Merge branch 'openMSX:master' into master
rderooy Sep 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions build/main.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,16 +403,26 @@ endif
ifeq ($(CATAPULT_PREBUILT),false)
ifneq ($(CATAPULT_NO_DESKTOP_HOOKS),true)
$(SUM) " Desktop hooks..."
$(CMD)mkdir -p $(INSTALL_PREFIX)$(INSTALL_SHARE_DIR)/resources/icons
$(CMD)cp -rf src/catapult.xpm $(INSTALL_PREFIX)$(INSTALL_SHARE_DIR)/resources/icons
$(CMD)mkdir -p $(INSTALL_PREFIX)/usr/share/icons/hicolor/16x16/apps
$(CMD)cp -rf desktop/catapult-logo-16.png $(INSTALL_PREFIX)/usr/share/icons/hicolor/16x16/apps/openmsx-catapult.png
$(CMD)mkdir -p $(INSTALL_PREFIX)/usr/share/icons/hicolor/32x32/apps
$(CMD)cp -rf desktop/catapult-logo-32.png $(INSTALL_PREFIX)/usr/share/icons/hicolor/32x32/apps/openmsx-catapult.png
$(CMD)mkdir -p $(INSTALL_PREFIX)/usr/share/icons/hicolor/48x48/apps
$(CMD)cp -rf desktop/catapult-logo-48.png $(INSTALL_PREFIX)/usr/share/icons/hicolor/48x48/apps/openmsx-catapult.png
$(CMD)mkdir -p $(INSTALL_PREFIX)/usr/share/icons/hicolor/64x64/apps
$(CMD)cp -rf desktop/catapult-logo-64.png $(INSTALL_PREFIX)/usr/share/icons/hicolor/64x64/apps/openmsx-catapult.png
$(CMD)mkdir -p $(INSTALL_PREFIX)/usr/share/icons/hicolor/128x128/apps
$(CMD)cp -rf desktop/catapult-logo-128.png $(INSTALL_PREFIX)/usr/share/icons/hicolor/128x128/apps/openmsx-catapult.png
$(CMD)mkdir -p $(INSTALL_PREFIX)/usr/share/icons/hicolor/192x192/apps
$(CMD)cp -rf desktop/catapult-logo-192.png $(INSTALL_PREFIX)/usr/share/icons/hicolor/192x192/apps/openmsx-catapult.png
$(CMD)if [ -d $(INSTALL_PREFIX)/usr/share/applications -a -w $(INSTALL_PREFIX)/usr/share/applications ]; \
then sed -e "s|%INSTALL_BASE%|$(INSTALL_SHARE_DIR)|" \
desktop/openMSX-Catapult.desktop \
> $(INSTALL_PREFIX)/usr/share/applications/openMSX-Catapult.desktop; \
desktop/org.openmsx.openMSX.Catapult.desktop \
> $(INSTALL_PREFIX)/usr/share/applications/org.openmsx.openMSX.Catapult.desktop; \
else mkdir -p ~/.local/share/applications && \
sed -e "s|%INSTALL_BASE%|$(INSTALL_SHARE_DIR)|" \
desktop/openMSX-Catapult.desktop \
> ~/.local/share/applications/openMSX-Catapult.desktop; \
desktop/org.openmsx.openMSX.Catapult.desktop \
> ~/.local/share/applications/org.openmsx.openMSX.Catapult.desktop; \
fi
endif
ifeq ($(SYMLINK_FOR_BINARY),true)
Expand Down
Binary file added desktop/catapult-logo-128.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added desktop/catapult-logo-16.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added desktop/catapult-logo-192.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added desktop/catapult-logo-210.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added desktop/catapult-logo-32.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added desktop/catapult-logo-48.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added desktop/catapult-logo-64.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions desktop/org.openmsx.openMSX.Catapult.desktop
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[Desktop Entry]
Name=openMSX Catapult
Comment=Graphical interface for openMSX
Comment[da]=Grafisk interface til openMSX
Comment[de]=Grafische Oberfläch für openMSX
Comment[es]=Interfaz gráfica para openMSX
Comment[fi]=Graafinen käytöliittymä openMSX: lle
Comment[fr]=Interface graphique pour openMSX
Comment[it]=Interfaccia grafica per openMSX
Comment[nl]=Grafische interface voor openMSX
Comment[no]=Grafisk grensenitt for openMSX
Comment[pl]=Graficzny interfejs dla openMSX
Comment[pt]=Interface gráfica para openMSX
Comment[sv]=Grafiskt gränssnit för openMSX
Type=Application
Exec=%INSTALL_BASE%/bin/catapult
Icon=openmsx-catapult
DocPath=%INSTALL_BASE%/doc/manual/index.html
Terminal=false
Categories=Game;Emulator
Keywords=emulator;msx;openmsx;svi;colecovision
0 desktop/openMSX-Catapult.desktop → org.openmsx.openMSX.Catapult.desktop
View file
Open in desktop
File renamed without changes.