qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-03-14 04:01:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
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_DEFINE(HAVE_GL_COLOR_INDEX8_EXT) AC_MSG_RESULT(yes),
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
) )
AC_CHECK_HEADERS(GL/glext.h)
fi fi
CPPFLAGS="$save_CPPFLAGS" CPPFLAGS="$save_CPPFLAGS"

13
source/vid_common_gl.c
View file

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

13
source/vid_sdl.c
View file

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

20
source/vid_sgl.c
View file

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