qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-02-22 11:21:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix a couple of problems that came up in SGI

Browse source
This commit is contained in:
Bill Currie 2000-11-07 23:43:05 +00:00
parent 2f9292f3e4
commit 26c6b9618f
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
configure.in
View file

@ -951,13 +951,31 @@ if test "x$profile" = xyes; then
fi fi
fi fi
check_pipe=no
if test "x$GCC" = xyes; then if test "x$GCC" = xyes; then
dnl Check for -pipe vs -save-temps. dnl Check for -pipe vs -save-temps.
AC_MSG_CHECKING(for -pipe vs -save-temps) AC_MSG_CHECKING(for -pipe vs -save-temps)
AC_ARG_ENABLE(save-temps, AC_ARG_ENABLE(save-temps,
[ --enable-save-temps save temporay files], [ --enable-save-temps save temporay files],
AC_MSG_RESULT(-save-temps); CFLAGS="$CFLAGS -save-temps"; BUILD_TYPE="$BUILD_TYPE Save-temps", AC_MSG_RESULT(-save-temps); CFLAGS="$CFLAGS -save-temps"; BUILD_TYPE="$BUILD_TYPE Save-temps",
AC_MSG_RESULT(-pipe); CFLAGS="$CFLAGS -pipe") AC_MSG_RESULT(-pipe); check_pipe=yes)
fi
if test "x$check_pipe" = xyes; then
AC_MSG_CHECKING(whether -pipe works)
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -pipe"
pipe_ok=no
AC_TRY_COMPILE(
[],
[],
pipe_ok=yes
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
)
CFLAGS="$save_CFLAGS"
if test "x$pipe_ok" = xyes; then
CFLAGS="$CFLAGS -pipe"
fi
fi fi
dnl QuakeForge uses lots of BCPL-style (//) comments, which can cause problems dnl QuakeForge uses lots of BCPL-style (//) comments, which can cause problems

2
source/vid_common_gl.c
View file

@ -352,7 +352,7 @@ Shared_Init8bitPalette()
} }
is8bit = true; is8bit = true;
if strstr(gl_renderer, "Mesa Glide") { if (strstr(gl_renderer, "Mesa Glide") {
#ifdef HAVE_TDFXGL #ifdef HAVE_TDFXGL
load_texture(GL_SHARED_TEXTURE_PALETTE_EXT, GL_RGB, 256, GL_RGB, GL_UNSIGNED_BYTE, (void *) thePalette); load_texture(GL_SHARED_TEXTURE_PALETTE_EXT, GL_RGB, 256, GL_RGB, GL_UNSIGNED_BYTE, (void *) thePalette);
#endif #endif