summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE.rtf15
-rw-r--r--src/gui/setup_video.cpp4
2 files changed, 2 insertions, 17 deletions
diff --git a/LICENSE.rtf b/LICENSE.rtf
deleted file mode 100644
index 2592d38a..00000000
--- a/LICENSE.rtf
+++ /dev/null
@@ -1,15 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf949
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\paperw11900\paperh16840\margl1440\margr1440\vieww9480\viewh8400\viewkind0
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural
-
-\f0\fs24 \cf0 The Mana World is released under the GPL - more info at www.themanaworld.org\
-\
-SDL is used under the LGPL - more info at www.libsdl.org\
-\
-SDL_image, SDL_ttf, SDL_mixer and SDL_net are used under the LGPL - more info at www.libsdl.org/libs\
-\
-physfs is used under the BSD license - more info at http://icculus.org/physfs/\
-\
-zlib is used under the BSD license - more info at www.zlib.net} \ No newline at end of file
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 51a5fac5..9fb38f13 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -287,7 +287,7 @@ void Setup_Video::apply()
* See http://libsdl.org/cgi/docwiki.cgi/SDL_SetVideoMode
*/
-#ifdef WIN32
+#if defined(WIN32) || defined(__APPLE__)
// checks for opengl usage
if (!(config.getValue("opengl", 0) == 1))
{
@@ -305,7 +305,7 @@ void Setup_Video::apply()
logger->error(error.str());
}
}
-#ifdef WIN32
+#if defined(WIN32) || defined(__APPLE__)
} else {
new OkDialog(_("Switching to full screen"),
_("Restart needed for changes to take effect."));