From 46dc5da455e9bf72e644e5e1ad31951688947edf Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Thu, 22 Oct 2015 20:14:56 -0400
Subject: [PATCH] fullscreen only blocked on OS X when not using SDL 1.2.15
 (untested)

---
 src/gui/options/OptionsView.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/gui/options/OptionsView.cpp b/src/gui/options/OptionsView.cpp
index c71518684b..aa0e7430c5 100644
--- a/src/gui/options/OptionsView.cpp
+++ b/src/gui/options/OptionsView.cpp
@@ -5,6 +5,11 @@
 #else
 	#include <unistd.h>
 #endif
+#ifdef SDL_INC
+#include "SDL/SDL.h"
+#else
+#include "SDL.h"
+#endif
 
 #include "OptionsView.h"
 #include "gui/Style.h"
@@ -162,7 +167,7 @@ OptionsView::OptionsView():
 		FullscreenAction(OptionsView * v_){	v = v_;	}
 		virtual void ActionCallback(ui::Checkbox * sender)
 		{
-#ifdef MACOSX
+#if defined(MACOSX) && !SDL_VERSION_ATLEAST(1, 2, 15)
 			ErrorMessage::Blocking("Error", "fullscreen doesn't work on OS X");
 #else
 			v->c->SetFullscreen(sender->GetChecked());