01726beb98
on amd64 (and likely other 64-bit architectures): - Prototype for `void *qwglGetProcAddress(char *symbol)' was guarded by #ifdef __linux__; this was not a problem on i386, where sizeof(void *) /actual return type/ == sizeof(int) /assumed return type of undeclared function/. On amd64, returned pointer would sometimes get truncated, leading to a program's crash. Mend this by turning `#ifdef __linux__' condition essentially into `#ifndef _WIN32' - Software renderer was typedef'ing PIXEL24 as `unsigned long'; fix it by using `unsigned int' type instead - Remove `-s' from OPTIMIZED_CFLAGS: stripping is taken care of during installation (subject to WITH_DEBUG); also remove optimization flag `-fexpensive-optimizations' as it is not being supported by Clang - While here, fix `version' console command to report correct operating system and architecture names - Employ options helper target to install documentation; add more useful changelogs and drop `quake2.3dfxgl' file (meaningless these days)
22 lines
689 B
C
22 lines
689 B
C
--- src/ref_candygl/qgl.h.orig 2002-06-17 20:03:07 UTC
|
|
+++ src/ref_candygl/qgl.h
|
|
@@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suit
|
|
|
|
#include <GL/gl.h>
|
|
|
|
-#ifdef __linux__
|
|
+#ifndef _WIN32
|
|
//#include <GL/fxmesa.h>
|
|
#include <GL/glx.h>
|
|
#endif
|
|
@@ -428,9 +428,7 @@ extern BOOL ( WINAPI * qwglSwapIntervalE
|
|
extern BOOL ( WINAPI * qwglGetDeviceGammaRampEXT ) ( unsigned char *pRed, unsigned char *pGreen, unsigned char *pBlue );
|
|
extern BOOL ( WINAPI * qwglSetDeviceGammaRampEXT ) ( const unsigned char *pRed, const unsigned char *pGreen, const unsigned char *pBlue );
|
|
|
|
-#endif
|
|
-
|
|
-#ifdef __linux__
|
|
+#else
|
|
|
|
// local function in dll
|
|
extern void *qwglGetProcAddress(char *symbol);
|