maj/OpenArena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed: Updated to compile under linux

Browse Source 
~g2k
This commit is contained in:
Tom Hicks
2005-06-20 03:03:16 -04:00
parent e2ca6ca672
commit a0b8ce778b
27 changed files with 603 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/mygl.h
View File

@@ -1,11 +1,14 @@
#ifndef __MYGL_H__
#define __MYGL_H__
#include <windows.h>
#include <gl/gl.h>
#include <gl/glu.h>
#include <gl/glaux.h>
#ifdef WIN32
#include <windows.h> //Remove if possible
#endif
#include <GL/gl.h>
#include <GL/glu.h>
//#include <gl/glaux.h> //Hopefully nothing needs this remove if it works in windows
#include <string>
#include "datatypes.h"
#include "screen.h"
#include "tga.h"
#include "bmp.h"
@@ -13,13 +16,15 @@
using namespace std;
#ifdef WIN32
//These three are windows specific
static HDC hDC=NULL; // Private GDI device context
static HGLRC hRC=NULL; // Permanent rendering context
static HINSTANCE hInstance; // Application instance
#endif
static SCREEN g_Screen;
int InitGL(GLvoid);
bool LoadGLTexture(string , unsigned int&, int = GL_LINEAR, int = GL_LINEAR);
void FreeGLTexture(unsigned int&);
bool LoadGLTexture(string , GLuint&, GLuint = GL_LINEAR, GLuint = GL_LINEAR);
void FreeGLTexture(GLuint&);
#endif