qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 07:11:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Apply witukind's XDG support patch

Browse source
This commit is contained in:
Bill Currie 2009-12-22 12:28:55 +00:00 committed by Jeff Teunissen
parent 5d15c70a0d
commit 0647a156e3
13 changed files with 228 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
configure.ac
View file

@ -1356,6 +1356,18 @@ else
cvs_def_disabled="!= xno"
fi
dnl Whether to enable XDG support or not
AC_ARG_ENABLE(xdg,
[ --enable-xdg enable XDG support],
xdg=$enable_xdg,
xdg=no
)
if test "x$xdg" != xno; then
HAVE_XDG=yes
else
HAVE_XDG=no
fi
dnl Set $prefix and $exec_prefix to $ac_default_prefix if they are not set
test "x$prefix" = "xNONE" && eval prefix="${ac_default_prefix}"
test "x$exec_prefix" = "xNONE" && eval exec_prefix="${prefix}"
@ -1368,10 +1380,16 @@ if test "x$SYSTYPE" = "xWIN32"; then
default_userpath="."
else
default_globalconf="/etc/${PACKAGE}.conf"
default_userconf="~/.${PACKAGE}rc"
eval foo="$datarootdir"
default_sharepath="$foo/games/$PACKAGE"
default_userpath="~/.$PACKAGE"
if test "x$HAVE_XDG" = "xyes"; then
default_userconf="~/.config/${PACKAGE}/${PACKAGE}.conf"
default_userpath="~/.local/share/${PACKAGE}"
else
default_userconf="~/.${PACKAGE}rc"
default_userpath="~/.$PACKAGE"
fi
fi
AC_ARG_WITH(global-cfg,
@ -1709,6 +1727,7 @@ if test "x$HAVE_ZLIB" = xyes; then
fi
AC_SUBST(Z_LIBS)
AM_CONDITIONAL(HAVE_ZLIB, test "$HAVE_ZLIB" = "yes")
AM_CONDITIONAL(HAVE_XDG, test "$HAVE_XDG" = "yes")
AC_ARG_ENABLE(boxclip,
[ --enable-boxclip enable box clipping],
@ -1746,6 +1765,8 @@ HW_TARGETS=""
QTV_TARGETS=""
QW_TARGETS=""
NQ_TARGETS=""
QW_DESKTOP_DATA=""
NQ_DESKTOP_DATA=""
BUILD_GL=no
BUILD_SW32=no
@ -1783,6 +1804,8 @@ if test "x$HAVE_X" = xyes; then
if test "x$ENABLE_clients_glx" = xyes; then
QW_TARGETS="$QW_TARGETS qw-client-glx\$(EXEEXT)"
NQ_TARGETS="$NQ_TARGETS nq-glx\$(EXEEXT)"
QW_DESKTOP_DATA="$QW_DESKTOP_DATA quakeforge-qw-glx.desktop"
NQ_DESKTOP_DATA="$NQ_DESKTOP_DATA quakeforge-nq-glx.desktop"
CL_TARGETS="$CL_TARGETS GLX"
VID_TARGETS="$VID_TARGETS libQFglx.la"
BUILD_GL=yes
@ -1794,6 +1817,8 @@ if test "x$HAVE_X" = xyes; then
if test "x$ENABLE_clients_x11" = xyes; then
QW_TARGETS="$QW_TARGETS qw-client-x11\$(EXEEXT)"
NQ_TARGETS="$NQ_TARGETS nq-x11\$(EXEEXT)"
QW_DESKTOP_DATA="$QW_DESKTOP_DATA quakeforge-qw-x11.desktop"
NQ_DESKTOP_DATA="$NQ_DESKTOP_DATA quakeforge-nq-x11.desktop"
CL_TARGETS="$CL_TARGETS X11"
VID_TARGETS="$VID_TARGETS libQFx11.la"
BUILD_SW=yes
@ -1821,6 +1846,8 @@ if test "x$HAVE_SDL" = xyes; then
if test "x$ENABLE_clients_sdl" = xyes; then
QW_TARGETS="$QW_TARGETS qw-client-sdl\$(EXEEXT)"
NQ_TARGETS="$NQ_TARGETS nq-sdl\$(EXEEXT)"
QW_DESKTOP_DATA="$QW_DESKTOP_DATA quakeforge-qw-sdl.desktop"
NQ_DESKTOP_DATA="$NQ_DESKTOP_DATA quakeforge-nq-sdl.desktop"
CL_TARGETS="$CL_TARGETS SDL"
VID_TARGETS="$VID_TARGETS libQFsdl.la"
BUILD_SW=yes
@ -1833,6 +1860,8 @@ if test "x$HAVE_SDL" = xyes; then
if test "x$ENABLE_clients_sdl32" = xyes; then
QW_TARGETS="$QW_TARGETS qw-client-sdl32\$(EXEEXT)"
NQ_TARGETS="$NQ_TARGETS nq-sdl32\$(EXEEXT)"
QW_DESKTOP_DATA="$QW_DESKTOP_DATA quakeforge-qw-sdl32.desktop"
NQ_DESKTOP_DATA="$NQ_DESKTOP_DATA quakeforge-nq-sdl32.desktop"
CL_TARGETS="$CL_TARGETS SDL32"
VID_TARGETS="$VID_TARGETS libQFsdl32.la"
BUILD_SW32=yes
@ -1845,6 +1874,8 @@ if test "x$HAVE_SDL" = xyes; then
if test "x$ENABLE_clients_sgl" = xyes; then
QW_TARGETS="$QW_TARGETS qw-client-sgl\$(EXEEXT)"
NQ_TARGETS="$NQ_TARGETS nq-sgl\$(EXEEXT)"
QW_DESKTOP_DATA="$QW_DESKTOP_DATA quakeforge-qw-sgl.desktop"
NQ_DESKTOP_DATA="$NQ_DESKTOP_DATA quakeforge-nq-sgl.desktop"
CL_TARGETS="$CL_TARGETS SDL-GL"
VID_TARGETS="$VID_TARGETS libQFsgl.la"
BUILD_GL=yes
@ -2203,8 +2234,10 @@ AC_DEFINE_UNQUOTED(SND_RENDER_PROTOS, $SND_RENDER_PROTOS, [list of sound render
AC_SUBST(HW_TARGETS)
AC_SUBST(NQ_TARGETS)
AC_SUBST(NQ_DESKTOP_DATA)
AC_SUBST(QTV_TARGETS)
AC_SUBST(QW_TARGETS)
AC_SUBST(QW_DESKTOP_DATA)
AC_SUBST(SERVER_PLUGIN_STATIC)
AC_SUBST(SERVER_PLUGIN_STATIC_LIBS)
AC_SUBST(SERVER_PLUGIN_TARGETS)
@ -2448,6 +2481,7 @@ AC_MSG_RESULT([
User configuration file : $userconf
OpenGL dynamic lib : $gl_driver
libWildMidi Support : $HAVE_WILDMIDI
XDG support : $HAVE_XDG
])
if test -d $srcdir/.svn; then

6
nq/source/Makefile.am
View file

@ -33,6 +33,12 @@ AUTOMAKE_OPTIONS= foreign
INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/nq/include
SDL_LIBS = @SDL_LIBS@
# Desktop files
if HAVE_XDG
desktopdir=$(datarootdir)/applications
desktop_DATA= @NQ_DESKTOP_DATA@
endif
bin_PROGRAMS= @NQ_TARGETS@
EXTRA_PROGRAMS= nq-fbdev nq-glx nq-mgl nq-sdl nq-sdl32 nq-sgl nq-svga nq-3dfx \

18
nq/source/quakeforge-nq-glx.desktop Normal file
View file

@ -0,0 +1,18 @@
[Desktop Entry]
Version=1.0
Type=Application
Name=QuakeForge (GLX)
GenericName=Quake (GLX)
Comment=A first person shooter game
Comment[fr]=Un jeu de tir subjectif
Comment[it]=Sparatutto in prima persona
Icon=quake
Categories=Game;ActionGame;
Exec=nq-glx
TryExec=nq-glx
Terminal=false
StartupNotify=false

18
nq/source/quakeforge-nq-sdl.desktop Normal file
View file

@ -0,0 +1,18 @@
[Desktop Entry]
Version=1.0
Type=Application
Name=QuakeForge (SDL)
GenericName=Quake (SDL)
Comment=A first person shooter game
Comment[fr]=Un jeu de tir subjectif
Comment[it]=Sparatutto in prima persona
Icon=quake
Categories=SDL;Game;ActionGame;
Exec=nq-sdl
TryExec=nq-sdl
Terminal=false
StartupNotify=false

18
nq/source/quakeforge-nq-sdl32.desktop Normal file
View file

@ -0,0 +1,18 @@
[Desktop Entry]
Version=1.0
Type=Application
Name=QuakeForge (SDL32)
GenericName=Quake (SDL32)
Comment=A first person shooter game
Comment[fr]=Un jeu de tir subjectif
Comment[it]=Sparatutto in prima persona
Icon=quake
Categories=SDL;Game;ActionGame;
Exec=nq-sdl32
TryExec=nq-sdl32
Terminal=false
StartupNotify=false

18
nq/source/quakeforge-nq-sgl.desktop Normal file
View file

@ -0,0 +1,18 @@
[Desktop Entry]
Version=1.0
Type=Application
Name=QuakeForge (SDL GL)
GenericName=Quake (SDL GL)
Comment=A first person shooter game
Comment[fr]=Un jeu de tir subjectif
Comment[it]=Sparatutto in prima persona
Icon=quake
Categories=SDL;Game;ActionGame;
Exec=nq-sgl
TryExec=nq-sgl
Terminal=false
StartupNotify=false

18
nq/source/quakeforge-nq-x11.desktop Normal file
View file

@ -0,0 +1,18 @@
[Desktop Entry]
Version=1.0
Type=Application
Name=QuakeForge (X11)
GenericName=Quake (X11)
Comment=A first person shooter game
Comment[fr]=Un jeu de tir subjectif
Comment[it]=Sparatutto in prima persona
Icon=quake
Categories=Game;ActionGame;
Exec=nq-x11
TryExec=nq-x11
Terminal=false
StartupNotify=false

6
qw/source/Makefile.am
View file

@ -33,6 +33,12 @@ AUTOMAKE_OPTIONS= foreign
INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/qw/include
SDL_LIBS = @SDL_LIBS@
# Desktop files
if HAVE_XDG
desktopdir=$(datarootdir)/applications
desktop_DATA= @QW_DESKTOP_DATA@
endif
bin_PROGRAMS= @QW_TARGETS@
EXTRA_PROGRAMS= qw-client-fbdev qw-client-glx qw-client-mgl qw-client-sdl \

18
qw/source/quakeforge-qw-glx.desktop Normal file
View file

@ -0,0 +1,18 @@
[Desktop Entry]
Version=1.0
Type=Application
Name=QuakeForge QuakeWorld (GLX)
GenericName=QuakeWorld (GLX)
Comment=A first person shooter game
Comment[fr]=Un jeu de tir subjectif
Comment[it]=Sparatutto in prima persona
Icon=quake
Categories=Game;ActionGame;
Exec=qw-client-glx
TryExec=qw-client-glx
Terminal=false
StartupNotify=false

18
qw/source/quakeforge-qw-sdl.desktop Normal file
View file

@ -0,0 +1,18 @@
[Desktop Entry]
Version=1.0
Type=Application
Name=QuakeForge QuakeWorld (SDL)
GenericName=QuakeWorld (SDL)
Comment=A first person shooter game
Comment[fr]=Un jeu de tir subjectif
Comment[it]=Sparatutto in prima persona
Icon=quake
Categories=SDL;Game;ActionGame;
Exec=qw-client-sdl
TryExec=qw-client-sdl
Terminal=false
StartupNotify=false

18
qw/source/quakeforge-qw-sdl32.desktop Normal file
View file

@ -0,0 +1,18 @@
[Desktop Entry]
Version=1.0
Type=Application
Name=QuakeForge QuakeWorld (SDL32)
GenericName=QuakeWorld (SDL32)
Comment=A first person shooter game
Comment[fr]=Un jeu de tir subjectif
Comment[it]=Sparatutto in prima persona
Icon=quake
Categories=SDL;Game;ActionGame;
Exec=qw-client-sdl32
TryExec=qw-client-sdl32
Terminal=false
StartupNotify=false

18
qw/source/quakeforge-qw-sgl.desktop Normal file
View file

@ -0,0 +1,18 @@
[Desktop Entry]
Version=1.0
Type=Application
Name=QuakeForge QuakeWorld (SDL GL)
GenericName=QuakeWorld (SDL GL)
Comment=A first person shooter game
Comment[fr]=Un jeu de tir subjectif
Comment[it]=Sparatutto in prima persona
Icon=quake
Categories=SDL;Game;ActionGame;
Exec=qw-client-sgl
TryExec=qw-client-sgl
Terminal=false
StartupNotify=false

18
qw/source/quakeforge-qw-x11.desktop Normal file
View file

@ -0,0 +1,18 @@
[Desktop Entry]
Version=1.0
Type=Application
Name=QuakeForge QuakeWorld (X11)
GenericName=QuakeWorld (X11)
Comment=A first person shooter game
Comment[fr]=Un jeu de tir subjectif
Comment[it]=Sparatutto in prima persona
Icon=quake
Categories=Game;ActionGame;
Exec=qw-client-x11
TryExec=qw-client-x11
Terminal=false
StartupNotify=false