LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-19 12:14:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed runtime support for Mac OS 10.6 and switched from libstdc++ to libc++ in OS X. Now we can use C++11's standard library!

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2014-08-08 18:54:12 -03:00
parent 53e63d48c9
commit a757315006
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/macosx/love-framework.xcodeproj/project.pbxproj
+6 -3
View File
@@ -2402,6 +2402,7 @@
buildSettings = { buildSettings = {
ARCHS = "$(ARCHS_STANDARD_64_BIT)"; ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -2431,7 +2432,7 @@
); );
LD_RUNPATH_SEARCH_PATHS = "@rpath"; LD_RUNPATH_SEARCH_PATHS = "@rpath";
LIBRARY_SEARCH_PATHS = ""; LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.6; MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = NO; ONLY_ACTIVE_ARCH = NO;
USE_HEADERMAP = NO; USE_HEADERMAP = NO;
WARNING_CFLAGS = "-Wall"; WARNING_CFLAGS = "-Wall";
@@ -2443,6 +2444,7 @@
buildSettings = { buildSettings = {
ARCHS = "$(ARCHS_STANDARD_64_BIT)"; ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -2472,7 +2474,7 @@
); );
LD_RUNPATH_SEARCH_PATHS = "@rpath"; LD_RUNPATH_SEARCH_PATHS = "@rpath";
LIBRARY_SEARCH_PATHS = ""; LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.6; MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
USE_HEADERMAP = NO; USE_HEADERMAP = NO;
WARNING_CFLAGS = "-Wall"; WARNING_CFLAGS = "-Wall";
@@ -2484,6 +2486,7 @@
buildSettings = { buildSettings = {
ARCHS = "$(ARCHS_STANDARD_64_BIT)"; ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -2514,7 +2517,7 @@
LD_RUNPATH_SEARCH_PATHS = "@rpath"; LD_RUNPATH_SEARCH_PATHS = "@rpath";
LIBRARY_SEARCH_PATHS = ""; LIBRARY_SEARCH_PATHS = "";
LLVM_LTO = YES; LLVM_LTO = YES;
MACOSX_DEPLOYMENT_TARGET = 10.6; MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = NO; ONLY_ACTIVE_ARCH = NO;
USE_HEADERMAP = NO; USE_HEADERMAP = NO;
WARNING_CFLAGS = "-Wall"; WARNING_CFLAGS = "-Wall";
platform/macosx/love.xcodeproj/project.pbxproj
+6 -3
View File
@@ -301,6 +301,7 @@
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)"; ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
GCC_INCREASE_PRECOMPILED_HEADER_SHARING = YES; GCC_INCREASE_PRECOMPILED_HEADER_SHARING = YES;
@@ -331,7 +332,7 @@
); );
INFOPLIST_FILE = "love-Info.plist"; INFOPLIST_FILE = "love-Info.plist";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 10.6; MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ""; OTHER_LDFLAGS = "";
"OTHER_LDFLAGS[arch=x86_64]" = ( "OTHER_LDFLAGS[arch=x86_64]" = (
@@ -354,6 +355,7 @@
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)"; ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
DEPLOYMENT_POSTPROCESSING = NO; DEPLOYMENT_POSTPROCESSING = NO;
FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
@@ -388,7 +390,7 @@
INFOPLIST_FILE = "love-Info.plist"; INFOPLIST_FILE = "love-Info.plist";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
LLVM_LTO = YES; LLVM_LTO = YES;
MACOSX_DEPLOYMENT_TARGET = 10.6; MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = NO; ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = ""; OTHER_LDFLAGS = "";
"OTHER_LDFLAGS[arch=x86_64]" = ( "OTHER_LDFLAGS[arch=x86_64]" = (
@@ -412,6 +414,7 @@
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)"; ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
DEPLOYMENT_POSTPROCESSING = NO; DEPLOYMENT_POSTPROCESSING = NO;
FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
@@ -446,7 +449,7 @@
INFOPLIST_FILE = "love-Info.plist"; INFOPLIST_FILE = "love-Info.plist";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
LLVM_LTO = YES; LLVM_LTO = YES;
MACOSX_DEPLOYMENT_TARGET = 10.6; MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = NO; ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = ""; OTHER_LDFLAGS = "";
"OTHER_LDFLAGS[arch=x86_64]" = ( "OTHER_LDFLAGS[arch=x86_64]" = (
src/modules/image/magpie/STBHandler.cpp
+3
View File
@@ -27,6 +27,9 @@
// C++ // C++
#include <algorithm> #include <algorithm>
// C
#include <cstdlib>
namespace love namespace love
{ {
namespace image namespace image