TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

change d2x-ogl to d2x-gl, other packaging stuff

Browse source
This commit is contained in:
Bradley Bell 2002-07-17 01:03:02 +00:00
parent 669006edaa
commit 5bffdf7453
11 changed files with 59 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile.am
View file

@ -4,7 +4,7 @@ EXTRA_SUBDIRS = include tools unused debian rpm
bin_PROGRAMS = @TARGETS@
EXTRA_PROGRAMS = d2x d2x-sdl d2x-ogl d2x-svga d2x-ggi
EXTRA_PROGRAMS = d2x d2x-sdl d2x-gl d2x-svga d2x-ggi
CCLD = ${CC}
LDFLAGS = -export-dynamic
@ -22,7 +22,7 @@ endif
d2x_SOURCES =
d2x_sdl_SOURCES =
d2x_ogl_SOURCES =
d2x_gl_SOURCES =
d2x_svga_SOURCES =
d2x_ggi_SOURCES =
@ -37,7 +37,7 @@ endif
else
d2x_sdl_LDADD = ${d2x_LDADD} -lm -ldl -lpthread
endif
d2x_ogl_LDADD = ${d2x_sdl_LDADD} ${OGL_LIBS}
d2x_gl_LDADD = ${d2x_sdl_LDADD} ${OGL_LIBS}
d2x_svga_LDADD = ${d2x_sdl_LDADD} ${SVGA_LIBS}
d2x_ggi_LDADD = ${d2x_sdl_LDADD} ${GGI_LIBS}
@ -58,4 +58,4 @@ ChangeLog \
djgpp.bat djgpp.sh \
autogen.sh cygconf \
cvshowto.txt readme.txt license.txt installation.txt mingw32.txt compilerdefs.txt \
d2x-sdl.sh d2x-ogl.sh
d2x-sdl.sh d2x-gl.sh

2
configure.ac
View file

@ -170,7 +170,7 @@ else
)
done
AC_DEFINE(OGL,,[Define if you want an OpenGL build])
TARGETS=d2x-ogl
TARGETS=d2x-gl
D2X_ARCH_SUBDIRS="ogl ${D2X_ARCH_SUBDIRS}"
fi
AC_SUBST(OGL_LIBS)

4
debian/control vendored
View file

@ -5,14 +5,16 @@ Maintainer: Bradley Bell <bradleyb@u.washington.edu>
Build-Depends: debhelper (>> 3.0.0), libsdl-dev, nasm, libgl-dev
Standards-Version: 3.5.0
Package: d2x
Package: d2x-sdl
Architecture: any
Depends: ${shlibs:Depends}
Provides: d2x
Description: Descent II
Descent II
Package: d2x-gl
Architecture: any
Depends: ${shlibs:Depends}
Provides: d2x
Description: Descent II, GL-accelerated
Descent II, GL-accelerated

31
debian/copyright vendored
View file

@ -1,10 +1,33 @@
This package was debianized by Bradley Bell <btb@debian.org> on
This package was debianized by Bradley Bell <bradleyb@u.washington.edu> on
Tue, 5 Feb 2002 22:16:01 -0800.
It was downloaded from <fill in ftp site>
It was downloaded from <http://shelob.classrooms.washington.edu/d2x/
Upstream Author(s): <put author(s) name and email here>
Upstream Author: Bradley Bell <bradleyb@u.washington.edu>
Copyright:
<Must follow here>
Original Descent 2 code license:
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A
ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS
IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS
SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE
FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE
CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS
AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE.
COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
We make no warranties as to the usability or correctness of this code.
Additional restrictions:
Any executable created using files or code taken from this source tree
MUST be open source. By using this source, you are agreeing to this
term, in the interest of the descent and descent programming
communities. The only exception is if the writer of the original
source gives explicit permission for the code to be used otherwise.
Portions of d2x code are taken from the d1x project. This code is
covered by the d1x license, in the file license.txt

2
debian/d2x-gl.files vendored
View file

@ -1 +1 @@
/usr/games/d2x-ogl
/usr/games/d2x-gl

2
debian/d2x-gl.menu vendored
View file

@ -1,2 +1,2 @@
?package(d2x-gl):needs=X11 section=Games/Arcade\
title="d2x-gl" command="/usr/games/d2x-ogl"
title="d2x-gl" command="/usr/games/d2x-gl"

0
debian/d2x.files → debian/d2x-sdl.files vendored
View file

2
debian/d2x-sdl.menu vendored Normal file
View file

@ -0,0 +1,2 @@
?package(d2x):needs=X11 section=Games/Arcade\
title="d2x-sdl" command="/usr/games/d2x-sdl"

2
debian/d2x.menu vendored
View file

@ -1,2 +0,0 @@
?package(d2x):needs=X11 section=Games/Arcade\
title="d2x" command="/usr/games/d2x-sdl"

20
debian/rules vendored
View file

@ -12,8 +12,8 @@ configure: configure-stamp configure-gl-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
mkdir -p d2x-sdl
cd d2x-sdl && ../configure --disable-debug --enable-release \
mkdir -p build_d2x-sdl
cd build_d2x-sdl && ../configure --disable-debug --enable-release \
--prefix=/usr --bindir=\$${prefix}/games
touch configure-stamp
@ -21,8 +21,8 @@ configure-stamp:
configure-gl-stamp:
dh_testdir
# Add here commands to configure the package.
mkdir -p d2x-ogl
cd d2x-ogl && ../configure --disable-debug --enable-release --with-opengl \
mkdir -p build_d2x-gl
cd build_d2x-gl && ../configure --disable-debug --enable-release --with-opengl \
--prefix=/usr --bindir=\$${prefix}/games
touch configure-gl-stamp
@ -33,7 +33,7 @@ build-stamp: configure-stamp
dh_testdir
# Add here commands to compile the package.
cd d2x-sdl && $(MAKE)
cd build_d2x-sdl && $(MAKE)
touch build-stamp
@ -41,7 +41,7 @@ build-gl-stamp: configure-gl-stamp
dh_testdir
# Add here commands to compile the package.
cd d2x-ogl && $(MAKE)
cd build_d2x-gl && $(MAKE)
touch build-stamp
@ -51,7 +51,7 @@ clean:
rm -f build-stamp configure-stamp
# Add here commands to clean up after the build process.
rm -rf d2x-sdl d2x-ogl
rm -rf build_d2x-sdl build_d2x-gl
dh_clean
@ -62,8 +62,8 @@ install: build
dh_installdirs
# Add here commands to install the package into debian/d2x.
cd d2x-sdl && $(MAKE) install DESTDIR=$(CURDIR)/debian/d2x
cd d2x-ogl && $(MAKE) install DESTDIR=$(CURDIR)/debian/d2x-gl
cd build_d2x-sdl && $(MAKE) install DESTDIR=$(CURDIR)/debian/d2x-sdl
cd build_d2x-gl && $(MAKE) install DESTDIR=$(CURDIR)/debian/d2x-gl
# Build architecture-independent files here.
@ -75,7 +75,7 @@ binary-arch: build install
dh_testdir
dh_testroot
# dh_installdebconf
dh_installdocs NEWS README readme.txt
dh_installdocs NEWS README readme.txt license.txt
dh_installexamples
dh_installmenu
# dh_installlogrotate

20
rpm/d2x.spec.in
View file

@ -41,13 +41,13 @@ of Descent 2 Version 1.2 installed in /usr/share/games/descent2.
This version uses SDL for Audio, Input/Output and graphics rendering.
%package -n d2x-ogl
%package -n d2x-gl
Group: Contrib/Games
Summary: Descent 2 Version 1.2 for Linux, OpenGL version.
Provides: d2x-ogl
Provides: d2x-gl
Requires: d2x
%description -n d2x-ogl
%description -n d2x-gl
This is the port of Descent 2 Version 1.2, the famous 3D game for PC.
D2X is based on source code that was released the 14 December 1999 by
@ -68,7 +68,7 @@ rendering.
%configure --with-sharepath=/usr/share/games/descent2 --disable-debug
make
mv d2x-sdl d2x-sdl.real
# d2x-ogl
# d2x-gl
make clean
rm -f config.cache
# Tell configure where to find libGLU (nonstandard location).
@ -77,16 +77,16 @@ export LDFLAGS="${LDFLAGS} -L/usr/X11R6/lib"
--disable-debug
# Tell make where to link libGLU (nonstandard location).
make LDFLAGS="${LDFLAGS} -L /usr/X11R6/lib"
mv d2x-ogl d2x-ogl.real
mv d2x-gl d2x-gl.real
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/usr/games/
mkdir -p $RPM_BUILD_ROOT/usr/share/games/descent2/missions/
install -m 755 d2x-sdl.sh $RPM_BUILD_ROOT/usr/games/d2x-sdl
install -m 755 d2x-ogl.sh $RPM_BUILD_ROOT/usr/games/d2x-ogl
install -m 755 d2x-gl.sh $RPM_BUILD_ROOT/usr/games/d2x-gl
install d2x-sdl.real $RPM_BUILD_ROOT/usr/games/
install d2x-ogl.real $RPM_BUILD_ROOT/usr/games/
install d2x-gl.real $RPM_BUILD_ROOT/usr/games/
%clean
rm -rf $RPM_BUILD_ROOT
@ -104,10 +104,10 @@ rm -rf $RPM_BUILD_ROOT
/usr/games/d2x-sdl
/usr/games/d2x-sdl.real
%files -n d2x-ogl
%files -n d2x-gl
%defattr(-,root,root)
/usr/games/d2x-ogl
/usr/games/d2x-ogl.real
/usr/games/d2x-gl
/usr/games/d2x-gl.real
%changelog
* Tue Feb 7 2002 - Paolo Ulivi <pulivi@libero.it>