From e44f20fdc6a6aeec80b11485040c5cc5d8cdfaac Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sat, 15 Aug 2015 00:41:45 -0300 Subject: [PATCH] Renamed OSX.mm/OSX.h to macosx.mm/macosx.h to match love's file naming conventions. --- .../xcode/liblove.xcodeproj/project.pbxproj | 20 +++++++++---------- src/common/android.cpp | 2 +- src/common/android.h | 2 +- src/common/{OSX.h => macosx.h} | 0 src/common/{OSX.mm => macosx.mm} | 2 +- src/love.cpp | 2 +- src/modules/filesystem/Filesystem.cpp | 4 ++-- src/modules/graphics/opengl/Font.cpp | 4 ++-- src/modules/window/sdl/Window.cpp | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) rename src/common/{OSX.h => macosx.h} (100%) rename src/common/{OSX.mm => macosx.mm} (99%) diff --git a/platform/xcode/liblove.xcodeproj/project.pbxproj b/platform/xcode/liblove.xcodeproj/project.pbxproj index 8e902f02e..b5b5d9789 100644 --- a/platform/xcode/liblove.xcodeproj/project.pbxproj +++ b/platform/xcode/liblove.xcodeproj/project.pbxproj @@ -33,9 +33,9 @@ FA0B79321A958E3B000E1D17 /* Object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA0B79081A958E3B000E1D17 /* Object.cpp */; }; FA0B79331A958E3B000E1D17 /* Object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA0B79081A958E3B000E1D17 /* Object.cpp */; }; FA0B79341A958E3B000E1D17 /* Object.h in Headers */ = {isa = PBXBuildFile; fileRef = FA0B79091A958E3B000E1D17 /* Object.h */; }; - FA0B79351A958E3B000E1D17 /* OSX.h in Headers */ = {isa = PBXBuildFile; fileRef = FA0B790A1A958E3B000E1D17 /* OSX.h */; }; - FA0B79361A958E3B000E1D17 /* OSX.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA0B790B1A958E3B000E1D17 /* OSX.mm */; }; - FA0B79371A958E3B000E1D17 /* OSX.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA0B790B1A958E3B000E1D17 /* OSX.mm */; }; + FA0B79351A958E3B000E1D17 /* macosx.h in Headers */ = {isa = PBXBuildFile; fileRef = FA0B790A1A958E3B000E1D17 /* macosx.h */; }; + FA0B79361A958E3B000E1D17 /* macosx.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA0B790B1A958E3B000E1D17 /* macosx.mm */; }; + FA0B79371A958E3B000E1D17 /* macosx.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA0B790B1A958E3B000E1D17 /* macosx.mm */; }; FA0B79381A958E3B000E1D17 /* Reference.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA0B790C1A958E3B000E1D17 /* Reference.cpp */; }; FA0B79391A958E3B000E1D17 /* Reference.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA0B790C1A958E3B000E1D17 /* Reference.cpp */; }; FA0B793A1A958E3B000E1D17 /* Reference.h in Headers */ = {isa = PBXBuildFile; fileRef = FA0B790D1A958E3B000E1D17 /* Reference.h */; }; @@ -908,8 +908,8 @@ FA0B79071A958E3B000E1D17 /* Module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Module.h; sourceTree = ""; }; FA0B79081A958E3B000E1D17 /* Object.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Object.cpp; sourceTree = ""; }; FA0B79091A958E3B000E1D17 /* Object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Object.h; sourceTree = ""; }; - FA0B790A1A958E3B000E1D17 /* OSX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OSX.h; sourceTree = ""; }; - FA0B790B1A958E3B000E1D17 /* OSX.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OSX.mm; sourceTree = ""; }; + FA0B790A1A958E3B000E1D17 /* macosx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = macosx.h; sourceTree = ""; }; + FA0B790B1A958E3B000E1D17 /* macosx.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = macosx.mm; sourceTree = ""; }; FA0B790C1A958E3B000E1D17 /* Reference.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Reference.cpp; sourceTree = ""; }; FA0B790D1A958E3B000E1D17 /* Reference.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reference.h; sourceTree = ""; }; FA0B790E1A958E3B000E1D17 /* runtime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = runtime.cpp; sourceTree = ""; }; @@ -1629,8 +1629,8 @@ FA0B79071A958E3B000E1D17 /* Module.h */, FA0B79081A958E3B000E1D17 /* Object.cpp */, FA0B79091A958E3B000E1D17 /* Object.h */, - FA0B790A1A958E3B000E1D17 /* OSX.h */, - FA0B790B1A958E3B000E1D17 /* OSX.mm */, + FA0B790A1A958E3B000E1D17 /* macosx.h */, + FA0B790B1A958E3B000E1D17 /* macosx.mm */, FA0B790C1A958E3B000E1D17 /* Reference.cpp */, FA0B790D1A958E3B000E1D17 /* Reference.h */, FA0B790E1A958E3B000E1D17 /* runtime.cpp */, @@ -2924,7 +2924,7 @@ FA0B7D141A95902C000E1D17 /* Font.h in Headers */, FA0B7D411A95902C000E1D17 /* Mesh.h in Headers */, FA0B7E591A95902C000E1D17 /* wrap_Joint.h in Headers */, - FA0B79351A958E3B000E1D17 /* OSX.h in Headers */, + FA0B79351A958E3B000E1D17 /* macosx.h in Headers */, FA0B7A631A958EA3000E1D17 /* b2ContactManager.h in Headers */, FA0B7E771A95902C000E1D17 /* wrap_WeldJoint.h in Headers */, FA0B7A911A958EA3000E1D17 /* b2FrictionJoint.h in Headers */, @@ -3204,7 +3204,7 @@ FA0B7EE31A95902D000E1D17 /* Window.cpp in Sources */, FA0B7AAB1A958EA3000E1D17 /* b2WeldJoint.cpp in Sources */, FA0B7EC21A95902C000E1D17 /* threads.cpp in Sources */, - FA0B79371A958E3B000E1D17 /* OSX.mm in Sources */, + FA0B79371A958E3B000E1D17 /* macosx.mm in Sources */, FA0B7D011A95902C000E1D17 /* Filesystem.cpp in Sources */, FA0B7ED91A95902D000E1D17 /* wrap_Timer.cpp in Sources */, FA0B7DD11A95902C000E1D17 /* love.cpp in Sources */, @@ -3599,7 +3599,7 @@ FA0B7EBB1A95902C000E1D17 /* LuaThread.cpp in Sources */, FA0B79381A958E3B000E1D17 /* Reference.cpp in Sources */, FA0B7D391A95902C000E1D17 /* Graphics.cpp in Sources */, - FA0B79361A958E3B000E1D17 /* OSX.mm in Sources */, + FA0B79361A958E3B000E1D17 /* macosx.mm in Sources */, FA0B7E121A95902C000E1D17 /* GearJoint.cpp in Sources */, FA0B7DC11A95902C000E1D17 /* wrap_Joystick.cpp in Sources */, FA0B7CD31A95902C000E1D17 /* Source.cpp in Sources */, diff --git a/src/common/android.cpp b/src/common/android.cpp index 530535625..a7cb76f1f 100644 --- a/src/common/android.cpp +++ b/src/common/android.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2014 LOVE Development Team + * Copyright (c) 2006-2015 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff --git a/src/common/android.h b/src/common/android.h index b0e051bc0..d3b545a32 100644 --- a/src/common/android.h +++ b/src/common/android.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 2006-2014 LOVE Development Team + * Copyright (c) 2006-2015 LOVE Development Team * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages diff --git a/src/common/OSX.h b/src/common/macosx.h similarity index 100% rename from src/common/OSX.h rename to src/common/macosx.h diff --git a/src/common/OSX.mm b/src/common/macosx.mm similarity index 99% rename from src/common/OSX.mm rename to src/common/macosx.mm index e5112b240..6a1bd369c 100644 --- a/src/common/OSX.mm +++ b/src/common/macosx.mm @@ -18,7 +18,7 @@ * 3. This notice may not be removed or altered from any source distribution. **/ -#include "OSX.h" +#include "macosx.h" #ifdef LOVE_MACOSX diff --git a/src/love.cpp b/src/love.cpp index 6641d88a1..393ba9d5f 100644 --- a/src/love.cpp +++ b/src/love.cpp @@ -36,7 +36,7 @@ extern "C" { #endif // LOVE_WINDOWS #ifdef LOVE_MACOSX -#include "common/OSX.h" +#include "common/macosx.h" #endif // LOVE_MACOSX #ifdef LOVE_IOS diff --git a/src/modules/filesystem/Filesystem.cpp b/src/modules/filesystem/Filesystem.cpp index a9975b549..839d2db1e 100644 --- a/src/modules/filesystem/Filesystem.cpp +++ b/src/modules/filesystem/Filesystem.cpp @@ -27,9 +27,9 @@ #include #if defined(LOVE_MACOSX) -#include "common/OSX.h" +#include "common/macosx.h" #elif defined(LOVE_IOS) -#include "common/iOS.h" +#include "common/ios.h" #elif defined(LOVE_WINDOWS) #include #include "common/utf8.h" diff --git a/src/modules/graphics/opengl/Font.cpp b/src/modules/graphics/opengl/Font.cpp index 2589ddd8e..c229571d0 100644 --- a/src/modules/graphics/opengl/Font.cpp +++ b/src/modules/graphics/opengl/Font.cpp @@ -410,8 +410,8 @@ std::vector Font::generateVertices(const std::string &text, s for (int j = 0; j < 4; j++) { vertices.push_back(glyph.vertices[j]); - vertices.back().x += dx /*+ kerning*/; - vertices.back().y += dy /*+ kerning.y*/ + lineheight; + vertices.back().x += dx; + vertices.back().y += dy + lineheight; } // Check if glyph texture has changed since the last iteration. diff --git a/src/modules/window/sdl/Window.cpp b/src/modules/window/sdl/Window.cpp index 83e04c57c..cc1fa52d0 100644 --- a/src/modules/window/sdl/Window.cpp +++ b/src/modules/window/sdl/Window.cpp @@ -41,7 +41,7 @@ #if defined(LOVE_WINDOWS) #include #elif defined(LOVE_MACOSX) -#include "common/OSX.h" +#include "common/macosx.h" #endif #ifndef APIENTRY