chacha/glide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

1.) Added a dependence to h5/glide3/src/makefile.autoconf.am, so that

Browse Source 
gthread.lo is made for fxgasm even though it is not used.
    Otherwise, everything has to be compiled twice.
2.) Added lots of .cvsignore files, so that cvs doesn't complain that
    it doesn't know about makefile.autoconf.in.
3.) Remove libtool, since it is autogenerated.
4.) Update the binary files in h5/glide3/tests.  The repository files
    were corrupted.
5.) Hook the texture utility library texus2 in as an option.  This is
    required for compressed textures.  The default is the old texture
    library.
6.) Implemented a texus2 function which sets an error handler.
This commit is contained in:
billwhite
2000-08-07 15:24:44 +00:00
parent f195a10af1
commit 8bd410fc16
45 changed files with 119 additions and 4255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
glide3x/.cvsignore Normal file
View File

@@ -0,0 +1,3 @@
makefile.autoconf.in
aclocal.m4
configure

5
glide3x/ChangeLog
View File

@@ -1,3 +1,8 @@
2000-08-02 Bill White <bill.white@griggsinst.com>
* Added the swlibs/texus2 directory, in support of
compressed textures.
2000-08-01 Bill White <bill.white@griggsinst.com>
* swlibs/include/makefile.autoconf.am:

4
glide3x/INSTALL
View File

@@ -71,6 +71,10 @@ However, there are some small wrinkles.
h3 for DRI. To build h3 stand alone,
use --disable-fx-dri-build.
--enable-amd3d Build with 3DNow instructions.
--enable-fx-texus=library Choose which texture manipulation
library to use. The default value,
texus, is the only one which is
currently functional.
4.) There is a script, build.3dfx, which is installed by the
configure script at the root of every build directory. It
is essentially the single line:

16
glide3x/chores.3dfx
View File

@@ -68,6 +68,11 @@ while [ ! -z "$1" ] && [ "$DONE" != YES ] ; do
echo ' Note that you need to put local macros'
echo ' in acinclude.m4, not aclocal.m4. The'
echo ' former is included in the latter.'
echo ' --debug-build Add configuration option for a'
echo ' debug build.'
echo ' --texus2 Add configuration option to use'
echo ' the texus2 library. (Do not use this'
echo ' unless you know what you are doing.)'
echo ' --generate: Generate configure script and'
echo ' makefile.autoconf.in files.'
echo ' This is essentially just:'
@@ -95,18 +100,25 @@ while [ ! -z "$1" ] && [ "$DONE" != YES ] ; do
echo ''
exit 100
;;
--debug-build)
CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --enable-fx-debug"
shift
;;
--texus2)
CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --enable-fx-texlib=texus2"
shift
;;
--generate)
DO_GENERATE=YES
shift
;;
--configure)
DO_CONFIGURE=YES
CONFIGURE_OPTIONS=""
shift
;;
--configure=*)
DO_CONFIGURE=YES
CONFIGURE_OPTIONS=`echo $1 | sed s/--configure=//`
CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS `echo $1 | sed s/--configure=//`"
shift
;;
--build-dir*=*)

25
glide3x/configure.in
View File

@@ -79,7 +79,7 @@ AM_CONDITIONAL(HAL_HW, test "$FX_GLIDE_HW"=cvg && test ! -z "$HAL_HW")
#
AC_ARG_ENABLE([fx-debug],
[dnl
--enable-fx-debug Enable a debugging glide build [default=yes]],
--enable-fx-debug Enable a debugging glide build [default=no]],
[case ${enableval} in
true|yes)
GLIDE_DEBUG=true
@@ -90,7 +90,7 @@ AC_ARG_ENABLE([fx-debug],
*)
AC_MSG_ERROR([Illegal value (${enableval}) for --enable-fx-debug])
;;
esac],[GLIDE_DEBUG=true])
esac],[GLIDE_DEBUG=false])
AM_CONDITIONAL(GLIDE_DEBUG,test x$GLIDE_DEBUG = xtrue)
AC_SUBST(GLIDE_DEBUG)
#
@@ -112,6 +112,24 @@ AC_ARG_ENABLE([amd3d],
esac],[enable_amd3d=false])
AM_CONDITIONAL(GL_AMD3D, test x$enable_amd3d = xtrue)
#
# --enable-fx-texus2 enables new texus library.
#
AC_ARG_ENABLE([fx-texlib],
[dnl
--enable-fx-tex=dir Enable enhanced texture utilities library
texus - original library
texus2 - library for compressed textures
[default=texus]],
[case ${enableval} in
texus|texus2)
TEXTURE_UTILITIES_DIR=${enableval}
;;
*)
AC_MSG_ERROR([Illegal value (${enableval}) for --enable-fx-texus])
;;
esac],[TEXTURE_UTILITIES_DIR=texus])
AC_SUBST(TEXTURE_UTILITIES_DIR)
#
# These are conditional variables whose value is set by
# one of the other enable macros.
#
@@ -247,6 +265,9 @@ AC_OUTPUT(build.3dfx
swlibs/newpci/pcilib/makefile.autoconf:swlibs/newpci/pcilib/makefile.autoconf.in:swlibs/include/make/makefile.autoconf.bottom
swlibs/texus/makefile.autoconf:swlibs/texus/makefile.autoconf.in:swlibs/include/make/makefile.autoconf.bottom
swlibs/texus/lib/makefile.autoconf:swlibs/texus/lib/makefile.autoconf.in:swlibs/include/make/makefile.autoconf.bottom
swlibs/texus2/makefile.autoconf:swlibs/texus2/makefile.autoconf.in:swlibs/include/make/makefile.autoconf.bottom
swlibs/texus2/lib/makefile.autoconf:swlibs/texus2/lib/makefile.autoconf.in:swlibs/include/make/makefile.autoconf.bottom
swlibs/texus2/cmd/makefile.autoconf:swlibs/texus2/cmd/makefile.autoconf.in:swlibs/include/make/makefile.autoconf.bottom
)
AC_OUTPUT_COMMANDS([chmod +x build.3dfx])

1
glide3x/cvg/.cvsignore Normal file
View File

@@ -0,0 +1 @@
makefile.autoconf.in

1
glide3x/cvg/glide3/.cvsignore Normal file
View File

@@ -0,0 +1 @@
makefile.autoconf.in

1
glide3x/cvg/glide3/src/.cvsignore Normal file
View File

@@ -0,0 +1 @@
makefile.autoconf.in

1
glide3x/cvg/incsrc/.cvsignore Normal file
View File

@@ -0,0 +1 @@
makefile.autoconf.in

1
glide3x/cvg/init/.cvsignore Normal file
View File

@@ -0,0 +1 @@
makefile.autoconf.in

1
glide3x/h3/.cvsignore Normal file
View File

@@ -0,0 +1 @@
makefile.autoconf.in

1
glide3x/h3/glide3/.cvsignore Normal file
View File

@@ -0,0 +1 @@
makefile.autoconf.in

1
glide3x/h3/glide3/src/.cvsignore Normal file
View File

@@ -0,0 +1 @@
makefile.autoconf.in

1
glide3x/h3/incsrc/.cvsignore Normal file
View File

@@ -0,0 +1 @@
makefile.autoconf.in

1
glide3x/h3/minihwc/.cvsignore Normal file
View File

@@ -0,0 +1 @@
makefile.autoconf.in

1
glide3x/h5/.cvsignore Normal file
View File

@@ -0,0 +1 @@
makefile.autoconf.in

2
glide3x/h5/glide3/.cvsignore Normal file
View File

@@ -0,0 +1,2 @@
makefile.autoconf.in
conform

1
glide3x/h5/glide3/src/.cvsignore Normal file
View File

@@ -0,0 +1 @@
makefile.autoconf.in

1
glide3x/h5/glide3/src/makefile.autoconf.am
View File

@@ -221,6 +221,7 @@ noinst_HEADERS = fxcmd.h fxsplash.h \
qmodes.h tv.h \
fxgasm.h fxinline.h
fxgasm_SOURCES = fxgasm.c gthread.c
fxgasm_DEPENDENCIES = gthread.lo
lib_LTLIBRARIES = libglide3x.la
libglide3x_la_SOURCES = fxinline.h fxgasm.h \

2
glide3x/h5/glide3/tests/.cvsignore Normal file
View File

@@ -0,0 +1,2 @@
gsurf
makefile.autoconf.in

BIN
glide3x/h5/glide3/tests/alpha.3df
View File

Binary file not shown.

BIN
glide3x/h5/glide3/tests/decal1.3df
View File

Binary file not shown.

BIN
glide3x/h5/glide3/tests/lava.3df
View File

Binary file not shown.

BIN
glide3x/h5/glide3/tests/matt1.3df
View File

Binary file not shown.

BIN
glide3x/h5/glide3/tests/miro.3df
View File

Binary file not shown.

BIN
glide3x/h5/glide3/tests/t256x32.3df
View File

Binary file not shown.

BIN
glide3x/h5/glide3/tests/t512x32.3df
View File

Binary file not shown.

1
glide3x/h5/incsrc/.cvsignore Normal file
View File

@@ -0,0 +1 @@
makefile.autoconf.in

1
glide3x/h5/minihwc/.cvsignore Normal file
View File

@@ -0,0 +1 @@
makefile.autoconf.in

4235
glide3x/libtool
View File

File diff suppressed because it is too large Load Diff

1
swlibs/.cvsignore Normal file
View File

@@ -0,0 +1 @@
makefile.autoconf.in

1
swlibs/fxmisc/.cvsignore Normal file
View File

@@ -0,0 +1 @@
makefile.autoconf.in

2
swlibs/include/config.h.in
View File

@@ -90,3 +90,5 @@
/* Version number of package */
#undef VERSION
/* Configure in texture display in texus2 */
#undef TEXTURE_DISPLAY

9
swlibs/include/make/makefile.autoconf.bottom
View File

@@ -59,7 +59,12 @@ GCFLAGS = $(GLIDE_DEBUG_GCFLAGS)
#
# Global DEFS
#
GDEFS=-DENDB -DX11 $(GLIDE_DEBUG_GDEFS) -Wall
# This variable may require -DENDB. The original Linux build
# used it, but the Windows build didn't. It seems to mean
# Big Endian, which is not the case for the x86. It is only
# used in texus2 as far as I can see.
#
GDEFS=-DX11 $(GLIDE_DEBUG_GDEFS) -Wall
#
# Global INCLUDES
#
@@ -88,7 +93,7 @@ GINCLUDES = $(CVG_VINCLUDES) $(H3_VINCLUDES) $(H5_VINCLUDES) \
-I$(top_srcdir)/swlibs/fxmemmap \
-I$(top_srcdir)/swlibs/fxmisc \
-I$(top_srcdir)/swlibs/newpci/pcilib \
-I$(top_srcdir)/swlibs/texus/lib
-I$(top_srcdir)/swlibs/@TEXTURE_UTILITIES_DIR@/lib
########################################################################
#

2
swlibs/makefile.autoconf.am
View File

@@ -20,4 +20,4 @@
## $Revision$
## $Date$
##
SUBDIRS=fxmisc newpci texus
SUBDIRS=fxmisc newpci @TEXTURE_UTILITIES_DIR@

1
swlibs/newpci/.cvsignore Normal file
View File

@@ -0,0 +1 @@
makefile.autoconf.in

1
swlibs/newpci/pcilib/.cvsignore Normal file
View File

@@ -0,0 +1 @@
makefile.autoconf.in

1
swlibs/texus/.cvsignore Normal file
View File

@@ -0,0 +1 @@
makefile.autoconf.in

1
swlibs/texus/lib/.cvsignore Normal file
View File

@@ -0,0 +1 @@
makefile.autoconf.in

1
swlibs/texus2/.cvsignore Normal file
View File

@@ -0,0 +1 @@
makefile.autoconf.in

1
swlibs/texus2/cmd/.cvsignore Normal file
View File

@@ -0,0 +1 @@
makefile.autoconf.in

14
swlibs/texus2/cmd/makefile.autoconf.am
View File

@@ -21,18 +21,8 @@
## $Date$
##
MAGICK_DIR = @MAGICK_DIR@
X_LIB_PATH = @X_LIB_PATH@
if TEXTURE_DISPLAY
DISPLAY_LIBS = $(X_LIB_PATH) -lX11 -lXext $(MAGICK_DIR) -lMagick -ltiff -lpng
TEXTURE_DISPLAY_DEFS = -DTEXTURE_DISPLAY
endif
LDEFS = $(TEXTURE_DISPLAY_DEFS)
bin_PROGRAMS = texus
noinst_PROGRAMS = texus
texus_SOURCES = cmd.c
texus_LDADD = $(top_builddir)/swlibs/fxmisc/libfxmisc.la \
$(top_builddir)/swlibs/texus2/lib/libtexus.la \
$(DISPLAY_LIBS)
$(top_builddir)/swlibs/texus2/lib/libtexus.la

1
swlibs/texus2/lib/.cvsignore Normal file
View File

@@ -0,0 +1 @@
makefile.autoconf.in

15
swlibs/texus2/lib/texus.h
View File

@@ -283,7 +283,20 @@ void txImgQuantize( char *dst, char *src,
*/
typedef void (*TxErrorCallbackFnc_t)( const char *string, FxBool fatal );
void txErrorSetCallback( TxErrorCallbackFnc_t fnc );
/*
* Set the error call back function.
* Paramters:
* fnc: If this is non-null, set the callback
* function to this value. If this pointer,
* is null, set the callback function to
* the default value.
* old_fnc: If this pointer is non-null, fill its
* contents with the callback function before
* changing it. If this pointer is null,
* do nothing.
*/
extern void txErrorSetCallback( TxErrorCallbackFnc_t fnc,
TxErrorCallbackFnc_t *old_fnc);
/*
* TEXUS MEMORY ALLOCATION ROUTINES.

16
swlibs/texus2/lib/util.c
View File

@@ -120,6 +120,22 @@ txError(char *message)
_txErrorCallback( message, FXFALSE );
}
extern void _txDefaultErrorCallback( const char *string, FxBool fatal );
void
txErrorSetCallback( TxErrorCallbackFnc_t fnc,
TxErrorCallbackFnc_t *old_fnc)
{
if (old_fnc) {
*old_fnc = _txErrorCallback;
}
if (fnc) {
_txErrorCallback = fnc;
} else {
_txErrorCallback = _txDefaultErrorCallback;
}
}
int
txGCD(int a, int b)
{