mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2024-11-10 15:22:04 +00:00
client and server targets now have their own packages (nq and qw shared)
This commit is contained in:
Bill Currie
parent
8fc8b564ab
commit
38a9a52290
3 changed files with 206 additions and 58 deletions
|
|
@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS= foreign
|
|||
|
||||
SUBDIRS= debian doc include libs qw nq
|
||||
|
||||
EXTRA_DIST= ChangeLog RPM/build_rpm.in \
|
||||
EXTRA_DIST= ChangeLog RPM/build_rpm.in RPM/quakeforge.spec.in RPM/rpmrc \
|
||||
tools/cross/cross-configure.sh tools/cross/cross-make.sh \
|
||||
tools/cross/cross.sh \
|
||||
tools/gas2masm/Makefile tools/gas2masm/gas2masm.c \
|
||||
|
|
|
|||
|
|
@ -3,25 +3,101 @@
|
|||
%define release 1
|
||||
%define builddir $RPM_BUILD_DIR/%{name}-%{version}
|
||||
|
||||
%define HAVE_3DFX '@HAVE_3DFX@'
|
||||
%define HAVE_FBDEV '@HAVE_FBDEV@'
|
||||
%define HAVE_GLX '@HAVE_GLX@'
|
||||
%define HAVE_SDL '@HAVE_SDL@'
|
||||
%define HAVE_SGL '@HAVE_SGL@'
|
||||
%define HAVE_SVGA '@HAVE_SVGA@'
|
||||
%define HAVE_X11 '@HAVE_X@'
|
||||
|
||||
Name: %{name}
|
||||
Version: %{version}
|
||||
Release: %{release}
|
||||
Vendor: The QuakeForge Project
|
||||
Packager: The QuakeForge Project quake-devel@lists.sourceforge.net
|
||||
#URL:
|
||||
URL: http://www.quakeforge.net/
|
||||
Source: %{name}-%{version}.tar.gz
|
||||
#Patch:
|
||||
Group: Application/Generic
|
||||
Group: Amusements/Games
|
||||
Copyright: GPL
|
||||
#Icon:
|
||||
#Requires:
|
||||
BuildRoot: /var/tmp/%{name}-%{version}
|
||||
Summary: 3D game engine based on id Software's Quake engine
|
||||
Summary: QuakeForge 3D game engine
|
||||
%description
|
||||
3D game engine based on id Software's Quake engine
|
||||
@configure_input@
|
||||
Please edit quakeforge.spec.in to add several more lines of description
|
||||
here if appropriate, and to delete these instructions.
|
||||
QuakeForge is a source port of Quake and QuakeWorld, the successors to id
|
||||
Software's very popular DOOM series. Its primary development goal is to
|
||||
remain compatible with the original games released by id Software while
|
||||
adding portability and optional extensions to enhance gameplay.
|
||||
|
||||
|
||||
|
||||
|
||||
%package server
|
||||
Summary: QuakeForge 3D game engine - Server
|
||||
Group: Amusements/Games
|
||||
#Requires:
|
||||
%description server
|
||||
|
||||
%if "%{HAVE_3DFX}"=="'yes'"
|
||||
%package 3dfx
|
||||
Summary: QuakeForge 3D game engine - 3dfx client
|
||||
Group: Amusements/Games
|
||||
#Requires:
|
||||
%description 3dfx
|
||||
%endif
|
||||
|
||||
%if "%{HAVE_FBDEV}"=="'yes'"
|
||||
%package fbdev
|
||||
Summary: QuakeForge 3D game engine - fbdev client
|
||||
Group: Amusements/Games
|
||||
#Requires:
|
||||
%description fbdev
|
||||
%endif
|
||||
|
||||
%if "%{HAVE_GLX}"=="'yes'"
|
||||
%package glx
|
||||
Summary: QuakeForge 3D game engine - glx client
|
||||
Group: Amusements/Games
|
||||
#Requires:
|
||||
%description glx
|
||||
%endif
|
||||
|
||||
%if "%{HAVE_SDL}"=="'yes'"
|
||||
%package sdl
|
||||
Summary: QuakeForge 3D game engine - SDL client
|
||||
Group: Amusements/Games
|
||||
#Requires:
|
||||
%description sdl
|
||||
%endif
|
||||
|
||||
%if "%{HAVE_SGL}"=="'yes'"
|
||||
%package sgl
|
||||
Summary: QuakeForge 3D game engine - SDL-GL client
|
||||
Group: Amusements/Games
|
||||
#Requires:
|
||||
%description sgl
|
||||
%endif
|
||||
|
||||
%if "%{HAVE_SVGA}"=="'yes'"
|
||||
%package svga
|
||||
Summary: QuakeForge 3D game engine - SVGAlib client
|
||||
Group: Amusements/Games
|
||||
#Requires:
|
||||
%description svga
|
||||
%endif
|
||||
|
||||
%if "%{HAVE_X11}"=="'yes'"
|
||||
%package x11
|
||||
Summary: QuakeForge 3D game engine - X11 client
|
||||
Group: Amusements/Games
|
||||
#Requires:
|
||||
%description x11
|
||||
%endif
|
||||
|
||||
|
||||
|
||||
|
||||
%prep
|
||||
%setup -n %{name}-%{version}
|
||||
|
|
@ -34,16 +110,60 @@ make
|
|||
%install
|
||||
if [ -d $RPM_BUILD_ROOT ]; then rm -rf $RPM_BUILD_ROOT; fi
|
||||
mkdir -p $RPM_BUILD_ROOT
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_prefix}/share/games/quakeforge
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
# Build the file-list automagically :)
|
||||
cd $RPM_BUILD_ROOT
|
||||
find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/file.list.%{name}
|
||||
find . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
|
||||
find . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
rm ../file.list.%{name}
|
||||
|
||||
%files -f ../file.list.%{name}
|
||||
%doc README
|
||||
%files
|
||||
%doc COPYING INSTALL TODO doc/*
|
||||
%attr(-,root,root) %dir %{_prefix}/share/games/quakeforge
|
||||
|
||||
%if "%{HAVE_SERVER}"=="'yes'"
|
||||
%files server
|
||||
%attr(-,root,root) %{_prefix}/bin/qw-server
|
||||
#%attr(-,root,root) %{_prefix}/bin/nq-server
|
||||
%endif
|
||||
|
||||
%if "%{HAVE_3DFX}"=="'yes'"
|
||||
%files 3dfx
|
||||
%attr(-,root,root) %{_prefix}/bin/qw-client-3dfx
|
||||
%attr(-,root,root) %{_prefix}/bin/nq-3dfx
|
||||
%endif
|
||||
|
||||
%if "%{HAVE_FBDEV}"=="'yes'"
|
||||
%files fbdev
|
||||
%attr(-,root,root) %{_prefix}/bin/qw-client-fbdev
|
||||
%attr(-,root,root) %{_prefix}/bin/nq-fbdev
|
||||
%endif
|
||||
|
||||
%if "%{HAVE_GLX}"=="'yes'"
|
||||
%files glx
|
||||
%attr(-,root,root) %{_prefix}/bin/qw-client-glx
|
||||
%attr(-,root,root) %{_prefix}/bin/nq-glx
|
||||
%endif
|
||||
|
||||
%if "%{HAVE_SDL}"=="'yes'"
|
||||
%files sdl
|
||||
%attr(-,root,root) %{_prefix}/bin/qw-client-sdl
|
||||
%attr(-,root,root) %{_prefix}/bin/nq-sdl
|
||||
%endif
|
||||
|
||||
%if "%{HAVE_SGL}"=="'yes'"
|
||||
%files sgl
|
||||
%attr(-,root,root) %{_prefix}/bin/qw-client-sgl
|
||||
%attr(-,root,root) %{_prefix}/bin/nq-sgl
|
||||
%endif
|
||||
|
||||
%if "%{HAVE_SVGA}"=="'yes'"
|
||||
%files svga
|
||||
%attr(4755,root,root) %{_prefix}/bin/qw-client-svga
|
||||
%attr(4755,root,root) %{_prefix}/bin/nq-svga
|
||||
%endif
|
||||
|
||||
%if "%{HAVE_X11}"=="'yes'"
|
||||
%files x11
|
||||
%attr(-,root,root) %{_prefix}/bin/qw-client-x11
|
||||
%attr(-,root,root) %{_prefix}/bin/nq-x11
|
||||
%endif
|
||||
|
|
|
|||
112
configure.in
112
configure.in
|
|
@ -1263,19 +1263,27 @@ SND_PLUGIN_TARGETS="libsound_null.la libsound_disk.la"
|
|||
VID_TARGETS=""
|
||||
BUILD_GL=no
|
||||
BUILD_SW=no
|
||||
if test "x$HAVE_GLIDE" = xyes -a "x$HAVE_SVGA" = xyes -a "x$ENABLE_3DFX" = xyes; then
|
||||
QW_TARGETS="$QW_TARGETS qw-client-3dfx\$(EXEEXT)"
|
||||
NQ_TARGETS="$NQ_TARGETS nq-3dfx\$(EXEEXT)"
|
||||
CL_TARGETS="$CL_TARGETS 3dfx"
|
||||
VID_TARGETS="$VID_TARGETS libQFtdfx.la"
|
||||
BUILD_GL=yes
|
||||
|
||||
HAVE_3DFX=no
|
||||
HAVE_GLX=no
|
||||
if test "x$HAVE_GLIDE" = xyes -a "x$HAVE_SVGA" = xyes; then
|
||||
if test "x$ENABLE_3DFX" = xyes; then
|
||||
QW_TARGETS="$QW_TARGETS qw-client-3dfx\$(EXEEXT)"
|
||||
NQ_TARGETS="$NQ_TARGETS nq-3dfx\$(EXEEXT)"
|
||||
CL_TARGETS="$CL_TARGETS 3dfx"
|
||||
VID_TARGETS="$VID_TARGETS libQFtdfx.la"
|
||||
BUILD_GL=yes
|
||||
fi
|
||||
HAVE_3DFX=yes
|
||||
fi
|
||||
if test "x$HAVE_FBDEV" = xyes -a "x$ENABLE_FBDEV" = xyes; then
|
||||
QW_TARGETS="$QW_TARGETS qw-client-fbdev\$(EXEEXT)"
|
||||
NQ_TARGETS="$NQ_TARGETS nq-fbdev\$(EXEEXT)"
|
||||
CL_TARGETS="$CL_TARGETS FBDEV"
|
||||
VID_TARGETS="$VID_TARGETS libQFfbdev.la"
|
||||
BUILD_SW=yes
|
||||
if test "x$HAVE_FBDEV" = xyes; then
|
||||
if test "x$ENABLE_FBDEV" = xyes; then
|
||||
QW_TARGETS="$QW_TARGETS qw-client-fbdev\$(EXEEXT)"
|
||||
NQ_TARGETS="$NQ_TARGETS nq-fbdev\$(EXEEXT)"
|
||||
CL_TARGETS="$CL_TARGETS FBDEV"
|
||||
VID_TARGETS="$VID_TARGETS libQFfbdev.la"
|
||||
BUILD_SW=yes
|
||||
fi
|
||||
fi
|
||||
if test "x$HAVE_X" = xyes; then
|
||||
if test "x$ENABLE_GLX" = xyes; then
|
||||
|
|
@ -1285,20 +1293,25 @@ if test "x$HAVE_X" = xyes; then
|
|||
VID_TARGETS="$VID_TARGETS libQFglx.la"
|
||||
BUILD_GL=yes
|
||||
fi
|
||||
HAVE_GLX=yes
|
||||
fi
|
||||
if test "x$HAVE_MGL" = xyes -a "x$ENABLE_MGL" = xyes; then
|
||||
QW_TARGETS="$QW_TARGETS qw-client-mgl\$(EXEEXT)"
|
||||
NQ_TARGETS="$NQ_TARGETS nq-mgl\$(EXEEXT)"
|
||||
CL_TARGETS="$CL_TARGETS MGL"
|
||||
VID_TARGETS="$VID_TARGETS libQFwgl.la"
|
||||
BUILD_SW=yes
|
||||
if test "x$HAVE_MGL" = xyes; then
|
||||
if test "x$ENABLE_MGL" = xyes; then
|
||||
QW_TARGETS="$QW_TARGETS qw-client-mgl\$(EXEEXT)"
|
||||
NQ_TARGETS="$NQ_TARGETS nq-mgl\$(EXEEXT)"
|
||||
CL_TARGETS="$CL_TARGETS MGL"
|
||||
VID_TARGETS="$VID_TARGETS libQFwgl.la"
|
||||
BUILD_SW=yes
|
||||
fi
|
||||
fi
|
||||
if test "x$HAVE_SDL" = xyes -a "x$ENABLE_SDL" = xyes; then
|
||||
QW_TARGETS="$QW_TARGETS qw-client-sdl\$(EXEEXT)"
|
||||
NQ_TARGETS="$NQ_TARGETS nq-sdl\$(EXEEXT)"
|
||||
CL_TARGETS="$CL_TARGETS SDL"
|
||||
VID_TARGETS="$VID_TARGETS libQFsdl.la"
|
||||
BUILD_SW=yes
|
||||
if test "x$HAVE_SDL" = xyes; then
|
||||
if test "x$ENABLE_SDL" = xyes; then
|
||||
QW_TARGETS="$QW_TARGETS qw-client-sdl\$(EXEEXT)"
|
||||
NQ_TARGETS="$NQ_TARGETS nq-sdl\$(EXEEXT)"
|
||||
CL_TARGETS="$CL_TARGETS SDL"
|
||||
VID_TARGETS="$VID_TARGETS libQFsdl.la"
|
||||
BUILD_SW=yes
|
||||
fi
|
||||
fi
|
||||
if test "x$HAVE_SGL" = xyes; then
|
||||
if test "x$ENABLE_SGL" = xyes; then
|
||||
|
|
@ -1309,31 +1322,46 @@ if test "x$HAVE_SGL" = xyes; then
|
|||
BUILD_GL=yes
|
||||
fi
|
||||
fi
|
||||
if test "x$HAVE_SVGA" = xyes -a "x$ENABLE_SVGA" = xyes; then
|
||||
QW_TARGETS="$QW_TARGETS qw-client-svga\$(EXEEXT)"
|
||||
NQ_TARGETS="$NQ_TARGETS nq-svga\$(EXEEXT)"
|
||||
CL_TARGETS="$CL_TARGETS SVGAlib"
|
||||
VID_TARGETS="$VID_TARGETS libQFsvga.la"
|
||||
BUILD_SW=yes
|
||||
if test "x$HAVE_SVGA" = xyes; then
|
||||
if test "x$ENABLE_SVGA" = xyes; then
|
||||
QW_TARGETS="$QW_TARGETS qw-client-svga\$(EXEEXT)"
|
||||
NQ_TARGETS="$NQ_TARGETS nq-svga\$(EXEEXT)"
|
||||
CL_TARGETS="$CL_TARGETS SVGAlib"
|
||||
VID_TARGETS="$VID_TARGETS libQFsvga.la"
|
||||
BUILD_SW=yes
|
||||
fi
|
||||
fi
|
||||
if test "x$mingw" = xyes -a "x$ENABLE_WGL" = xyes; then
|
||||
QW_TARGETS="$QW_TARGETS qw-client-wgl\$(EXEEXT)"
|
||||
NQ_TARGETS="$NQ_TARGETS nq-wgl\$(EXEEXT)"
|
||||
CL_TARGETS="$CL_TARGETS WGL"
|
||||
VID_TARGETS="$VID_TARGETS libQFwgl.la"
|
||||
BUILD_GL=yes
|
||||
if test "x$mingw" = xyes; then
|
||||
if test "x$ENABLE_WGL" = xyes; then
|
||||
QW_TARGETS="$QW_TARGETS qw-client-wgl\$(EXEEXT)"
|
||||
NQ_TARGETS="$NQ_TARGETS nq-wgl\$(EXEEXT)"
|
||||
CL_TARGETS="$CL_TARGETS WGL"
|
||||
VID_TARGETS="$VID_TARGETS libQFwgl.la"
|
||||
BUILD_GL=yes
|
||||
fi
|
||||
fi
|
||||
if test "x$HAVE_X" = xyes -a "x$ENABLE_X11" = xyes; then
|
||||
QW_TARGETS="$QW_TARGETS qw-client-x11\$(EXEEXT)"
|
||||
NQ_TARGETS="$NQ_TARGETS nq-x11\$(EXEEXT)"
|
||||
CL_TARGETS="$CL_TARGETS X11"
|
||||
VID_TARGETS="$VID_TARGETS libQFx11.la"
|
||||
BUILD_SW=yes
|
||||
if test "x$HAVE_X" = xyes; then
|
||||
if test "x$ENABLE_X11" = xyes; then
|
||||
QW_TARGETS="$QW_TARGETS qw-client-x11\$(EXEEXT)"
|
||||
NQ_TARGETS="$NQ_TARGETS nq-x11\$(EXEEXT)"
|
||||
CL_TARGETS="$CL_TARGETS X11"
|
||||
VID_TARGETS="$VID_TARGETS libQFx11.la"
|
||||
BUILD_SW=yes
|
||||
fi
|
||||
fi
|
||||
if test "x$SV_TARGETS" = xyes; then
|
||||
QW_TARGETS="qw-server\$(EXEEXT) $QW_TARGETS"
|
||||
# NQ_TARGETS="nq-server\$(EXEEXT) $NQ_TARGETS"
|
||||
fi
|
||||
|
||||
AC_SUBST(HAVE_3DFX)
|
||||
AC_SUBST(HAVE_FBDEV)
|
||||
AC_SUBST(HAVE_GLX)
|
||||
AC_SUBST(HAVE_SDL)
|
||||
AC_SUBST(HAVE_SGL)
|
||||
AC_SUBST(HAVE_SVGA)
|
||||
AC_SUBST(HAVE_X)
|
||||
|
||||
if test -n "$CL_TARGETS"; then
|
||||
CD_TARGETS="libQFcd.la"
|
||||
SND_TARGETS="libQFsound.la"
|
||||
|
|
|
|||
Loading…
Reference in a new issue