? configure ? qw_client/.cvsignore ? qw_server/.cvsignore Index: INSTALL =================================================================== RCS file: /cvsroot/quake/quakeforge/INSTALL,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 INSTALL --- INSTALL 1999/12/25 05:22:39 1.1.1.1 +++ INSTALL 1999/12/29 11:23:43 @@ -1,3 +1,187 @@ -rudimentary install instructions :) +Basic Installation +================== -make + These are generic installation instructions. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, a file +`config.cache' that saves the results of its tests to speed up +reconfiguring, and a file `config.log' containing compiler output +(useful mainly for debugging `configure'). + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If at some point `config.cache' +contains results you don't want to keep, you may remove or edit it. + + The file `configure.in' is used to create `configure' by a program +called `autoconf'. You only need `configure.in' if you want to change +it or regenerate `configure' using a newer version of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. If you're + using `csh' on an old version of System V, you might need to type + `sh ./configure' instead to prevent `csh' from trying to execute + `configure' itself. + + Running `configure' takes awhile. While running, it prints some + messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. You can give `configure' +initial values for variables by setting them in the environment. Using +a Bourne-compatible shell, you can do that on the command line like +this: + CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure + +Or on systems that have the `env' program, you can do it like this: + env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure + +***Note: If you have OpenGL in /usr/X11R6/{include,lib}, you will have to run +configure with: +./configure --enable-OpenGLINC=/usr/X11R6/include + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you must use a version of `make' that +supports the `VPATH' variable, such as GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + If you have to use a `make' that does not supports the `VPATH' +variable, you have to compile the package for one architecture at a time +in the source code directory. After you have installed the package for +one architecture, use `make distclean' before reconfiguring for another +architecture. + +Installation Names +================== + + By default, `make install' will install the package's files in +`/usr/local/bin', `/usr/local/man', etc. You can specify an +installation prefix other than `/usr/local' by giving `configure' the +option `--prefix=PATH'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +give `configure' the option `--exec-prefix=PATH', the package will use +PATH as the prefix for installing programs and libraries. +Documentation and other data files will still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=PATH' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Specifying the System Type +========================== + + There may be some features `configure' can not figure out +automatically, but needs to determine by the type of host the package +will run on. Usually `configure' can figure that out, but if it prints +a message saying it can not guess the host type, give it the +`--host=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name with three fields: + CPU-COMPANY-SYSTEM + +See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the host type. + + If you are building compiler tools for cross-compiling, you can also +use the `--target=TYPE' option to select the type of system they will +produce code for and the `--build=TYPE' option to select the type of +system on which you are compiling the package. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Operation Controls +================== + + `configure' recognizes the following options to control how it +operates. + +`--cache-file=FILE' + Use and save the results of the tests in FILE instead of + `./config.cache'. Set FILE to `/dev/null' to disable caching, for + debugging `configure'. + +`--help' + Print a summary of the options to `configure', and exit. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--version' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`configure' also accepts some other, not widely useful, options. + Index: common/common_quakedef.h =================================================================== RCS file: /cvsroot/quake/quakeforge/common/common_quakedef.h,v retrieving revision 1.5 diff -u -r1.5 common_quakedef.h --- common/common_quakedef.h 1999/12/28 11:39:14 1.5 +++ common/common_quakedef.h 1999/12/29 11:23:43 @@ -71,7 +71,11 @@ #include "keys.h" #include "console.h" #include "view.h" +#ifndef QUAKEWORLD #include "menu.h" +#elif !defined(SERVERONLY) +#include "menu.h" +#endif #include "crc.h" #include "cdaudio.h" Index: common/gl_vidlinuxglx.c =================================================================== RCS file: /cvsroot/quake/quakeforge/common/gl_vidlinuxglx.c,v retrieving revision 1.4 diff -u -r1.4 gl_vidlinuxglx.c --- common/gl_vidlinuxglx.c 1999/12/26 06:37:28 1.4 +++ common/gl_vidlinuxglx.c 1999/12/29 11:23:44 @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include Index: common/snd_null.c =================================================================== RCS file: /cvsroot/quake/quakeforge/common/snd_null.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 snd_null.c --- common/snd_null.c 1999/12/25 05:32:54 1.1.1.1 +++ common/snd_null.c 1999/12/29 11:23:44 @@ -22,6 +22,17 @@ #include "quakedef.h" +// ======================================================================= +// Various variables also defined in snd_dma.c +// FIXME - should be put in one place +// ======================================================================= +channel_t channels[MAX_CHANNELS]; +int total_channels; +volatile dma_t *shm = 0; +cvar_t loadas8bit = {"loadas8bit", "0"}; +int paintedtime; // sample PAIRS + + cvar_t bgmvolume = {"bgmvolume", "1", true}; cvar_t volume = {"volume", "0.7", true}; Index: common/vid_sunx.c =================================================================== RCS file: /cvsroot/quake/quakeforge/common/vid_sunx.c,v retrieving revision 1.2 diff -u -r1.2 vid_sunx.c --- common/vid_sunx.c 1999/12/25 21:50:55 1.2 +++ common/vid_sunx.c 1999/12/29 11:23:44 @@ -39,6 +39,7 @@ #include "quakedef.h" #include "d_local.h" +cvar_t _windowed_mouse = {"_windowed_mouse","0", true}; cvar_t m_filter = {"m_filter","0", true}; qboolean mouse_avail; @@ -1058,7 +1059,9 @@ while (rects) { +#if 0 printf("update: %d,%d (%d,%d)\n", rects->x, rects->y, rects->width, rects->height); +#endif if (x_visinfo->depth == 16) st2_fixup( x_framebuffer[current_framebuffer], rects->x, rects->y, rects->width, Index: qw_client/cl_main.c =================================================================== RCS file: /cvsroot/quake/quakeforge/qw_client/cl_main.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 cl_main.c --- qw_client/cl_main.c 1999/12/25 05:28:36 1.1.1.1 +++ qw_client/cl_main.c 1999/12/29 11:23:44 @@ -23,10 +23,20 @@ #include "quakedef.h" #include "winquake.h" + +#ifdef __sun__ +/* Sun's model_t in sys/model.h conflicts w/ Quake's model_t */ +#define model_t sunmodel_t +#endif + #ifdef _WIN32 #include "winsock.h" #else #include +#endif + +#ifdef __sun__ +#undef model_t #endif Index: qw_client/gl_draw.c =================================================================== RCS file: /cvsroot/quake/quakeforge/qw_client/gl_draw.c,v retrieving revision 1.2 diff -u -r1.2 gl_draw.c --- qw_client/gl_draw.c 1999/12/26 07:05:55 1.2 +++ qw_client/gl_draw.c 1999/12/29 11:23:44 @@ -747,7 +747,13 @@ } } - glTexImage2D (GL_TEXTURE_2D, 0, gl_alpha_format, 64, 64, 0, GL_RGBA, GL_UNSIGNED_BYTE, trans); + glTexImage2D (GL_TEXTURE_2D, 0, gl_alpha_format, 64, 64, 0, +#ifdef WORDS_BIGENDIAN + GL_ABGR_EXT, +#else + GL_RGBA, +#endif + GL_UNSIGNED_BYTE, trans); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); @@ -1124,7 +1130,14 @@ { if (!mipmap) { - glTexImage2D (GL_TEXTURE_2D, 0, samples, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data); + glTexImage2D (GL_TEXTURE_2D, 0, samples, scaled_width, + scaled_height, 0, +#ifdef WORDS_BIGENDIAN + GL_ABGR_EXT, +#else + GL_RGBA, +#endif + GL_UNSIGNED_BYTE, data); goto done; } memcpy (scaled, data, width*height*4); @@ -1132,7 +1145,14 @@ else GL_ResampleTexture (data, width, height, scaled, scaled_width, scaled_height); - glTexImage2D (GL_TEXTURE_2D, 0, samples, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, scaled); + glTexImage2D (GL_TEXTURE_2D, 0, samples, scaled_width, scaled_height, + 0, +#ifdef WORDS_BIGENDIAN + GL_ABGR_EXT, +#else + GL_RGBA, +#endif + GL_UNSIGNED_BYTE, scaled); if (mipmap) { int miplevel; @@ -1148,7 +1168,14 @@ if (scaled_height < 1) scaled_height = 1; miplevel++; - glTexImage2D (GL_TEXTURE_2D, miplevel, samples, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, scaled); + glTexImage2D (GL_TEXTURE_2D, miplevel, samples, + scaled_width, scaled_height, 0, +#ifdef WORDS_BIGENDIAN + GL_ABGR_EXT, +#else + GL_RGBA, +#endif + GL_UNSIGNED_BYTE, scaled); } } done: ; @@ -1214,7 +1241,10 @@ { if (!mipmap) { +// FIXME - what if this extension isn't available? +#ifdef HAVE_GL_COLOR_INDEX8_EXT glTexImage2D (GL_TEXTURE_2D, 0, GL_COLOR_INDEX8_EXT, scaled_width, scaled_height, 0, GL_COLOR_INDEX , GL_UNSIGNED_BYTE, data); +#endif goto done; } memcpy (scaled, data, width*height); @@ -1222,7 +1252,10 @@ else GL_Resample8BitTexture (data, width, height, scaled, scaled_width, scaled_height); +// FIXME - what if this extension isn't available? +#ifdef HAVE_GL_COLOR_INDEX8_EXT glTexImage2D (GL_TEXTURE_2D, 0, GL_COLOR_INDEX8_EXT, scaled_width, scaled_height, 0, GL_COLOR_INDEX, GL_UNSIGNED_BYTE, scaled); +#endif if (mipmap) { int miplevel; @@ -1238,7 +1271,10 @@ if (scaled_height < 1) scaled_height = 1; miplevel++; +// FIXME - what if this extension isn't available? +#ifdef HAVE_GL_COLOR_INDEX8_EXT glTexImage2D (GL_TEXTURE_2D, miplevel, GL_COLOR_INDEX8_EXT, scaled_width, scaled_height, 0, GL_COLOR_INDEX, GL_UNSIGNED_BYTE, scaled); +#endif } } done: ; Index: qw_client/gl_rsurf.c =================================================================== RCS file: /cvsroot/quake/quakeforge/qw_client/gl_rsurf.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 gl_rsurf.c --- qw_client/gl_rsurf.c 1999/12/25 05:29:15 1.1.1.1 +++ qw_client/gl_rsurf.c 1999/12/29 11:23:44 @@ -275,10 +275,8 @@ void DrawGLWaterPoly (glpoly_t *p); void DrawGLWaterPolyLightmap (glpoly_t *p); -#ifdef _WIN32 lpMTexFUNC qglMTexCoord2fSGIS = NULL; lpSelTexFUNC qglSelectTextureSGIS = NULL; -#endif qboolean mtexenabled = false; Index: qw_client/glquake.h =================================================================== RCS file: /cvsroot/quake/quakeforge/qw_client/glquake.h,v retrieving revision 1.4 diff -u -r1.4 glquake.h --- qw_client/glquake.h 1999/12/29 05:38:57 1.4 +++ qw_client/glquake.h 1999/12/29 11:23:44 @@ -33,17 +33,25 @@ void GL_BeginRendering (int *x, int *y, int *width, int *height); void GL_EndRendering (void); +#ifndef APIENTRY +#ifdef GLAPIENTRY +#define APIENTRY GLAPIENTRY +#else +#define APIENTRY +#endif +#endif + // Function prototypes for the Texture Object Extension routines -typedef GLboolean (GLAPIENTRY *ARETEXRESFUNCPTR)(GLsizei, const GLuint *, +typedef GLboolean (APIENTRY *ARETEXRESFUNCPTR)(GLsizei, const GLuint *, const GLboolean *); -typedef void (GLAPIENTRY *BINDTEXFUNCPTR)(GLenum, GLuint); -typedef void (GLAPIENTRY *DELTEXFUNCPTR)(GLsizei, const GLuint *); -typedef void (GLAPIENTRY *GENTEXFUNCPTR)(GLsizei, GLuint *); -typedef GLboolean (GLAPIENTRY *ISTEXFUNCPTR)(GLuint); -typedef void (GLAPIENTRY *PRIORTEXFUNCPTR)(GLsizei, const GLuint *, +typedef void (APIENTRY *BINDTEXFUNCPTR)(GLenum, GLuint); +typedef void (APIENTRY *DELTEXFUNCPTR)(GLsizei, const GLuint *); +typedef void (APIENTRY *GENTEXFUNCPTR)(GLsizei, GLuint *); +typedef GLboolean (APIENTRY *ISTEXFUNCPTR)(GLuint); +typedef void (APIENTRY *PRIORTEXFUNCPTR)(GLsizei, const GLuint *, const GLclampf *); -typedef void (GLAPIENTRY *TEXSUBIMAGEPTR)(int, int, int, int, int, int, int, int, void *); +typedef void (APIENTRY *TEXSUBIMAGEPTR)(int, int, int, int, int, int, int, int, void *); extern BINDTEXFUNCPTR bindTexFunc; extern DELTEXFUNCPTR delTexFunc; @@ -237,12 +245,10 @@ #define TEXTURE0_SGIS 0x835E #define TEXTURE1_SGIS 0x835F -#ifdef _WIN32 -typedef void (GLAPIENTRY *lpMTexFUNC) (GLenum, GLfloat, GLfloat); -typedef void (GLAPIENTRY *lpSelTexFUNC) (GLenum); +typedef void (APIENTRY *lpMTexFUNC) (GLenum, GLfloat, GLfloat); +typedef void (APIENTRY *lpSelTexFUNC) (GLenum); extern lpMTexFUNC qglMTexCoord2fSGIS; extern lpSelTexFUNC qglSelectTextureSGIS; -#endif extern qboolean gl_mtexable; Index: qw_client/sys_linux.c =================================================================== RCS file: /cvsroot/quake/quakeforge/qw_client/sys_linux.c,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 sys_linux.c --- qw_client/sys_linux.c 1999/12/25 05:30:16 1.1.1.1 +++ qw_client/sys_linux.c 1999/12/29 11:23:44 @@ -127,7 +127,7 @@ void Sys_Quit (void) { Host_Shutdown(); - fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY); + fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NDELAY); exit(0); } @@ -144,7 +144,7 @@ char string[1024]; // change stdin to non blocking - fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY); + fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NDELAY); va_start (argptr,error); vsprintf (string,error,argptr); @@ -379,7 +379,7 @@ noconinput = COM_CheckParm("-noconinput"); if (!noconinput) - fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY); + fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | O_NDELAY); if (COM_CheckParm("-nostdout")) nostdout = 1; Index: qw_common/common.c =================================================================== RCS file: /cvsroot/quake/quakeforge/qw_common/common.c,v retrieving revision 1.2 diff -u -r1.2 common.c --- qw_common/common.c 1999/12/25 19:37:15 1.2 +++ qw_common/common.c 1999/12/29 11:23:44 @@ -432,8 +432,6 @@ ============================================================================ */ -qboolean bigendien; - short (*BigShort) (short l); short (*LittleShort) (short l); int (*BigLong) (int l); @@ -1197,29 +1195,21 @@ */ void COM_Init (void) { - byte swaptest[2] = {1,0}; - -// set the byte swapping variables in a portable manner - if ( *(short *)swaptest == 1) - { - bigendien = false; - BigShort = ShortSwap; - LittleShort = ShortNoSwap; - BigLong = LongSwap; - LittleLong = LongNoSwap; - BigFloat = FloatSwap; - LittleFloat = FloatNoSwap; - } - else - { - bigendien = true; - BigShort = ShortNoSwap; - LittleShort = ShortSwap; - BigLong = LongNoSwap; - LittleLong = LongSwap; - BigFloat = FloatNoSwap; - LittleFloat = FloatSwap; - } +#ifdef WORDS_BIGENDIAN + BigShort = ShortNoSwap; + LittleShort = ShortSwap; + BigLong = LongNoSwap; + LittleLong = LongSwap; + BigFloat = FloatNoSwap; + LittleFloat = FloatSwap; +#else + BigShort = ShortSwap; + LittleShort = ShortNoSwap; + BigLong = LongSwap; + LittleLong = LongNoSwap; + BigFloat = FloatSwap; + LittleFloat = FloatNoSwap; +#endif Cvar_RegisterVariable (®istered); Cmd_AddCommand ("path", COM_Path_f); Index: qw_common/common.h =================================================================== RCS file: /cvsroot/quake/quakeforge/qw_common/common.h,v retrieving revision 1.2 diff -u -r1.2 common.h --- qw_common/common.h 1999/12/26 07:05:55 1.2 +++ qw_common/common.h 1999/12/29 11:23:44 @@ -88,8 +88,6 @@ //============================================================================ -extern qboolean bigendien; - extern short (*BigShort) (short l); extern short (*LittleShort) (short l); extern int (*BigLong) (int l); Index: qw_common/net_udp.c =================================================================== RCS file: /cvsroot/quake/quakeforge/qw_common/net_udp.c,v retrieving revision 1.2 diff -u -r1.2 net_udp.c --- qw_common/net_udp.c 1999/12/25 19:37:15 1.2 +++ qw_common/net_udp.c 1999/12/29 11:23:44 @@ -21,6 +21,10 @@ #include "quakedef.h" +#ifdef __sun__ +/* Sun's model_t in sys/model.h conflicts w/ Quake's model_t */ +#define model_t sunmodel_t +#endif #include #include #include @@ -31,12 +35,10 @@ #include #include -#if defined(sun) +#ifdef __sun__ #include -#endif - -#ifdef sun #include +#undef model_t #endif #ifdef NeXT Index: qw_server/sys_unix.c =================================================================== RCS file: /cvsroot/quake/quakeforge/qw_server/sys_unix.c,v retrieving revision 1.2 diff -u -r1.2 sys_unix.c --- qw_server/sys_unix.c 1999/12/25 19:37:15 1.2 +++ qw_server/sys_unix.c 1999/12/29 11:23:44 @@ -24,7 +24,8 @@ #include #endif -#if defined(__linux__) || defined(sun) +// FIXME: use autoconf +#if defined(unix) || defined(_AIX) #include #include #include Index: uquake/common.c =================================================================== RCS file: /cvsroot/quake/quakeforge/uquake/common.c,v retrieving revision 1.1 diff -u -r1.1 common.c --- uquake/common.c 1999/12/26 13:51:52 1.1 +++ uquake/common.c 1999/12/29 11:23:44 @@ -431,8 +431,6 @@ ============================================================================ */ -qboolean bigendien; - short (*BigShort) (short l); short (*LittleShort) (short l); int (*BigLong) (int l); @@ -1124,29 +1122,21 @@ */ void COM_Init (char *basedir) { - byte swaptest[2] = {1,0}; - -// set the byte swapping variables in a portable manner - if ( *(short *)swaptest == 1) - { - bigendien = false; - BigShort = ShortSwap; - LittleShort = ShortNoSwap; - BigLong = LongSwap; - LittleLong = LongNoSwap; - BigFloat = FloatSwap; - LittleFloat = FloatNoSwap; - } - else - { - bigendien = true; - BigShort = ShortNoSwap; - LittleShort = ShortSwap; - BigLong = LongNoSwap; - LittleLong = LongSwap; - BigFloat = FloatNoSwap; - LittleFloat = FloatSwap; - } +#ifdef WORDS_BIGENDIAN + BigShort = ShortNoSwap; + LittleShort = ShortSwap; + BigLong = LongNoSwap; + LittleLong = LongSwap; + BigFloat = FloatNoSwap; + LittleFloat = FloatSwap; +#else + BigShort = ShortSwap; + LittleShort = ShortNoSwap; + BigLong = LongSwap; + LittleLong = LongNoSwap; + BigFloat = FloatSwap; + LittleFloat = FloatNoSwap; +#endif Cvar_RegisterVariable (®istered); Cvar_RegisterVariable (&cmdline); Index: uquake/common.h =================================================================== RCS file: /cvsroot/quake/quakeforge/uquake/common.h,v retrieving revision 1.1 diff -u -r1.1 common.h --- uquake/common.h 1999/12/26 13:51:52 1.1 +++ uquake/common.h 1999/12/29 11:23:44 @@ -85,8 +85,6 @@ //============================================================================ -extern qboolean bigendien; - extern short (*BigShort) (short l); extern short (*LittleShort) (short l); extern int (*BigLong) (int l); Index: uquake/gl_draw.c =================================================================== RCS file: /cvsroot/quake/quakeforge/uquake/gl_draw.c,v retrieving revision 1.4 diff -u -r1.4 gl_draw.c --- uquake/gl_draw.c 1999/12/29 03:20:25 1.4 +++ uquake/gl_draw.c 1999/12/29 11:23:45 @@ -23,8 +23,6 @@ #include "quakedef.h" -#define GL_COLOR_INDEX8_EXT 0x80E5 - extern unsigned char d_15to8table[65536]; cvar_t gl_nobind = {"gl_nobind", "0"}; @@ -668,7 +666,13 @@ } } - glTexImage2D (GL_TEXTURE_2D, 0, gl_alpha_format, 64, 64, 0, GL_RGBA, GL_UNSIGNED_BYTE, trans); + glTexImage2D (GL_TEXTURE_2D, 0, gl_alpha_format, 64, 64, 0, +#ifdef WORDS_BIGENDIAN + GL_ABGR_EXT, +#else + GL_RGBA, +#endif + GL_UNSIGNED_BYTE, trans); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); @@ -1031,7 +1035,13 @@ { if (!mipmap) { - glTexImage2D (GL_TEXTURE_2D, 0, samples, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data); + glTexImage2D (GL_TEXTURE_2D, 0, samples, scaled_width, scaled_height, 0, +#ifdef WORDS_BIGENDIAN + GL_ABGR_EXT, +#else + GL_RGBA, +#endif + GL_UNSIGNED_BYTE, data); goto done; } memcpy (scaled, data, width*height*4); @@ -1039,7 +1049,14 @@ else GL_ResampleTexture (data, width, height, scaled, scaled_width, scaled_height); - glTexImage2D (GL_TEXTURE_2D, 0, samples, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, scaled); + glTexImage2D (GL_TEXTURE_2D, 0, samples, scaled_width, scaled_height, + 0, +#ifdef WORDS_BIGENDIAN + GL_ABGR_EXT, +#else + GL_RGBA, +#endif + GL_UNSIGNED_BYTE, scaled); if (mipmap) { int miplevel; @@ -1055,7 +1072,14 @@ if (scaled_height < 1) scaled_height = 1; miplevel++; - glTexImage2D (GL_TEXTURE_2D, miplevel, samples, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, scaled); + glTexImage2D (GL_TEXTURE_2D, miplevel, samples, + scaled_width, scaled_height, 0, +#ifdef WORDS_BIGENDIAN + GL_ABGR_EXT, +#else + GL_RGBA, +#endif + GL_UNSIGNED_BYTE, scaled); } } done: ; @@ -1121,7 +1145,12 @@ { if (!mipmap) { +// FIXME - what if this extension is available at compile but not run time? +#ifdef HAVE_GL_COLOR_INDEX8_EXT glTexImage2D (GL_TEXTURE_2D, 0, GL_COLOR_INDEX8_EXT, scaled_width, scaled_height, 0, GL_COLOR_INDEX , GL_UNSIGNED_BYTE, data); +#else + Sys_Printf("Warning: GL_COLOR_INDEX8_EXT not supported\n"); +#endif goto done; } memcpy (scaled, data, width*height); @@ -1129,7 +1158,12 @@ else GL_Resample8BitTexture (data, width, height, scaled, scaled_width, scaled_height); +// FIXME - what if this extension is available at compile but not run time? +#ifdef HAVE_GL_COLOR_INDEX8_EXT glTexImage2D (GL_TEXTURE_2D, 0, GL_COLOR_INDEX8_EXT, scaled_width, scaled_height, 0, GL_COLOR_INDEX, GL_UNSIGNED_BYTE, scaled); +#else + Sys_Printf("Warning: GL_COLOR_INDEX8_EXT not supported\n"); +#endif if (mipmap) { int miplevel; @@ -1145,7 +1179,10 @@ if (scaled_height < 1) scaled_height = 1; miplevel++; +// FIXME - what if this extension is available at compile but not run time? +#ifdef HAVE_GL_COLOR_INDEX8_EXT glTexImage2D (GL_TEXTURE_2D, miplevel, GL_COLOR_INDEX8_EXT, scaled_width, scaled_height, 0, GL_COLOR_INDEX, GL_UNSIGNED_BYTE, scaled); +#endif } } done: ; Index: uquake/menu.c =================================================================== RCS file: /cvsroot/quake/quakeforge/uquake/menu.c,v retrieving revision 1.2 diff -u -r1.2 menu.c --- uquake/menu.c 1999/12/27 17:18:40 1.2 +++ uquake/menu.c 1999/12/29 11:23:45 @@ -17,7 +17,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifdef _AIX +/* AIX's level_t in sys/types.h conflicts w/ Quake's level_t */ +#define level_t sunlevel_t +#endif #include "quakedef.h" + +#ifdef _AIX +#undef level_t +#endif #ifdef _WIN32 #include "winquake.h" Index: uquake/net_udp.c =================================================================== RCS file: /cvsroot/quake/quakeforge/uquake/net_udp.c,v retrieving revision 1.1 diff -u -r1.1 net_udp.c --- uquake/net_udp.c 1999/12/26 13:51:53 1.1 +++ uquake/net_udp.c 1999/12/29 11:23:45 @@ -20,11 +20,14 @@ // net_udp.c #include "quakedef.h" +#ifdef __sun__ +/* Sun's model_t in sys/model.h conflicts w/ Quake's model_t */ +#define model_t sunmodel_t +#endif #include #include #include -#include #include #include #include @@ -32,6 +35,12 @@ #ifdef __sun__ #include +#undef model_t +#endif + +#if defined(sgi) && defined(sa_family) +/* Get rid of problematic SGI #def */ +#undef sa_family #endif #ifdef NeXT Index: uquake/sys_sun.c =================================================================== RCS file: /cvsroot/quake/quakeforge/uquake/sys_sun.c,v retrieving revision 1.1 diff -u -r1.1 sys_sun.c --- uquake/sys_sun.c 1999/12/26 13:51:53 1.1 +++ uquake/sys_sun.c 1999/12/29 11:23:45 @@ -335,7 +335,8 @@ // unroll the simulation loop to give the video side a chance to see _vid_default_mode Host_Frame( 0.1 ); - VID_SetDefaultMode(); + // FIXME - probably should be deleted - this is just an empty function +// VID_SetDefaultMode(); oldtime = Sys_DoubleTime(); while (1)