qf
/
newtree
mirror of https://git.code.sf.net/p/quake/newtree
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

glx, sdl and sgl now all compile on my system (at work), but sgl doesn't link

This commit is contained in:
Bill Currie 2000-10-26 16:29:45 +00:00
parent 619d9396cc
commit 217f59e1ed
4 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.in
View File

@ -410,6 +410,7 @@ if test "x$HAVE_GLX" != xno; then
AC_DEFINE(HAVE_GL_COLOR_INDEX8_EXT) AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
)
AC_CHECK_HEADERS(GL/glext.h)
fi
CPPFLAGS="$save_CPPFLAGS"

13
source/vid_common_gl.c
View File

@ -31,7 +31,9 @@
#endif
#include <GL/gl.h>
#ifdef HAVE_GL_GLEXT_H
#include <GL/glext.h>
#endif
#include <string.h>
@ -46,12 +48,12 @@
# endif
#endif
#include "quakefs.h"
#include "input.h"
#include "sbar.h"
#include "glquake.h"
#include "console.h"
#include "glquake.h"
#include "input.h"
#include "qargs.h"
#include "quakefs.h"
#include "sbar.h"
#define WARP_WIDTH 320
#define WARP_HEIGHT 200
@ -350,8 +352,7 @@ Shared_Init8bitPalette()
#ifdef HAVE_TDFXGL
load_texture(GL_SHARED_TEXTURE_PALETTE_EXT, GL_RGB, 256, GL_RGB, GL_UNSIGNED_BYTE, (void *) thePalette);
#endif
}
else
} else
glColorTable(GL_SHARED_TEXTURE_PALETTE_EXT, GL_RGB, 256, GL_RGB, GL_UNSIGNED_BYTE, (void *) thePalette);
}
#endif

13
source/vid_sdl.c
View File

@ -30,21 +30,18 @@
#include "config.h"
#endif
#ifdef HAVE_STRING_H
#include <string.h>
#endif
#include <SDL.h>
#include "client.h"
#include "console.h"
#include "cvar.h"
#include "draw.h"
#include "d_local.h"
#include "input.h"
#include "keys.h"
#include "menu.h"
#include "sys.h"
#include "qargs.h"
#include "qendian.h"
#include "quakedef.h"
#include "sys.h"
#include "va.h"
#include "vid.h"
// static float oldin_grab = 0;

20
source/vid_sgl.c
View File

@ -26,9 +26,21 @@
$Id$
*/
#include "vid_common.h"
#include "va.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifdef HAVE_STRING_H
#include <string.h>
#endif
#include <sys/signal.h>
#include <SDL.h>
#include "console.h"
#include "qargs.h"
#include "qendian.h"
#include "quakedef.h"
#include "sys.h"
#include "va.h"
#include "glquake.h"
#define WARP_WIDTH 320
@ -105,7 +117,6 @@ VID_Init (unsigned char *palette)
{
Uint32 flags = SDL_OPENGL;
int i;
char gldir[MAX_OSPATH];
VID_GetWindowSize (640, 480);
@ -177,9 +188,6 @@ VID_Init (unsigned char *palette)
GL_Init();
snprintf(gldir, sizeof(gldir), "%s/glquake", com_gamedir);
Sys_mkdir (gldir);
VID_SetPalette (palette);
// Check for 3DFX Extensions and initialize them.