Commit b09fe77f authored by Manuel Moos's avatar Manuel Moos
Browse files

Merge from legacy_0.2.9

parents d461121d 703ffc55
Pipeline #233026924 passed with stages
in 51 minutes and 25 seconds
......@@ -299,7 +299,9 @@ install_link ${BINDIR}/@prognamebase@-master-@version@ ${BINDIR}/@prognamebase@-
# install desktop files
if test @enable_desktop@ = yes; then
DESKTOPSOURCE=@aa_datadir@/desktop
METADEST=${PREFIX}/share/metainfo
DESKTOPDESTDIR=${PREFIX}/share/applications
DESKTOPDEST=${DESKTOPDESTDIR}/org.armagetronad.@progname@.desktop
METADEST=${PREFIX}/share/appdata
# rebrand icons and desktop file
if test "$MODE" = "install"; then
......@@ -309,8 +311,9 @@ if test @enable_desktop@ = yes; then
for f in 16x16 32x32 48x48; do mv ${DESTDIR}${DESKTOPSOURCE}/icons/$f/armagetronad.png ${DESTDIR}${DESKTOPSOURCE}/icons/$f/@prognamebase@.png || exit $?; done
fi
mkdir -p ${DESTDIR}${DESKTOPDESTDIR}
for suffix in .desktop -handler.desktop; do
mv ${DESTDIR}${DESKTOPSOURCE}/armagetronad-armagetronad${suffix} ${DESTDIR}${DESKTOPSOURCE}/org.armagetronad.@progname@${suffix} || exit $?
mv ${DESTDIR}${DESKTOPSOURCE}/armagetronad-armagetronad${suffix} ${DESTDIR}${DESKTOPDESTDIR}/org.armagetronad.@progname@${suffix} || exit $?
done
fi
......@@ -324,31 +327,31 @@ if test @enable_desktop@ = yes; then
done
# add standard menu entry
xdg-desktop-menu ${MODE} --novendor ${DESTDIR}${DESKTOPSOURCE}/org.armagetronad.@progname@.desktop || exit $?
xdg-desktop-menu ${MODE} --novendor ${DESTDIR}${DESKTOPDESTDIR}/org.armagetronad.@progname@.desktop || exit $?
# add standard filetype and association for armagetronad:// links
xdg-mime ${MODE} ${DESTDIR}${DESKTOPSOURCE}/armagetronad-link.xml || exit $?
xdg-desktop-menu ${MODE} --novendor ${DESTDIR}${DESKTOPSOURCE}/org.armagetronad.@progname@-handler.desktop || exit $?
xdg-desktop-menu ${MODE} --novendor ${DESTDIR}${DESKTOPDESTDIR}/org.armagetronad.@progname@-handler.desktop || exit $?
else
# use plain old shell commands to do pretty much the same as above
if test "$MODE" = "install"; then
# add appstream metadata
mkdir_p ${DESTDIR}${METADEST}
mv ${DESTDIR}${DESKTOPSOURCE}/armagetronad.appdata.xml ${DESTDIR}${METADEST}/@progname@.appdata.xml || exit $?
# install icons in canonical locations
for f in 16x16 32x32 48x48; do
icontarget=${DESTDIR}${PREFIX}/share/icons/hicolor/$f/apps
mkdir -p ${icontarget} || exit $?
install_link ${DESTDIR}${DESKTOPSOURCE}/icons/$f/@prognamebase@.png ${icontarget}/ || exit $?
done
else
for f in 16x16 32x32 48x48; do rm -f ${DESTDIR}${DESKTOPSOURCE}/icons/$f/@prognamebase@.png; done
for suffix in .desktop -handler.desktop; do
rm -f ${DESTDIR}${DESKTOPSOURCE}/org.armagetronad.@progname@${suffix}
rm -f ${DESTDIR}${DESKTOPDESTDIR}/org.armagetronad.@progname@${suffix}
done
rm -f ${DESTDIR}${METADEST}/@progname@.appdata.xml
fi
# install icons in canonical locations
for f in 16x16 32x32 48x48; do
icontarget=${PREFIX}/share/icons/hicolor/$f/apps
mkdir -p ${DESTDIR}${icontarget} || exit $?
install_link ${DESKTOPSOURCE}/icons/$f/@prognamebase@.png ${icontarget}/ || exit $?
done
fi
# add KDE icons and desktop link
......
usr/games/armagetronad
usr/games/armagetronad.real
usr/share/games/armagetronad/desktop/org.armagetronad.armagetronad-handler.desktop usr/share/applications
usr/share/games/armagetronad/desktop/org.armagetronad.armagetronad.desktop usr/share/applications
usr/share/games/armagetronad/models
usr/share/games/armagetronad/sound
usr/share/games/armagetronad/textures
usr/share/icons/hicolor/
usr/share/icons/hicolor
usr/share/applications
\ No newline at end of file
......@@ -12,7 +12,7 @@ find ${APPDIR} -type l -name "*.desktop" -exec rm -f \{\} \;
mkdir -p ${APPDIR}/usr/share/applications/
cp ${APPDIR}/org.armagetronad.${PACKAGE}.desktop ${APPDIR}/usr/share/applications/ || exit $?
# add appinfo
# add appinfo (noncanonical place, usually it goes to prefix/share/appdata)
mkdir -p ${APPDIR}/usr/share/metainfo || exit $?
cp ${APPDIR}/usr/share/games/${PACKAGE}/desktop/armagetronad.appdata.xml ${APPDIR}/usr/share/metainfo/org.armagetronad.${PACKAGE}.appdata.xml || exit $?
#sed -i -e 's,type="desktop-id">,type="desktop-id">../../../,' ${APPDIR}/usr/share/metainfo/org.armagetronad.${PACKAGE}.appdata.xml || exit $?
......
......@@ -53,7 +53,7 @@ for suffix in bat nsi nsi.m4 cfg txt dsp dsw h cpp dtd xml; do
done
rm -rf $WINDIR/config.* $WINDIR/configure* $WINDIR/*.m4 $WINDIR/*.kde*
rm -rf $WINDIR/bootstrap.sh $WINDIR/batch $WINDIR/missing $WINDIR/install-sh $WINDIR/textures/KGN*
rm -rf $WINDIR/bootstrap.sh $WINDIR/batch $WINDIR/missing $WINDIR/install-sh
find $WINDIR -name "*.in" -exec rm \{\} \;
find $WINDIR -name "*.am" -exec rm \{\} \;
find $WINDIR -name "Makefile*" -exec rm \{\} \;
......
......@@ -2590,7 +2590,7 @@ menuitem_toggle_off Aus
#********************************************
#********************************************
timer_hickup Die Systemuhr scheint gerade um \1 Sekunden gesprungen zu sein. Wenn das häufger vorkommt, solltest Du ihre Funktion ueberpruefen.
timer_hickup Die Systemuhr scheint gerade um \1 Sekunden gesprungen zu sein. Wenn das häufger vorkommt, solltest Du ihre Funktion überpruefen.
#********************************************
#********************************************
......
......@@ -1569,7 +1569,6 @@ welcome_message_vendor Fournisseur du GL:
welcome_message_renderer GL Renderer:
welcome_message_version Version du GL:
welcome_message_finish \nBon amusement!\n
#\n\nThis Game is supported from KGN (Krawall Gaming Network, www.krawall.de).
#********************************************
#********************************************
......
This diff is collapsed.
......@@ -707,6 +707,5 @@ game_menu_disconnect_help Desconectar do servidor e voltar ao menu principal
# Room for lost settings in translation files:
# leaque/highscore messages
#\n\nThis Game is supported from KGN (Krawall Gaming Network, www.krawall.de).
# The text item for a configuration
......@@ -1768,7 +1768,6 @@ welcome_message_vendor GL Vendor :
welcome_message_renderer GL Renderer :
welcome_message_version GL Version :
welcome_message_finish \nDisfruta!\n
#\n\nThis Game is supported from KGN (Krawall Gaming Network, www.krawall.de).
#********************************************
#********************************************
......
......@@ -35,14 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "uMenu.h"
#include "tSysTime.h"
/*
#include "nConfig.h"
static tString lala_logoTexture("Anonymous/original/textures/KGN_logo.png");
static nSettingItem<tString> lalala_logoTexture("TEXTURE_LOGO", lala_logoTexture);
rFileTexture sg_LogoTexture(rTextureGroups::TEX_FONT, lala_logoTexture, 0,0,1);
*/
static rFileTexture sg_LogoTexture(rTextureGroups::TEX_FONT, "textures/KGN_logo.png",0,0,1);
// static rFileTexture sg_LogoTexture(rTextureGroups::TEX_FONT, "textures/KGN_logo.png",0,0,1);
static rISurfaceTexture* sg_LogoMPTitle = NULL;
static gLogo logo;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment