diff --git a/platform/macosx/love-framework.xcodeproj/project.pbxproj b/platform/macosx/love-framework.xcodeproj/project.pbxproj index 5f71882ed..5b5d2b6e8 100644 --- a/platform/macosx/love-framework.xcodeproj/project.pbxproj +++ b/platform/macosx/love-framework.xcodeproj/project.pbxproj @@ -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; diff --git a/platform/macosx/love.xcodeproj/project.pbxproj b/platform/macosx/love.xcodeproj/project.pbxproj index ca8789e8c..4056d8eea 100644 --- a/platform/macosx/love.xcodeproj/project.pbxproj +++ b/platform/macosx/love.xcodeproj/project.pbxproj @@ -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; diff --git a/platform/macosx/loveProj.xcconfig b/platform/macosx/loveProj.xcconfig deleted file mode 100644 index 73543b888..000000000 --- a/platform/macosx/loveProj.xcconfig +++ /dev/null @@ -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; \ No newline at end of file diff --git a/platform/macosx/loveTarget.xcconfig b/platform/macosx/loveTarget.xcconfig deleted file mode 100644 index 12fb0c000..000000000 --- a/platform/macosx/loveTarget.xcconfig +++ /dev/null @@ -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; diff --git a/platform/macosx/script.sh b/platform/macosx/script.sh deleted file mode 100644 index 3ce93d6d7..000000000 --- a/platform/macosx/script.sh +++ /dev/null @@ -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 \ No newline at end of file diff --git a/src/modules/graphics/opengl/Font.cpp b/src/modules/graphics/opengl/Font.cpp index 6d8c0312b..41eb34189 100644 --- a/src/modules/graphics/opengl/Font.cpp +++ b/src/modules/graphics/opengl/Font.cpp @@ -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