valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Fix compilation with sdl 1.2.7

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1713
This commit is contained in:
Sjoerd van der Berg 2004-03-10 22:50:51 +00:00
parent af6c42aff4
commit 64c81ef898
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/gui/sdlmain.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: sdlmain.cpp,v 1.63 2004-03-01 18:27:03 qbix79 Exp $ */
/* $Id: sdlmain.cpp,v 1.64 2004-03-10 22:50:51 harekiet Exp $ */
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
@ -41,6 +41,8 @@
#include "support.h"
#include "debug.h"
//#define DISABLE_JOYSTICK
#if C_OPENGL
#include "SDL_opengl.h"
@ -53,30 +55,35 @@
#ifdef __WIN32__
#define NVIDIA_PixelDataRange 1
#ifndef WGL_NV_allocate_memory
#define WGL_NV_allocate_memory 1
typedef void * (APIENTRY * PFNWGLALLOCATEMEMORYNVPROC) (int size, float readfreq, float writefreq, float priority);
typedef void (APIENTRY * PFNWGLFREEMEMORYNVPROC) (void *pointer);
#endif
PFNWGLALLOCATEMEMORYNVPROC db_glAllocateMemoryNV = NULL;
PFNWGLFREEMEMORYNVPROC db_glFreeMemoryNV = NULL;
#endif
#else
#endif
#if defined(NVIDIA_PixelDataRange)
#ifndef GL_NV_pixel_data_range
#define GL_NV_pixel_data_range 1
#define GL_WRITE_PIXEL_DATA_RANGE_NV 0x8878
typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, GLvoid *pointer);
typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target);
PFNGLPIXELDATARANGENVPROC glPixelDataRangeNV = NULL;
#endif
PFNGLPIXELDATARANGENVPROC glPixelDataRangeNV = NULL;
#endif
#endif //C_OPENGL
//#define DISABLE_JOYSTICK
#if !(ENVIRON_INCLUDED)
extern char** environ;
@ -608,7 +615,7 @@ static void GUI_StartUp(Section * sec) {
sdl.opengl.packed_pixel=(strstr(gl_ext,"EXT_packed_pixels") > 0);
sdl.opengl.paletted_texture=(strstr(gl_ext,"EXT_paletted_texture") > 0);
#if defined(NVIDIA_PixelDataRange)
sdl.opengl.pixel_data_range=(strstr(gl_ext,"GL_NV_pixel_data_range") >0 )&&
sdl.opengl.pixel_data_range=(strstr(gl_ext,"GL_NV_pixel_data_range") >0 ) &&
glPixelDataRangeNV && db_glAllocateMemoryNV && db_glFreeMemoryNV;
#endif
} else {