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

OS X: switched to -std=c++11, fixed compilation, cleaned up obsolete files in src/platform/macosx/

Browse Source
This commit is contained in:
Alex Szpakowski
2013-09-29 02:50:37 -03:00
parent fc5d5e3f26
commit 5f609c2e2b
6 changed files with 8 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/macosx/love-framework.xcodeproj/project.pbxproj
+2
View File
@@ -2256,6 +2256,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_ENABLE_MODULES = YES;
DEAD_CODE_STRIPPING = YES;
FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
@@ -2291,6 +2292,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_ENABLE_MODULES = YES;
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
platform/macosx/love.xcodeproj/project.pbxproj
+2
View File
@@ -302,6 +302,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_ENABLE_MODULES = YES;
FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
GCC_INCREASE_PRECOMPILED_HEADER_SHARING = YES;
@@ -353,6 +354,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_ENABLE_MODULES = YES;
DEPLOYMENT_POSTPROCESSING = NO;
FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
platform/macosx/loveProj.xcconfig
-8
View File
@@ -1,8 +0,0 @@
GCC_ENABLE_CPP_EXCEPTIONS = YES;
GCC_ENABLE_CPP_RTTI = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
GCC_INCREASE_PRECOMPILED_HEADER_SHARING = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
PREBINDING = NO;
INFOPLIST_EXPAND_BUILD_SETTINGS = YES;
platform/macosx/loveTarget.xcconfig
-7
View File
@@ -1,7 +0,0 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = love_Prefix.pch;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = $(HOME)/Applications;
PRODUCT_NAME = love;
STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = Dynamic;
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
platform/macosx/script.sh
-28
View File
@@ -1,28 +0,0 @@
#! /bin/sh
#Use install_name_tool, make love to search libs in its own framework folder instead
#*very* hackish.
#IL
install_name_tool -change /usr/local/lib/libIL.dylib @executable_path/../Frameworks/IL.framework/Versions/A/IL build/Release/love.app/Contents/MacOS/love
install_name_tool -change /usr/local/lib/libILU.dylib @executable_path/../Frameworks/IL.framework/Versions/A/IL build/Release/love.app/Contents/MacOS/love
install_name_tool -change /usr/local/lib/libILUT.dylib @executable_path/../Frameworks/IL.framework/Versions/A/IL build/Release/love.app/Contents/MacOS/love
install_name_tool -change /usr/local/lib/libIL.1.dylib @executable_path/../Frameworks/IL.framework/Versions/A/IL build/Release/love.app/Contents/MacOS/love
install_name_tool -change /usr/local/lib/libILU.1.dylib @executable_path/../Frameworks/IL.framework/Versions/A/IL build/Release/love.app/Contents/MacOS/love
install_name_tool -change /usr/local/lib/libILUT.1.dylib @executable_path/../Frameworks/IL.framework/Versions/A/IL build/Release/love.app/Contents/MacOS/love
# FreeType
install_name_tool -change /Library/Frameworks/FreeType.framework/Versions/2.3/FreeType @executable_path/../Frameworks/FreeType.framework/Versions/2.3/FreeType build/Release/love.app/Contents/MacOS/love
# SDL
install_name_tool -change /Library/Frameworks/SDL.framework/Versions/A/SDL @executable_path/../Frameworks/SDL.framework/Versions/A/SDL build/Release/love.app/Contents/MacOS/love
install_name_tool -change /Library/Frameworks/SDL.framework/Versions/A/SDL @executable_path/../Frameworks/SDL.framework/Versions/A/SDL build/Release/love.app/Contents/Frameworks/SDL_mixer.framework/SDL_mixer
# SDL_mixer
#install_name_tool -change /Library/Frameworks/SDL_mixer.framework/Versions/A/SDL_mixer @executable_path/../#Frameworks/SDL_mixer.framework/Versions/A/SDL_mixer build/Release/love.app/Contents/MacOS/love
exit 0
src/modules/graphics/opengl/Font.cpp
+4 -4
View File
@@ -216,10 +216,10 @@ Font::Glyph *Font::addGlyph(uint32 glyph)
g->texture = t;
const GlyphVertex verts[4] = {
{0, 0, float(textureX)/float(textureWidth), float(textureY)/float(textureHeight)},
{w, 0, float(textureX+w)/float(textureWidth), float(textureY)/float(textureHeight)},
{w, h, float(textureX+w)/float(textureWidth), float(textureY+h)/float(textureHeight)},
{0, h, float(textureX)/float(textureWidth), float(textureY+h)/float(textureHeight)},
{ 0.0f, 0.0f, float(textureX)/float(textureWidth), float(textureY)/float(textureHeight)},
{float(w), 0.0f, float(textureX+w)/float(textureWidth), float(textureY)/float(textureHeight)},
{float(w), float(h), float(textureX+w)/float(textureWidth), float(textureY+h)/float(textureHeight)},
{ 0.0f, float(h), float(textureX)/float(textureWidth), float(textureY+h)/float(textureHeight)},
};
// copy vertex data to the glyph and set proper bearing