diff --git a/cmake/toolchains/iOS.toolchain.cmake b/cmake/toolchains/iOS.toolchain.cmake index c697857fa..f078f5c09 100644 --- a/cmake/toolchains/iOS.toolchain.cmake +++ b/cmake/toolchains/iOS.toolchain.cmake @@ -79,7 +79,7 @@ set (CMAKE_C_OSX_CURRENT_VERSION_FLAG "-current_version ") set (CMAKE_CXX_OSX_COMPATIBILITY_VERSION_FLAG "${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}") set (CMAKE_CXX_OSX_CURRENT_VERSION_FLAG "${CMAKE_C_OSX_CURRENT_VERSION_FLAG}") -# Hidden visibilty is required for cxx on iOS +# Hidden visibilty is required for cxx on iOS set (CMAKE_C_FLAGS_INIT "") set (CMAKE_CXX_FLAGS_INIT "-fvisibility=hidden -fvisibility-inlines-hidden") @@ -143,7 +143,7 @@ set (IOS_SDK_ROOT ${IOS_SDK_ROOT} CACHE PATH "Location of the selected iOS SDK") # Set the sysroot default to the most recent SDK set (CMAKE_OSX_SYSROOT ${IOS_SDK_ROOT} CACHE PATH "Sysroot used for iOS support") -# set the architecture for iOS +# set the architecture for iOS if (${IOS_PLATFORM} STREQUAL OS) set (OSX_UNIVERSAL true) set (IOS_ARCH arm64) diff --git a/examples/android/build.gradle b/examples/android/build.gradle index 56292ed44..3943e2f5c 100644 --- a/examples/android/build.gradle +++ b/examples/android/build.gradle @@ -1,7 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - repositories { google() jcenter() diff --git a/examples/opengl/OpenGL.cpp b/examples/opengl/OpenGL.cpp index e838e427a..944bf022a 100644 --- a/examples/opengl/OpenGL.cpp +++ b/examples/opengl/OpenGL.cpp @@ -282,7 +282,7 @@ int main() // Make the window the active window for OpenGL calls if (!window.setActive(true)) { - // On failure, try re-creating the window, as it is intentionally + // On failure, try re-creating the window, as it is intentionally // closed when changing color space. continue; } diff --git a/src/SFML/Window/OSX/CursorImpl.mm b/src/SFML/Window/OSX/CursorImpl.mm index 7e239e3b9..d20e94dcd 100644 --- a/src/SFML/Window/OSX/CursorImpl.mm +++ b/src/SFML/Window/OSX/CursorImpl.mm @@ -108,7 +108,7 @@ bool CursorImpl::loadFromSystem(Cursor::Type type) case Cursor::SizeRight: newCursor = [NSCursor resizeLeftRightCursor]; break; case Cursor::SizeTop: newCursor = [NSCursor resizeUpDownCursor]; break; case Cursor::SizeBottom: newCursor = [NSCursor resizeUpDownCursor]; break; - + // These cursor types are undocumented, may not be available on some platforms #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wundeclared-selector" diff --git a/src/SFML/Window/OSX/SFOpenGLView+mouse.mm b/src/SFML/Window/OSX/SFOpenGLView+mouse.mm index 71a3f63d1..9580ea702 100644 --- a/src/SFML/Window/OSX/SFOpenGLView+mouse.mm +++ b/src/SFML/Window/OSX/SFOpenGLView+mouse.mm @@ -54,7 +54,7 @@ m_cursor = cursor; // indirect call to resetCursorRects to set the cursor - [self.window invalidateCursorRectsForView:self]; + [self.window invalidateCursorRectsForView:self]; } diff --git a/test/Graphics/RenderStates.cpp b/test/Graphics/RenderStates.cpp index a16a0796f..3615529d0 100644 --- a/test/Graphics/RenderStates.cpp +++ b/test/Graphics/RenderStates.cpp @@ -75,6 +75,6 @@ TEST_CASE("sf::RenderStates class - [graphics]") CHECK(sf::RenderStates::Default.blendMode == sf::BlendMode()); CHECK(sf::RenderStates::Default.transform == sf::Transform()); CHECK(sf::RenderStates::Default.texture == nullptr); - CHECK(sf::RenderStates::Default.shader == nullptr); + CHECK(sf::RenderStates::Default.shader == nullptr); } }