make X-IvAp compiling on Linux again + port patches made for IVAO already to OpenSource version

This commit is contained in:
Kenny Moens
2009-08-14 17:39:09 +00:00
parent 9d93982b04
commit b95393340e
6 changed files with 15 additions and 6 deletions

View File

@@ -125,7 +125,7 @@ bool OGL_UtilsInit()
{
// Initialize all OGL Function Pointers
#if APL
//glBindBufferARB = (PFNGLBINDBUFFERARBPROC) wglGetProcAddress("glBindBufferARB" );
// glBindBufferARB = (PFNGLBINDBUFFERARBPROC) wglGetProcAddress("glBindBufferARB" );
#endif
#if IBM
glBindBufferARB = (PFNGLBINDBUFFERARBPROC) wglGetProcAddress("glBindBufferARB" );

View File

@@ -28,7 +28,7 @@
#include <windows.h>
#include <GL/gl.h>
#include <GL/glu.h>
#include <GL/glext.h>
#include <gl/glext.h>
#elif LIN
#define GLX_GLXEXT_PROTOTYPES
#define GL_GLEXT_PROTOTYPES
@@ -37,14 +37,15 @@
#include <GL/glext.h>
#include <GL/glx.h>
#elif APL
#include <OpenGL/gl.h>
#include <OpenGL/glu.h>
#include <OpenGL/glext.h>
#endif
#endif
#if LIN
#if LIN
#define GLX_GLXEXT_PROTOTYPES
#endif
#endif
// Open GL Extension Defintion
#if APL
@@ -61,6 +62,9 @@ typedef void (APIENTRY * PFNGLCLIENTACTIVETEXTUREARBPROC ) (GLenum);
typedef void (APIENTRY * PFNGLMULTITEXCOORD2FARBPROC ) (GLenum, GLfloat, GLfloat);
typedef void (APIENTRY * PFNGLMULTITEXCOORD2FVARBPROC) (GLenum, const GLfloat *);
#if APL
//extern PFNGLBINDBUFFERARBPROC glBindBufferARB;
#endif
#if IBM
extern PFNGLBINDBUFFERARBPROC glBindBufferARB;
extern PFNGLMULTITEXCOORD2FARBPROC glMultiTexCoord2fARB;

View File

@@ -21,6 +21,7 @@
*
*/
#include "XObjDefs.h"
#include <string.h>
cmd_info gCmds[] = {
@@ -81,4 +82,4 @@ int FindIndexForCmd(int inCmd)
++n;
}
return 0;
}
}

View File

@@ -24,6 +24,7 @@
#include "XObjDefs.h"
#include "XUtils.h"
#include <stdio.h>
#include <stdlib.h>
#if APL
#define CRLF "\r"

View File

@@ -29,6 +29,8 @@
#include <algorithm>
#include "PlatformUtils.h"
#include <string.h>
using std::max;
#if APL

View File

@@ -22,6 +22,7 @@
*/
#include "XUtils.h"
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include "XObjDefs.h"
#include <stdlib.h>