Merge branch 'maint_1.8'

src/gl/models/gl_models_md2.cpp

@@ -176,7 +176,7 @@ bool FDMDModel::Load(const char * path, int, const char * buffer, int length)
 		// Translate each vertex.
 		for(k = 0, pVtx = pfr->vertices; k < info.numVertices; k++, pVtx++)
 		{
-			UnpackVector(USHORT(pVtx->normal), frame->normals[k].xyz);
+			UnpackVector((unsigned short)(pVtx->normal), frame->normals[k].xyz);
 			for(c = 0; c < 3; c++)
 			{
 				frame->vertices[k].xyz[axis[c]] =
@@ -208,7 +208,7 @@ bool FDMDModel::Load(const char * path, int, const char * buffer, int length)
 	for(i = 0; i < info.numLODs; i++)
 		for(k = 0; k < lodInfo[i].numTriangles; k++)
 			for(c = 0; c < 3; c++)
-				vertexUsage[SHORT(triangles[i][k].vertexIndices[c])] |= 1 << i;
+				vertexUsage[short(triangles[i][k].vertexIndices[c])] |= 1 << i;
 
 	loaded=true;
 	return true;

src/gl/system/gl_interface.h

@@ -5,6 +5,11 @@
 #define APIENTRY
 #endif // __APPLE__
 
+#include "basictypes.h"
+#ifndef _WIN32
+typedef bool BOOL;
+#endif
+
 #ifndef PFNGLMULTITEXCOORD2FPROC
 typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
 #endif

src/gl/system/gl_system.h

@@ -88,7 +88,6 @@ inline T max( T a, T b) { return (((a)>(b)) ? (a) : (b)); }
 #define _access(a,b)	access(a,b)
 #endif
 #ifndef _WIN32
-#include "platform.h"
 #include <SDL.h>
 #endif
 #include "gl/system/gl_interface.h"

src/gl/system/gl_wipe.cpp

@@ -56,6 +56,19 @@
 #include "gl/textures/gl_material.h"
 #include "gl/utility/gl_templates.h"
 
+#ifndef _WIN32
+struct POINT {
+  SDWORD x; 
+  SDWORD y; 
+};
+struct RECT {
+  SDWORD left; 
+  SDWORD top; 
+  SDWORD right; 
+  SDWORD bottom; 
+}; 
+#endif
+
 EXTERN_CVAR(Bool, gl_vid_compatibility)
 
 //===========================================================================

src/gl/textures/gl_hirestex.cpp

@@ -56,8 +56,8 @@
 #include "d_main.h"
 #include "zstring.h"
 
-#ifdef __GNUC__
+#ifndef _WIN32
-#include "Linux/platform.h" /* Without this it would fail on _access on line 374 (378 now) */
+#define _access(a,b)	access(a,b)
 #endif
 
 static int Doom2Wad = -1;