From 23b7a15980252403be76f02ee8e84cf591e0c732 Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Mon, 18 Aug 2014 10:05:10 +0000
Subject: [PATCH] fixes courtesy of DyB|Tuna, to fix mac/sdl2 compilation.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4726 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/client/in_sdl.c | 1 +
 engine/gl/glquake.h    | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/engine/client/in_sdl.c b/engine/client/in_sdl.c
index e6759ca65..455cfcc63 100644
--- a/engine/client/in_sdl.c
+++ b/engine/client/in_sdl.c
@@ -104,6 +104,7 @@ static void J_JoystickAdded(int enumid)
 }
 static struct sdljoy_s *J_DevId(int jid)
 {
+	int i;
 	for (i = 0; i < MAX_JOYSTICKS; i++)
 		if (sdljoy[i].joystick && sdljoy[i].id == jid)
 			return &sdljoy[i];
diff --git a/engine/gl/glquake.h b/engine/gl/glquake.h
index 3470eac01..e3774fa92 100644
--- a/engine/gl/glquake.h
+++ b/engine/gl/glquake.h
@@ -76,6 +76,9 @@ extern r_config_t r_config;
 	#elif defined(__MACOSX__)
 		//apple, you suck.
 		#include <AGL/agl.h>
+	#elif defined(__APPLE__)
+		#include <OpenGL/gl.h>	//tuna says use this.
+		//apple really do suck.
 	#elif defined(NACL) || defined(FTE_TARGET_WEB)
 		#include <GLES2/gl2.h>
 		#define GLclampd GLclampf