mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-22 06:45:37 +08:00
make X-IvAp compiling on Linux again + port patches made for IVAO already to OpenSource version
This commit is contained in:
@@ -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" );
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
*
|
||||
*/
|
||||
#include "XObjDefs.h"
|
||||
#include <string.h>
|
||||
|
||||
cmd_info gCmds[] = {
|
||||
|
||||
@@ -81,4 +82,4 @@ int FindIndexForCmd(int inCmd)
|
||||
++n;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
#include "XObjDefs.h"
|
||||
#include "XUtils.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#if APL
|
||||
#define CRLF "\r"
|
||||
|
||||
@@ -29,6 +29,8 @@
|
||||
#include <algorithm>
|
||||
#include "PlatformUtils.h"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
using std::max;
|
||||
|
||||
#if APL
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
*/
|
||||
#include "XUtils.h"
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include "XObjDefs.h"
|
||||
#include <stdlib.h>
|
||||
|
||||
Reference in New Issue
Block a user