mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2025-02-16 16:51:16 +00:00
common/mdfour.c common/pr_edict.c common/pr_exec.c uquake/r_main.c:
various warning cleanups configure.in: check for XShm before enabling X
This commit is contained in:
parent
d38e0313cc
commit
61bf2de3ef
5 changed files with 10 additions and 2 deletions
|
@ -19,6 +19,8 @@
|
|||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#include <string.h> /* XoXus: needed for memset call */
|
||||
|
||||
#ifndef _UINT32_H
|
||||
#include <uint32.h>
|
||||
#endif // _UINT32_H
|
||||
|
|
|
@ -860,7 +860,9 @@ char *ED_ParseEdict (char *data, edict_t *ent)
|
|||
qboolean anglehack;
|
||||
qboolean init;
|
||||
char keyname[256];
|
||||
#ifndef QUAKEWORLD
|
||||
int n;
|
||||
#endif
|
||||
|
||||
init = false;
|
||||
|
||||
|
|
|
@ -713,9 +713,9 @@ char *PR_GetString(int num)
|
|||
|
||||
int PR_SetString(char *s)
|
||||
{
|
||||
#ifdef QUAKEWORLD /* XoXus: moved this back to include 'i' */
|
||||
int i;
|
||||
|
||||
#ifdef QUAKEWORLD
|
||||
if (s - pr_strings < 0) {
|
||||
for (i = 0; i <= num_prstr; i++)
|
||||
if (pr_strtbl[i] == s)
|
||||
|
|
|
@ -76,11 +76,13 @@ dnl Checks for working -lm
|
|||
AC_CHECK_LIB(m, pow,, AC_MSG_ERROR([math library (-lm) appears broken]))
|
||||
|
||||
dnl Checks for X11 support
|
||||
dnl (XoXus: Since vid_x.c relies on XShm being there, this now disables
|
||||
dnl the X11 video driver if -lXext can't be found)
|
||||
AC_PATH_XTRA
|
||||
if test "x$no_x" = x; then
|
||||
HAS_X11=yes
|
||||
AC_CHECK_LIB(Xext, XShmQueryExtension, [X11_SHM_LIB=-lXext],
|
||||
[X11_SHM_LIB=""], [ $X_LIBS -lX11 $X_EXTRA_LIBS ])
|
||||
[HAS_X11="no"], [ $X_LIBS -lX11 $X_EXTRA_LIBS ])
|
||||
fi
|
||||
|
||||
dnl Check for DGA support
|
||||
|
|
|
@ -114,6 +114,8 @@ float dp_time1, dp_time2, db_time1, db_time2, rw_time1, rw_time2;
|
|||
float se_time1, se_time2, de_time1, de_time2, dv_time1, dv_time2;
|
||||
|
||||
void R_MarkLeaves (void);
|
||||
void R_InitParticles (void);
|
||||
void R_DrawParticles (void);
|
||||
|
||||
cvar_t r_draworder = {"r_draworder","0"};
|
||||
cvar_t r_speeds = {"r_speeds","0"};
|
||||
|
|
Loading…
Reference in a new issue