qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-17 22:50:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

get -wgl working again

Browse source
This commit is contained in:
Bill Currie 2002-07-27 06:43:28 +00:00
parent 01228a8be0
commit d04eeb3ba2
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/QF/GL/funcs.h
View file

@ -46,10 +46,11 @@ extern void *libgl_handle;
qboolean GLF_Init (void); qboolean GLF_Init (void);
void *QFGL_ProcAddress (void *, const char *, qboolean); void *QFGL_ProcAddress (void *, const char *, qboolean);
extern void *(*glGetProcAddress) (const char *);
#ifdef _WIN32 #ifdef _WIN32
extern void *(WINAPI *glGetProcAddress) (const char *);
extern FARPROC (WINAPI *getProcAddress) (HINSTANCE, LPCSTR); extern FARPROC (WINAPI *getProcAddress) (HINSTANCE, LPCSTR);
#else #else
extern void *(*glGetProcAddress) (const char *);
extern void *(*getProcAddress) (void *, const char *); extern void *(*getProcAddress) (void *, const char *);
#endif #endif
extern void *QFGL_LoadLibrary (void); extern void *QFGL_LoadLibrary (void);

6
libs/video/targets/vid_sgl.c
View file

@ -70,13 +70,15 @@ int modestate;
static SDL_Surface *screen = NULL; static SDL_Surface *screen = NULL;
void * (* glGetProcAddress) (const char *symbol) = NULL; // FIXME
//# error "Cannot load libraries: %s was not configured with DSO support"
// the following is to avoid other compiler errors // the following is to avoid other compiler errors
#ifdef _WIN32 #ifdef _WIN32
void * (WINAPI *glGetProcAddress) (const char *symbol) = NULL; // FIXME
//# error "Cannot load libraries: %s was not configured with DSO support"
FARPROC (WINAPI *getProcAddress) (HINSTANCE, LPCSTR); FARPROC (WINAPI *getProcAddress) (HINSTANCE, LPCSTR);
#else #else
void * (* glGetProcAddress) (const char *symbol) = NULL; // FIXME
//# error "Cannot load libraries: %s was not configured with DSO support"
void * (* getProcAddress) (void *, const char *); void * (* getProcAddress) (void *, const char *);
#endif #endif

2
libs/video/targets/vid_wgl.c
View file

@ -141,7 +141,7 @@ void GL_Init (void);
#if defined(_WIN32) #if defined(_WIN32)
void * (* glGetProcAddress) (const char *symbol) = NULL; void * (WINAPI *glGetProcAddress) (const char *symbol) = NULL;
FARPROC (WINAPI *getProcAddress) (HINSTANCE, LPCSTR); FARPROC (WINAPI *getProcAddress) (HINSTANCE, LPCSTR);
void * void *