From 6e82ca88edbf22b32cb1111aeef5d1b742eef2fc Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Thu, 28 Nov 2013 21:46:36 -0400 Subject: [PATCH] =?UTF-8?q?Mac:=20dropped=20OS=2010.5=20support.=20The=20l?= =?UTF-8?q?egacy=20code=20in=20SDL2=20for=20windowing=20in=2010.5=20is=20b?= =?UTF-8?q?uggy,=20resulting=20in=20major=20bugs=20with=20love.window.setF?= =?UTF-8?q?ullscreen=20and=20other=20functions.=20Also,=20some=20of=2010.5?= =?UTF-8?q?=E2=80=99s=20own=20drivers=20are=20buggy.=20Stop=20using=20an?= =?UTF-8?q?=20OS=20that=E2=80=99s=204=20major=20versions=20out=20of=20date?= =?UTF-8?q?=20-=20most=20other=20applications=20have=20dropped=2010.5=20su?= =?UTF-8?q?pport=20months=20or=20years=20ago.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../love-framework.xcodeproj/project.pbxproj | 4 +- .../macosx/love.xcodeproj/project.pbxproj | 4 +- src/common/config.h | 3 -- src/modules/love/love.cpp | 43 ------------------- 4 files changed, 4 insertions(+), 50 deletions(-) diff --git a/platform/macosx/love-framework.xcodeproj/project.pbxproj b/platform/macosx/love-framework.xcodeproj/project.pbxproj index 9457ecdf8..9527ea842 100644 --- a/platform/macosx/love-framework.xcodeproj/project.pbxproj +++ b/platform/macosx/love-framework.xcodeproj/project.pbxproj @@ -2360,7 +2360,7 @@ ); LD_RUNPATH_SEARCH_PATHS = "@rpath"; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.5; + MACOSX_DEPLOYMENT_TARGET = 10.6; ONLY_ACTIVE_ARCH = NO; USE_HEADERMAP = NO; WARNING_CFLAGS = "-Wall"; @@ -2396,7 +2396,7 @@ ); LD_RUNPATH_SEARCH_PATHS = "@rpath"; LIBRARY_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.5; + MACOSX_DEPLOYMENT_TARGET = 10.6; ONLY_ACTIVE_ARCH = YES; USE_HEADERMAP = NO; WARNING_CFLAGS = "-Wall"; diff --git a/platform/macosx/love.xcodeproj/project.pbxproj b/platform/macosx/love.xcodeproj/project.pbxproj index 5c8fd268c..6eeca8095 100644 --- a/platform/macosx/love.xcodeproj/project.pbxproj +++ b/platform/macosx/love.xcodeproj/project.pbxproj @@ -326,7 +326,7 @@ ); INFOPLIST_FILE = "love-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.5; + MACOSX_DEPLOYMENT_TARGET = 10.6; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ""; "OTHER_LDFLAGS[arch=x86_64]" = ( @@ -382,7 +382,7 @@ INFOPLIST_FILE = "love-Info.plist"; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; LLVM_LTO = YES; - MACOSX_DEPLOYMENT_TARGET = 10.5; + MACOSX_DEPLOYMENT_TARGET = 10.6; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ""; "OTHER_LDFLAGS[arch=x86_64]" = ( diff --git a/src/common/config.h b/src/common/config.h index 237cfbc8f..15e46b9ee 100644 --- a/src/common/config.h +++ b/src/common/config.h @@ -72,9 +72,6 @@ #endif #if defined(LOVE_MACOSX) -# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6 -# define LOVE_LEGENDARY_LIBSTDCXX_HACK -# endif # define LOVE_LEGENDARY_APP_ARGV_HACK #endif diff --git a/src/modules/love/love.cpp b/src/modules/love/love.cpp index 6b959024c..5f106de96 100644 --- a/src/modules/love/love.cpp +++ b/src/modules/love/love.cpp @@ -36,49 +36,6 @@ #include #endif // LOVE_LEGENDARY_CONSOLE_IO_HACK -#ifdef LOVE_LEGENDARY_LIBSTDCXX_HACK - -#include - -// Workarounds for symbols that are missing from Leopard stdlibc++.dylib. -// http://stackoverflow.com/questions/3484043/os-x-program-runs-on-dev-machine-crashing-horribly-on-others -_GLIBCXX_BEGIN_NAMESPACE(std) -// From ostream_insert.h -template ostream& __ostream_insert(ostream&, const char*, streamsize); - -#ifdef _GLIBCXX_USE_WCHAR_T -template wostream& __ostream_insert(wostream&, const wchar_t*, streamsize); -#endif - -// From ostream.tcc -template ostream& ostream::_M_insert(long); -template ostream& ostream::_M_insert(unsigned long); -template ostream& ostream::_M_insert(bool); -#ifdef _GLIBCXX_USE_LONG_LONG -template ostream& ostream::_M_insert(long long); -template ostream& ostream::_M_insert(unsigned long long); -#endif -template ostream& ostream::_M_insert(double); -template ostream& ostream::_M_insert(long double); -template ostream& ostream::_M_insert(const void*); - -#ifdef _GLIBCXX_USE_WCHAR_T -template wostream& wostream::_M_insert(long); -template wostream& wostream::_M_insert(unsigned long); -template wostream& wostream::_M_insert(bool); -#ifdef _GLIBCXX_USE_LONG_LONG -template wostream& wostream::_M_insert(long long); -template wostream& wostream::_M_insert(unsigned long long); -#endif -template wostream& wostream::_M_insert(double); -template wostream& wostream::_M_insert(long double); -template wostream& wostream::_M_insert(const void*); -#endif - -_GLIBCXX_END_NAMESPACE - -#endif // LOVE_LEGENDARY_LIBSTDCXX_HACK - // Libraries. #include "libraries/luasocket/luasocket.h" #include "libraries/enet/lua-enet.h"