Use modern name for macOS

In a few places I left references to the old name where appropriate.
There are also many CMake references to "OSX" that we have to keep
using since CMake does not offer alternative names for those variables
and target properties.

.github/workflows/ci.yml

@@ -29,8 +29,8 @@ jobs:
         - { name: Linux GCC,            os: ubuntu-22.04, flags: -DSFML_RUN_DISPLAY_TESTS=ON -GNinja }
         - { name: Linux Clang,          os: ubuntu-22.04, flags: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DSFML_RUN_DISPLAY_TESTS=ON -GNinja , gcovr_options: '--gcov-executable="llvm-cov-$CLANG_VERSION gcov"' }
         - { name: Linux Intel oneAPI,   os: ubuntu-22.04, flags: -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx -GNinja }
-        - { name: MacOS,                os: macos-12, flags: -GNinja }
-        - { name: MacOS Xcode,          os: macos-12, flags: -GXcode }
+        - { name: macOS,                os: macos-12, flags: -GNinja }
+        - { name: macOS Xcode,          os: macos-12, flags: -GXcode }
         - { name: iOS,                  os: macos-12, flags: -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_ARCHITECTURES=arm64 }
         - { name: iOS Xcode,            os: macos-12, flags: -DCMAKE_SYSTEM_NAME=iOS -GXcode -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO }
         config:
@@ -59,7 +59,7 @@ jobs:
         - platform: { name: Windows VS2022, os: windows-2022 }
           config: { name: OpenGL ES, flags: -DSFML_USE_MESA3D=TRUE -DBUILD_SHARED_LIBS=TRUE -DSFML_OPENGL_ES=ON }
           type: { name: Debug, flags: -DCMAKE_BUILD_TYPE=Debug -DSFML_ENABLE_COVERAGE=TRUE }
-        - platform: { name: MacOS, os: macos-12 }
+        - platform: { name: macOS, os: macos-12 }
           config: { name: Frameworks, flags: -GNinja -DSFML_BUILD_FRAMEWORKS=TRUE -DBUILD_SHARED_LIBS=TRUE }
         - platform: { name: Android, os: ubuntu-22.04 }
           config: { name: x86, flags: -GNinja -DCMAKE_ANDROID_ARCH_ABI=x86 -DCMAKE_SYSTEM_NAME=Android -DSFML_BUILD_TEST_SUITE=FALSE -DCMAKE_ANDROID_NDK=$GITHUB_WORKSPACE/android-ndk-r23b -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang -DCMAKE_ANDROID_STL_TYPE=c++_shared -DCMAKE_ANDROID_API=26 }
@@ -73,7 +73,7 @@ jobs:
           config: { name: Static DRM, flags: -GNinja -DBUILD_SHARED_LIBS=FALSE -DSFML_USE_DRM=TRUE -DSFML_RUN_DISPLAY_TESTS=FALSE }
         - platform: { name: Linux GCC, os: ubuntu-22.04  }
           config: { name: Shared DRM, flags: -GNinja -DBUILD_SHARED_LIBS=TRUE -DSFML_USE_DRM=TRUE -DSFML_RUN_DISPLAY_TESTS=FALSE }
-        - platform: { name: MacOS , os: macos-12 }
+        - platform: { name: macOS , os: macos-12 }
           config: { name: System Deps, flags: -GNinja -DBUILD_SHARED_LIBS=TRUE -DSFML_USE_SYSTEM_DEPS=TRUE }
     steps:
     - name: Checkout Code

CMakeLists.txt

@@ -58,7 +58,7 @@ if(SFML_BUILD_WINDOW)
 endif()
 
 # macOS specific options
-if(SFML_OS_MACOSX OR SFML_OS_IOS)
+if(SFML_OS_MACOS OR SFML_OS_IOS)
     # add an option to build frameworks instead of dylibs (release only)
     sfml_set_option(SFML_BUILD_FRAMEWORKS FALSE BOOL "TRUE to build SFML as frameworks libraries (release only), FALSE to build according to BUILD_SHARED_LIBS")
 
@@ -115,7 +115,7 @@ if(SFML_OS_WINDOWS OR SFML_OS_IOS)
     set(DEFAULT_INSTALL_MISC_DIR .)
 elseif(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_OPENBSD OR SFML_OS_NETBSD)
     set(DEFAULT_INSTALL_MISC_DIR share/SFML)
-elseif(SFML_OS_MACOSX)
+elseif(SFML_OS_MACOS)
     set(DEFAULT_INSTALL_MISC_DIR /usr/local/share/SFML)
 elseif(SFML_OS_ANDROID)
     set(DEFAULT_INSTALL_MISC_DIR ${CMAKE_ANDROID_NDK}/sources/third_party/sfml)
@@ -186,8 +186,8 @@ if(SFML_OS_WINDOWS)
     include(cmake/Mesa3D.cmake)
 endif()
 
-# setup Mac OS X stuff
-if(SFML_OS_MACOSX)
+# setup macOS stuff
+if(SFML_OS_MACOS)
     # SFML_BUILD_FRAMEWORKS needs two things:
     # first, it's available only for release
     #    (because cmake currently doesn't allow specifying a custom framework name so XXX-d is not possible)
@@ -249,8 +249,8 @@ if(SFML_ENABLE_PCH AND BUILD_SHARED_LIBS)
     message(FATAL_ERROR "Precompiled headers are currently not supported for shared library builds")
 endif()
 
-if(SFML_ENABLE_PCH AND SFML_OS_MACOSX)
-    message(FATAL_ERROR "Precompiled headers are currently not supported in MacOS builds")
+if(SFML_ENABLE_PCH AND SFML_OS_MACOS)
+    message(FATAL_ERROR "Precompiled headers are currently not supported in macOS builds")
 endif()
 
 # setup the install rules
@@ -389,36 +389,36 @@ if(SFML_OS_WINDOWS)
         endif()
     endif()
 
-elseif(SFML_OS_MACOSX)
+elseif(SFML_OS_MACOS)
     # install extlibs dependencies only when used
     if(SFML_BUILD_GRAPHICS)
-        if(FREETYPE_LIBRARY STREQUAL "${PROJECT_SOURCE_DIR}/extlibs/libs-osx/Frameworks/freetype.framework")
-            install(DIRECTORY extlibs/libs-osx/Frameworks/freetype.framework DESTINATION ${CMAKE_INSTALL_LIBDIR})
+        if(FREETYPE_LIBRARY STREQUAL "${PROJECT_SOURCE_DIR}/extlibs/libs-macos/Frameworks/freetype.framework")
+            install(DIRECTORY extlibs/libs-macos/Frameworks/freetype.framework DESTINATION ${CMAKE_INSTALL_LIBDIR})
         endif()
     endif()
 
     if(SFML_BUILD_AUDIO)
-        if(FLAC_LIBRARY STREQUAL "${PROJECT_SOURCE_DIR}/extlibs/libs-osx/Frameworks/FLAC.framework")
-            install(DIRECTORY extlibs/libs-osx/Frameworks/FLAC.framework DESTINATION ${CMAKE_INSTALL_LIBDIR})
+        if(FLAC_LIBRARY STREQUAL "${PROJECT_SOURCE_DIR}/extlibs/libs-macos/Frameworks/FLAC.framework")
+            install(DIRECTORY extlibs/libs-macos/Frameworks/FLAC.framework DESTINATION ${CMAKE_INSTALL_LIBDIR})
         endif()
 
-        if(OGG_LIBRARY STREQUAL "${PROJECT_SOURCE_DIR}/extlibs/libs-osx/Frameworks/ogg.framework")
-            install(DIRECTORY extlibs/libs-osx/Frameworks/ogg.framework DESTINATION ${CMAKE_INSTALL_LIBDIR})
+        if(OGG_LIBRARY STREQUAL "${PROJECT_SOURCE_DIR}/extlibs/libs-macos/Frameworks/ogg.framework")
+            install(DIRECTORY extlibs/libs-macos/Frameworks/ogg.framework DESTINATION ${CMAKE_INSTALL_LIBDIR})
         endif()
 
-        if(VORBIS_LIBRARY STREQUAL "${PROJECT_SOURCE_DIR}/extlibs/libs-osx/Frameworks/vorbis.framework")
-            install(DIRECTORY extlibs/libs-osx/Frameworks/vorbis.framework DESTINATION ${CMAKE_INSTALL_LIBDIR})
+        if(VORBIS_LIBRARY STREQUAL "${PROJECT_SOURCE_DIR}/extlibs/libs-macos/Frameworks/vorbis.framework")
+            install(DIRECTORY extlibs/libs-macos/Frameworks/vorbis.framework DESTINATION ${CMAKE_INSTALL_LIBDIR})
         endif()
 
-        if(VORBISENC_LIBRARY STREQUAL "${PROJECT_SOURCE_DIR}/extlibs/libs-osx/Frameworks/vorbisenc.framework")
-            install(DIRECTORY extlibs/libs-osx/Frameworks/vorbisenc.framework DESTINATION ${CMAKE_INSTALL_LIBDIR})
+        if(VORBISENC_LIBRARY STREQUAL "${PROJECT_SOURCE_DIR}/extlibs/libs-macos/Frameworks/vorbisenc.framework")
+            install(DIRECTORY extlibs/libs-macos/Frameworks/vorbisenc.framework DESTINATION ${CMAKE_INSTALL_LIBDIR})
         endif()
 
-        if(VORBISFILE_LIBRARY STREQUAL "${PROJECT_SOURCE_DIR}/extlibs/libs-osx/Frameworks/vorbisfile.framework")
-            install(DIRECTORY extlibs/libs-osx/Frameworks/vorbisfile.framework DESTINATION ${CMAKE_INSTALL_LIBDIR})
+        if(VORBISFILE_LIBRARY STREQUAL "${PROJECT_SOURCE_DIR}/extlibs/libs-macos/Frameworks/vorbisfile.framework")
+            install(DIRECTORY extlibs/libs-macos/Frameworks/vorbisfile.framework DESTINATION ${CMAKE_INSTALL_LIBDIR})
         endif()
 
-        if(OPENAL_LIBRARY STREQUAL "${PROJECT_SOURCE_DIR}/extlibs/libs-osx/Frameworks/OpenAL.framework")
+        if(OPENAL_LIBRARY STREQUAL "${PROJECT_SOURCE_DIR}/extlibs/libs-macos/Frameworks/OpenAL.framework")
             install(DIRECTORY "${OPENAL_LIBRARY}" DESTINATION ${CMAKE_INSTALL_LIBDIR})
         endif()
     endif()

cmake/Config.cmake

@@ -50,8 +50,8 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL "iOS")
     # use the OpenGL ES implementation on iOS
     set(OPENGL_ES 1)
 elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-    set(SFML_OS_MACOSX 1)
-    # don't use the OpenGL ES implementation on Mac OS X
+    set(SFML_OS_MACOS 1)
+    # don't use the OpenGL ES implementation on macOS
     set(OPENGL_ES 0)
 elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
     set(SFML_OS_ANDROID 1)

cmake/Macros.cmake

@@ -28,7 +28,7 @@ function(sfml_set_stdlib target)
         endif()
     endif()
 
-    if(SFML_OS_MACOSX)
+    if(SFML_OS_MACOS)
         if(${CMAKE_GENERATOR} MATCHES "Xcode")
             sfml_set_xcode_property(${target} CLANG_CXX_LIBRARY "libc++")
         elseif(NOT SFML_COMPILER_CLANG)
@@ -193,7 +193,7 @@ macro(sfml_add_library module)
     endif()
 
     # build frameworks or dylibs
-    if((SFML_OS_MACOSX OR SFML_OS_IOS) AND BUILD_SHARED_LIBS AND NOT THIS_STATIC)
+    if((SFML_OS_MACOS OR SFML_OS_IOS) AND BUILD_SHARED_LIBS AND NOT THIS_STATIC)
         if(SFML_BUILD_FRAMEWORKS)
             # adapt target to build frameworks instead of dylibs
             set_target_properties(${target} PROPERTIES

cmake/SFMLConfigDependencies.cmake.in

@@ -16,7 +16,7 @@ if(SFML_STATIC_LIBRARIES)
     elseif(${CMAKE_SYSTEM_NAME} MATCHES "iOS")
         set(FIND_SFML_OS_IOS 1)
     elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-        set(FIND_SFML_OS_MACOSX 1)
+        set(FIND_SFML_OS_MACOS 1)
     endif()
 
     # start with an empty list

doc/CMakeLists.txt

@@ -1,6 +1,6 @@
 
 # find doxygen
-if(SFML_OS_MACOSX)
+if(SFML_OS_MACOS)
     # Add some path to search doxygen in more directories.
     set(ADDITIONAL_PATHS
         /Developer/Applications/Doxygen.app/Contents/Resources

examples/CMakeLists.txt

@@ -34,7 +34,7 @@ if(SFML_BUILD_GRAPHICS)
         if(NOT SFML_USE_DRM)
             add_subdirectory(X11)
         endif()
-    elseif(SFML_OS_MACOSX AND ${CMAKE_GENERATOR} MATCHES "Xcode")
+    elseif(SFML_OS_MACOS AND ${CMAKE_GENERATOR} MATCHES "Xcode")
         add_subdirectory(cocoa)
     endif()
 endif()

examples/cocoa/NSString+stdstring.mm

@@ -64,7 +64,7 @@
 
 - (std::wstring)tostdwstring
 {
-    // According to Wikipedia, Mac OS X is Little Endian on x86 and x86-64
+    // According to Wikipedia, macOS is Little Endian on x86 and x86-64
     // https://en.wikipedia.org/wiki/Endianness
     NSData* asData = [self dataUsingEncoding:NSUTF32LittleEndianStringEncoding];
     return std::wstring(static_cast<const wchar_t*>([asData bytes]), [asData length] / sizeof(wchar_t));

examples/island/CMakeLists.txt

@@ -11,6 +11,6 @@ sfml_add_example(island GUI_APP
 target_include_directories(island SYSTEM PRIVATE ${PROJECT_SOURCE_DIR}/examples/island)
 
 # link against pthread
-if(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_MACOSX)
+if(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_MACOS)
     target_link_libraries(island PRIVATE pthread)
 endif()

include/SFML/Config.hpp

@@ -58,7 +58,7 @@
 
 #elif TARGET_OS_MAC
 
-// MacOS
+// macOS
 #define SFML_SYSTEM_MACOS
 
 #else
@@ -139,7 +139,7 @@
 
 #endif
 
-#else // Linux, FreeBSD, Mac OS X
+#else // Linux, FreeBSD, macOS
 
 #define SFML_API_EXPORT __attribute__((__visibility__("default")))
 #define SFML_API_IMPORT __attribute__((__visibility__("default")))

include/SFML/Window/Cursor.hpp

@@ -55,29 +55,29 @@ public:
     /// Refer to the following table to determine which cursor
     /// is available on which platform.
     ///
-    ///  Type                               | Linux | Mac OS X | Windows  |
-    /// ------------------------------------|:-----:|:--------:|:--------:|
-    ///  sf::Cursor::Arrow                  |  yes  |    yes   |   yes    |
-    ///  sf::Cursor::ArrowWait              |  no   |    no    |   yes    |
-    ///  sf::Cursor::Wait                   |  yes  |    no    |   yes    |
-    ///  sf::Cursor::Text                   |  yes  |    yes   |   yes    |
-    ///  sf::Cursor::Hand                   |  yes  |    yes   |   yes    |
-    ///  sf::Cursor::SizeHorizontal         |  yes  |    yes   |   yes    |
-    ///  sf::Cursor::SizeVertical           |  yes  |    yes   |   yes    |
-    ///  sf::Cursor::SizeTopLeftBottomRight |  no   |    yes*  |   yes    |
-    ///  sf::Cursor::SizeBottomLeftTopRight |  no   |    yes*  |   yes    |
-    ///  sf::Cursor::SizeLeft               |  yes  |    yes** |   yes**  |
-    ///  sf::Cursor::SizeRight              |  yes  |    yes** |   yes**  |
-    ///  sf::Cursor::SizeTop                |  yes  |    yes** |   yes**  |
-    ///  sf::Cursor::SizeBottom             |  yes  |    yes** |   yes**  |
-    ///  sf::Cursor::SizeTopLeft            |  yes  |    yes** |   yes**  |
-    ///  sf::Cursor::SizeTopRight           |  yes  |    yes** |   yes**  |
-    ///  sf::Cursor::SizeBottomLeft         |  yes  |    yes** |   yes**  |
-    ///  sf::Cursor::SizeBottomRight        |  yes  |    yes** |   yes**  |
-    ///  sf::Cursor::SizeAll                |  yes  |    no    |   yes    |
-    ///  sf::Cursor::Cross                  |  yes  |    yes   |   yes    |
-    ///  sf::Cursor::Help                   |  yes  |    yes*  |   yes    |
-    ///  sf::Cursor::NotAllowed             |  yes  |    yes   |   yes    |
+    ///  Type                               | Linux | macOS | Windows  |
+    /// ------------------------------------|:-----:|:-----:|:--------:|
+    ///  sf::Cursor::Arrow                  |  yes  | yes   |   yes    |
+    ///  sf::Cursor::ArrowWait              |  no   | no    |   yes    |
+    ///  sf::Cursor::Wait                   |  yes  | no    |   yes    |
+    ///  sf::Cursor::Text                   |  yes  | yes   |   yes    |
+    ///  sf::Cursor::Hand                   |  yes  | yes   |   yes    |
+    ///  sf::Cursor::SizeHorizontal         |  yes  | yes   |   yes    |
+    ///  sf::Cursor::SizeVertical           |  yes  | yes   |   yes    |
+    ///  sf::Cursor::SizeTopLeftBottomRight |  no   | yes*  |   yes    |
+    ///  sf::Cursor::SizeBottomLeftTopRight |  no   | yes*  |   yes    |
+    ///  sf::Cursor::SizeLeft               |  yes  | yes** |   yes**  |
+    ///  sf::Cursor::SizeRight              |  yes  | yes** |   yes**  |
+    ///  sf::Cursor::SizeTop                |  yes  | yes** |   yes**  |
+    ///  sf::Cursor::SizeBottom             |  yes  | yes** |   yes**  |
+    ///  sf::Cursor::SizeTopLeft            |  yes  | yes** |   yes**  |
+    ///  sf::Cursor::SizeTopRight           |  yes  | yes** |   yes**  |
+    ///  sf::Cursor::SizeBottomLeft         |  yes  | yes** |   yes**  |
+    ///  sf::Cursor::SizeBottomRight        |  yes  | yes** |   yes**  |
+    ///  sf::Cursor::SizeAll                |  yes  | no    |   yes    |
+    ///  sf::Cursor::Cross                  |  yes  | yes   |   yes    |
+    ///  sf::Cursor::Help                   |  yes  | yes*  |   yes    |
+    ///  sf::Cursor::NotAllowed             |  yes  | yes   |   yes    |
     ///
     ///  * These cursor types are undocumented so may not
     ///    be available on all versions, but have been tested on 10.13

include/SFML/Window/WindowHandle.hpp

@@ -49,7 +49,7 @@ using WindowHandle = unsigned long;
 
 #elif defined(SFML_SYSTEM_MACOS)
 
-// Window handle is NSWindow or NSView (void*) on Mac OS X - Cocoa
+// Window handle is NSWindow or NSView (void*) on macOS - Cocoa
 using WindowHandle = void*;
 
 #elif defined(SFML_SYSTEM_IOS)
@@ -83,13 +83,13 @@ using WindowHandle = "platform-specific";
 /// ----------------|------------------------------------------------------------
 /// Windows         | \p HWND
 /// Linux/FreeBSD   | \p %Window
-/// Mac OS X        | either \p NSWindow* or \p NSView*, disguised as \p void*
+/// macOS           | either \p NSWindow* or \p NSView*, disguised as \p void*
 /// iOS             | \p UIWindow*
 /// Android         | \p ANativeWindow*
 ///
-/// \par Mac OS X Specification
+/// \par macOS Specification
 ///
-/// On Mac OS X, a sf::Window can be created either from an
+/// On macOS, a sf::Window can be created either from an
 /// existing \p NSWindow* or an \p NSView*. When the window
 /// is created from a window, SFML will use its content view
 /// as the OpenGL area. sf::Window::getSystemHandle() will

src/SFML/Audio/CMakeLists.txt

@@ -57,11 +57,11 @@ set(CODECS_SRC
 )
 source_group("codecs" FILES ${CODECS_SRC})
 
-# let CMake know about our additional audio libraries paths (on Windows and OSX)
+# let CMake know about our additional audio libraries paths (on Windows and macOS)
 if(SFML_OS_WINDOWS)
     list(APPEND CMAKE_INCLUDE_PATH "${PROJECT_SOURCE_DIR}/extlibs/headers/AL")
-elseif(SFML_OS_MACOSX)
-    list(APPEND CMAKE_LIBRARY_PATH "${PROJECT_SOURCE_DIR}/extlibs/libs-osx/Frameworks")
+elseif(SFML_OS_MACOS)
+    list(APPEND CMAKE_LIBRARY_PATH "${PROJECT_SOURCE_DIR}/extlibs/libs-macos/Frameworks")
 elseif(SFML_OS_ANDROID)
     list(APPEND CMAKE_INCLUDE_PATH "${PROJECT_SOURCE_DIR}/extlibs/headers/AL")
     list(APPEND CMAKE_INCLUDE_PATH "${PROJECT_SOURCE_DIR}/extlibs/android")

src/SFML/Audio/SoundRecorder.cpp

@@ -246,7 +246,7 @@ unsigned int SoundRecorder::getChannelCount() const
 bool SoundRecorder::isAvailable()
 {
     return (priv::AudioDevice::isExtensionSupported("ALC_EXT_CAPTURE") != AL_FALSE) ||
-           (priv::AudioDevice::isExtensionSupported("ALC_EXT_capture") != AL_FALSE); // "bug" in Mac OS X 10.5 and 10.6
+           (priv::AudioDevice::isExtensionSupported("ALC_EXT_capture") != AL_FALSE); // "bug" in macOS 10.5 and 10.6
 }
 
 

src/SFML/CMakeLists.txt

@@ -20,9 +20,9 @@ if(SFML_OS_WINDOWS)
             list(APPEND CMAKE_LIBRARY_PATH "${PROJECT_SOURCE_DIR}/extlibs/libs-msvc-universal/x64")
         endif()
     endif()
-elseif(SFML_OS_MACOSX)
+elseif(SFML_OS_MACOS)
     list(APPEND CMAKE_INCLUDE_PATH "${PROJECT_SOURCE_DIR}/extlibs/headers")
-    list(APPEND CMAKE_LIBRARY_PATH "${PROJECT_SOURCE_DIR}/extlibs/libs-osx/lib/")
+    list(APPEND CMAKE_LIBRARY_PATH "${PROJECT_SOURCE_DIR}/extlibs/libs-macos/lib/")
 elseif(SFML_OS_IOS)
     list(APPEND CMAKE_INCLUDE_PATH "${PROJECT_SOURCE_DIR}/extlibs/headers")
     list(APPEND CMAKE_LIBRARY_PATH "${PROJECT_SOURCE_DIR}/extlibs/libs-ios/")

src/SFML/Graphics/CMakeLists.txt

@@ -101,9 +101,9 @@ target_include_directories(sfml-graphics SYSTEM PRIVATE "${PROJECT_SOURCE_DIR}/e
 # let CMake know about our additional graphics libraries paths
 if(SFML_OS_WINDOWS)
     list(APPEND CMAKE_INCLUDE_PATH "${PROJECT_SOURCE_DIR}/extlibs/headers/freetype2")
-elseif(SFML_OS_MACOSX)
+elseif(SFML_OS_MACOS)
     list(APPEND CMAKE_INCLUDE_PATH "${PROJECT_SOURCE_DIR}/extlibs/headers/freetype2")
-    list(APPEND CMAKE_LIBRARY_PATH "${PROJECT_SOURCE_DIR}/extlibs/libs-osx/Frameworks")
+    list(APPEND CMAKE_LIBRARY_PATH "${PROJECT_SOURCE_DIR}/extlibs/libs-macos/Frameworks")
 elseif(SFML_OS_IOS)
     list(APPEND CMAKE_INCLUDE_PATH "${PROJECT_SOURCE_DIR}/extlibs/headers/freetype2")
 elseif(SFML_OS_ANDROID)

src/SFML/Network/Socket.cpp

@@ -115,7 +115,7 @@ void Socket::create(SocketHandle handle)
                       << "all your TCP packets will be buffered" << std::endl;
             }
 
-// On Mac OS X, disable the SIGPIPE signal on disconnection
+// On macOS, disable the SIGPIPE signal on disconnection
 #ifdef SFML_SYSTEM_MACOS
             if (setsockopt(m_socket, SOL_SOCKET, SO_NOSIGPIPE, reinterpret_cast<char*>(&yes), sizeof(yes)) == -1)
             {

src/SFML/System/CMakeLists.txt

@@ -81,7 +81,7 @@ if(SFML_OS_ANDROID)
 endif()
 
 # setup dependencies
-if(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_MACOSX)
+if(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_MACOS)
     target_link_libraries(sfml-system PRIVATE pthread)
 endif()
 

src/SFML/Window/CMakeLists.txt

@@ -166,58 +166,58 @@ elseif(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_OPENBSD OR SFML_OS_NETBSD)
         )
     endif()
     source_group("unix" FILES ${PLATFORM_SRC})
-elseif(SFML_OS_MACOSX)
+elseif(SFML_OS_MACOS)
     enable_language(OBJC OBJCXX)
     set(PLATFORM_SRC
-        ${SRCROOT}/OSX/cpp_objc_conversion.h
-        ${SRCROOT}/OSX/cpp_objc_conversion.mm
-        ${SRCROOT}/OSX/cg_sf_conversion.hpp
-        ${SRCROOT}/OSX/cg_sf_conversion.mm
-        ${SRCROOT}/OSX/CursorImpl.hpp
-        ${SRCROOT}/OSX/CursorImpl.mm
-        ${SRCROOT}/OSX/ClipboardImpl.hpp
-        ${SRCROOT}/OSX/ClipboardImpl.mm
-        ${SRCROOT}/OSX/InputImpl.mm
-        ${SRCROOT}/OSX/InputImpl.hpp
-        ${SRCROOT}/OSX/HIDInputManager.hpp
-        ${SRCROOT}/OSX/HIDInputManager.mm
-        ${SRCROOT}/OSX/HIDJoystickManager.hpp
-        ${SRCROOT}/OSX/HIDJoystickManager.cpp
-        ${SRCROOT}/OSX/JoystickImpl.cpp
-        ${SRCROOT}/OSX/JoystickImpl.hpp
-        ${SRCROOT}/OSX/NSImage+raw.h
-        ${SRCROOT}/OSX/NSImage+raw.mm
-        ${SRCROOT}/OSX/Scaling.h
-        ${SRCROOT}/OSX/SensorImpl.cpp
-        ${SRCROOT}/OSX/SensorImpl.hpp
-        ${SRCROOT}/OSX/SFApplication.h
-        ${SRCROOT}/OSX/SFApplication.m
-        ${SRCROOT}/OSX/SFApplicationDelegate.h
-        ${SRCROOT}/OSX/SFApplicationDelegate.m
-        ${SRCROOT}/OSX/SFContext.hpp
-        ${SRCROOT}/OSX/SFContext.mm
-        ${SRCROOT}/OSX/SFKeyboardModifiersHelper.h
-        ${SRCROOT}/OSX/SFKeyboardModifiersHelper.mm
-        ${SRCROOT}/OSX/SFOpenGLView.h
-        ${SRCROOT}/OSX/SFOpenGLView.mm
-        ${SRCROOT}/OSX/SFOpenGLView+keyboard.mm
-        ${SRCROOT}/OSX/SFOpenGLView+keyboard_priv.h
-        ${SRCROOT}/OSX/SFOpenGLView+mouse.mm
-        ${SRCROOT}/OSX/SFOpenGLView+mouse_priv.h
-        ${SRCROOT}/OSX/SFSilentResponder.h
-        ${SRCROOT}/OSX/SFSilentResponder.m
-        ${SRCROOT}/OSX/SFWindow.h
-        ${SRCROOT}/OSX/SFWindow.m
-        ${SRCROOT}/OSX/SFWindowController.h
-        ${SRCROOT}/OSX/SFWindowController.mm
-        ${SRCROOT}/OSX/SFViewController.h
-        ${SRCROOT}/OSX/SFViewController.mm
-        ${SRCROOT}/OSX/VideoModeImpl.cpp
-        ${SRCROOT}/OSX/WindowImplCocoa.hpp
-        ${SRCROOT}/OSX/WindowImplCocoa.mm
-        ${SRCROOT}/OSX/WindowImplDelegateProtocol.h
-        ${SRCROOT}/OSX/AutoreleasePoolWrapper.hpp
-        ${SRCROOT}/OSX/AutoreleasePoolWrapper.mm
+        ${SRCROOT}/macOS/cpp_objc_conversion.h
+        ${SRCROOT}/macOS/cpp_objc_conversion.mm
+        ${SRCROOT}/macOS/cg_sf_conversion.hpp
+        ${SRCROOT}/macOS/cg_sf_conversion.mm
+        ${SRCROOT}/macOS/CursorImpl.hpp
+        ${SRCROOT}/macOS/CursorImpl.mm
+        ${SRCROOT}/macOS/ClipboardImpl.hpp
+        ${SRCROOT}/macOS/ClipboardImpl.mm
+        ${SRCROOT}/macOS/InputImpl.mm
+        ${SRCROOT}/macOS/InputImpl.hpp
+        ${SRCROOT}/macOS/HIDInputManager.hpp
+        ${SRCROOT}/macOS/HIDInputManager.mm
+        ${SRCROOT}/macOS/HIDJoystickManager.hpp
+        ${SRCROOT}/macOS/HIDJoystickManager.cpp
+        ${SRCROOT}/macOS/JoystickImpl.cpp
+        ${SRCROOT}/macOS/JoystickImpl.hpp
+        ${SRCROOT}/macOS/NSImage+raw.h
+        ${SRCROOT}/macOS/NSImage+raw.mm
+        ${SRCROOT}/macOS/Scaling.h
+        ${SRCROOT}/macOS/SensorImpl.cpp
+        ${SRCROOT}/macOS/SensorImpl.hpp
+        ${SRCROOT}/macOS/SFApplication.h
+        ${SRCROOT}/macOS/SFApplication.m
+        ${SRCROOT}/macOS/SFApplicationDelegate.h
+        ${SRCROOT}/macOS/SFApplicationDelegate.m
+        ${SRCROOT}/macOS/SFContext.hpp
+        ${SRCROOT}/macOS/SFContext.mm
+        ${SRCROOT}/macOS/SFKeyboardModifiersHelper.h
+        ${SRCROOT}/macOS/SFKeyboardModifiersHelper.mm
+        ${SRCROOT}/macOS/SFOpenGLView.h
+        ${SRCROOT}/macOS/SFOpenGLView.mm
+        ${SRCROOT}/macOS/SFOpenGLView+keyboard.mm
+        ${SRCROOT}/macOS/SFOpenGLView+keyboard_priv.h
+        ${SRCROOT}/macOS/SFOpenGLView+mouse.mm
+        ${SRCROOT}/macOS/SFOpenGLView+mouse_priv.h
+        ${SRCROOT}/macOS/SFSilentResponder.h
+        ${SRCROOT}/macOS/SFSilentResponder.m
+        ${SRCROOT}/macOS/SFWindow.h
+        ${SRCROOT}/macOS/SFWindow.m
+        ${SRCROOT}/macOS/SFWindowController.h
+        ${SRCROOT}/macOS/SFWindowController.mm
+        ${SRCROOT}/macOS/SFViewController.h
+        ${SRCROOT}/macOS/SFViewController.mm
+        ${SRCROOT}/macOS/VideoModeImpl.cpp
+        ${SRCROOT}/macOS/WindowImplCocoa.hpp
+        ${SRCROOT}/macOS/WindowImplCocoa.mm
+        ${SRCROOT}/macOS/WindowImplDelegateProtocol.h
+        ${SRCROOT}/macOS/AutoreleasePoolWrapper.hpp
+        ${SRCROOT}/macOS/AutoreleasePoolWrapper.mm
     )
     source_group("mac" FILES ${PLATFORM_SRC})
 elseif(SFML_OS_IOS)
@@ -294,7 +294,7 @@ target_include_directories(sfml-window SYSTEM PRIVATE "${PROJECT_SOURCE_DIR}/ext
 
 # When static linking on macOS, we need to add this flag for objective C to work
 # https://developer.apple.com/library/archive/qa/qa1490/_index.html
-if ((NOT BUILD_SHARED_LIBS) AND SFML_OS_MACOSX)
+if ((NOT BUILD_SHARED_LIBS) AND SFML_OS_MACOS)
     target_link_libraries(sfml-window PRIVATE -ObjC)
 endif()
 
@@ -335,7 +335,7 @@ elseif(SFML_OS_WINDOWS)
     target_link_libraries(sfml-window PRIVATE winmm gdi32)
 elseif(SFML_OS_FREEBSD)
     target_link_libraries(sfml-window PRIVATE usbhid)
-elseif(SFML_OS_MACOSX)
+elseif(SFML_OS_MACOS)
     target_link_libraries(sfml-window PRIVATE "-framework Foundation" "-framework AppKit" "-framework IOKit" "-framework Carbon")
 elseif(SFML_OS_IOS)
     target_link_libraries(sfml-window PUBLIC "-framework Foundation" "-framework UIKit" "-framework CoreGraphics" "-framework QuartzCore" "-framework CoreMotion")

src/SFML/Window/ClipboardImpl.hpp

@@ -39,7 +39,7 @@
 #include <SFML/Window/Unix/ClipboardImpl.hpp>
 #endif
 #elif defined(SFML_SYSTEM_MACOS)
-#include <SFML/Window/OSX/ClipboardImpl.hpp>
+#include <SFML/Window/macOS/ClipboardImpl.hpp>
 #elif defined(SFML_SYSTEM_IOS)
 #include <SFML/Window/iOS/ClipboardImpl.hpp>
 #elif defined(SFML_SYSTEM_ANDROID)

src/SFML/Window/CursorImpl.hpp

@@ -39,7 +39,7 @@
 #include <SFML/Window/Unix/CursorImpl.hpp>
 #endif
 #elif defined(SFML_SYSTEM_MACOS)
-#include <SFML/Window/OSX/CursorImpl.hpp>
+#include <SFML/Window/macOS/CursorImpl.hpp>
 #elif defined(SFML_SYSTEM_IOS)
 #include <SFML/Window/iOS/CursorImpl.hpp>
 #elif defined(SFML_SYSTEM_ANDROID)

src/SFML/Window/GlContext.cpp

@@ -86,7 +86,7 @@ using ContextType = sf::priv::GlxContext;
 
 #elif defined(SFML_SYSTEM_MACOS)
 
-#include <SFML/Window/OSX/SFContext.hpp>
+#include <SFML/Window/macOS/SFContext.hpp>
 using ContextType = sf::priv::SFContext;
 
 #elif defined(SFML_SYSTEM_IOS)

src/SFML/Window/InputImpl.hpp

@@ -39,7 +39,7 @@
 #include <SFML/Window/Unix/InputImpl.hpp>
 #endif
 #elif defined(SFML_SYSTEM_MACOS)
-#include <SFML/Window/OSX/InputImpl.hpp>
+#include <SFML/Window/macOS/InputImpl.hpp>
 #elif defined(SFML_SYSTEM_IOS)
 #include <SFML/Window/iOS/InputImpl.hpp>
 #elif defined(SFML_SYSTEM_ANDROID)

src/SFML/Window/JoystickImpl.hpp

@@ -81,7 +81,7 @@ struct JoystickState
 
 #elif defined(SFML_SYSTEM_MACOS)
 
-#include <SFML/Window/OSX/JoystickImpl.hpp>
+#include <SFML/Window/macOS/JoystickImpl.hpp>
 
 #elif defined(SFML_SYSTEM_IOS)
 

src/SFML/Window/SensorImpl.hpp

@@ -42,7 +42,7 @@
 
 #elif defined(SFML_SYSTEM_MACOS)
 
-#include <SFML/Window/OSX/SensorImpl.hpp>
+#include <SFML/Window/macOS/SensorImpl.hpp>
 
 #elif defined(SFML_SYSTEM_IOS)
 

src/SFML/Window/WindowImpl.cpp

@@ -69,7 +69,7 @@ using VulkanImplType = sf::priv::VulkanImplX11;
 
 #elif defined(SFML_SYSTEM_MACOS)
 
-#include <SFML/Window/OSX/WindowImplCocoa.hpp>
+#include <SFML/Window/macOS/WindowImplCocoa.hpp>
 using WindowImplType = sf::priv::WindowImplCocoa;
 
 #define SFML_VULKAN_IMPLEMENTATION_NOT_AVAILABLE

src/SFML/Window/macOS/AutoreleasePoolWrapper.mm

@@ -27,7 +27,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 
-#include <SFML/Window/OSX/AutoreleasePoolWrapper.hpp>
+#include <SFML/Window/macOS/AutoreleasePoolWrapper.hpp>
 
 #import <Foundation/Foundation.h>
 

src/SFML/Window/macOS/ClipboardImpl.mm

@@ -25,8 +25,8 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Window/OSX/AutoreleasePoolWrapper.hpp>
-#include <SFML/Window/OSX/ClipboardImpl.hpp>
+#include <SFML/Window/macOS/AutoreleasePoolWrapper.hpp>
+#include <SFML/Window/macOS/ClipboardImpl.hpp>
 
 #include <SFML/System/String.hpp>
 

src/SFML/Window/macOS/CursorImpl.hpp

@@ -49,7 +49,7 @@ using NSCursorRef = void*;
 namespace sf::priv
 {
 ////////////////////////////////////////////////////////////
-/// \brief Mac OS X implementation of Cursor
+/// \brief macOS implementation of Cursor
 ///
 ////////////////////////////////////////////////////////////
 class CursorImpl

src/SFML/Window/macOS/CursorImpl.mm

@@ -26,9 +26,9 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Window/OSX/AutoreleasePoolWrapper.hpp>
-#include <SFML/Window/OSX/CursorImpl.hpp>
-#import <SFML/Window/OSX/NSImage+raw.h>
+#include <SFML/Window/macOS/AutoreleasePoolWrapper.hpp>
+#include <SFML/Window/macOS/CursorImpl.hpp>
+#import <SFML/Window/macOS/NSImage+raw.h>
 
 #import <AppKit/AppKit.h>
 

src/SFML/Window/macOS/HIDInputManager.mm

@@ -26,7 +26,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Window/OSX/HIDInputManager.hpp>
+#include <SFML/Window/macOS/HIDInputManager.hpp>
 
 #include <SFML/System/Err.hpp>
 

src/SFML/Window/macOS/HIDJoystickManager.cpp

@@ -26,8 +26,8 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Window/OSX/HIDInputManager.hpp>
-#include <SFML/Window/OSX/HIDJoystickManager.hpp>
+#include <SFML/Window/macOS/HIDInputManager.hpp>
+#include <SFML/Window/macOS/HIDJoystickManager.hpp>
 
 ////////////////////////////////////////////////////////////
 // Private data

src/SFML/Window/macOS/InputImpl.hpp

@@ -35,7 +35,7 @@
 namespace sf::priv
 {
 ////////////////////////////////////////////////////////////
-/// \brief Mac OS X implementation of inputs (keyboard + mouse)
+/// \brief macOS implementation of inputs (keyboard + mouse)
 ///
 ////////////////////////////////////////////////////////////
 class InputImpl

src/SFML/Window/macOS/InputImpl.mm

@@ -26,12 +26,12 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Window/OSX/AutoreleasePoolWrapper.hpp>
-#include <SFML/Window/OSX/HIDInputManager.hpp>
-#include <SFML/Window/OSX/InputImpl.hpp>
-#import <SFML/Window/OSX/SFOpenGLView.h>
 #include <SFML/Window/VideoMode.hpp>
 #include <SFML/Window/Window.hpp>
+#include <SFML/Window/macOS/AutoreleasePoolWrapper.hpp>
+#include <SFML/Window/macOS/HIDInputManager.hpp>
+#include <SFML/Window/macOS/InputImpl.hpp>
+#import <SFML/Window/macOS/SFOpenGLView.h>
 
 #include <SFML/System/Err.hpp>
 

src/SFML/Window/macOS/JoystickImpl.cpp

@@ -27,9 +27,9 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/JoystickImpl.hpp>
-#include <SFML/Window/OSX/AutoreleasePoolWrapper.hpp>
-#include <SFML/Window/OSX/HIDInputManager.hpp>
-#include <SFML/Window/OSX/HIDJoystickManager.hpp>
+#include <SFML/Window/macOS/AutoreleasePoolWrapper.hpp>
+#include <SFML/Window/macOS/HIDInputManager.hpp>
+#include <SFML/Window/macOS/HIDJoystickManager.hpp>
 
 #include <SFML/System/Err.hpp>
 

src/SFML/Window/macOS/JoystickImpl.hpp

@@ -40,7 +40,7 @@
 namespace sf::priv
 {
 ////////////////////////////////////////////////////////////
-/// \brief Mac OS X implementation of joysticks
+/// \brief macOS implementation of joysticks
 ///
 ////////////////////////////////////////////////////////////
 class JoystickImpl

src/SFML/Window/macOS/NSImage+raw.mm

@@ -26,7 +26,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#import <SFML/Window/OSX/NSImage+raw.h>
+#import <SFML/Window/macOS/NSImage+raw.h>
 
 @implementation NSImage (raw)
 

src/SFML/Window/macOS/SFApplication.m

@@ -26,7 +26,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#import <SFML/Window/OSX/SFApplication.h>
+#import <SFML/Window/macOS/SFApplication.h>
 
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 

src/SFML/Window/macOS/SFApplicationDelegate.m

@@ -26,7 +26,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#import <SFML/Window/OSX/SFApplicationDelegate.h>
+#import <SFML/Window/macOS/SFApplicationDelegate.h>
 
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 

src/SFML/Window/macOS/SFContext.hpp

@@ -56,7 +56,7 @@ using NSWindowRef        = void*;
 namespace sf::priv
 {
 ////////////////////////////////////////////////////////////
-/// \brief OSX (Cocoa) implementation of OpenGL contexts
+/// \brief macOS (Cocoa) implementation of OpenGL contexts
 ///
 ////////////////////////////////////////////////////////////
 class SFContext : public GlContext

src/SFML/Window/macOS/SFContext.mm

@@ -26,9 +26,9 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Window/OSX/AutoreleasePoolWrapper.hpp>
-#include <SFML/Window/OSX/SFContext.hpp>
-#include <SFML/Window/OSX/WindowImplCocoa.hpp>
+#include <SFML/Window/macOS/AutoreleasePoolWrapper.hpp>
+#include <SFML/Window/macOS/SFContext.hpp>
+#include <SFML/Window/macOS/WindowImplCocoa.hpp>
 
 #include <SFML/System/Err.hpp>
 

src/SFML/Window/macOS/SFKeyboardModifiersHelper.mm

@@ -26,8 +26,8 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#import <SFML/Window/OSX/SFKeyboardModifiersHelper.h>
-#include <SFML/Window/OSX/WindowImplCocoa.hpp>
+#import <SFML/Window/macOS/SFKeyboardModifiersHelper.h>
+#include <SFML/Window/macOS/WindowImplCocoa.hpp>
 
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 

src/SFML/Window/macOS/SFOpenGLView+keyboard.mm

@@ -26,10 +26,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Window/OSX/HIDInputManager.hpp> // For localizedKeys and nonLocalizedKeys
-#import <SFML/Window/OSX/SFKeyboardModifiersHelper.h>
-#import <SFML/Window/OSX/SFOpenGLView+keyboard_priv.h>
-#include <SFML/Window/OSX/WindowImplCocoa.hpp>
+#include <SFML/Window/macOS/HIDInputManager.hpp> // For localizedKeys and nonLocalizedKeys
+#import <SFML/Window/macOS/SFKeyboardModifiersHelper.h>
+#import <SFML/Window/macOS/SFOpenGLView+keyboard_priv.h>
+#include <SFML/Window/macOS/WindowImplCocoa.hpp>
 
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 

src/SFML/Window/macOS/SFOpenGLView+keyboard_priv.h

@@ -27,7 +27,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/Mouse.hpp>
-#import <SFML/Window/OSX/SFOpenGLView.h>
+#import <SFML/Window/macOS/SFOpenGLView.h>
 
 #import <AppKit/AppKit.h>
 

src/SFML/Window/macOS/SFOpenGLView+mouse.mm

@@ -26,9 +26,9 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#import <SFML/Window/OSX/SFOpenGLView+mouse_priv.h>
-#import <SFML/Window/OSX/SFOpenGLView.h>
-#include <SFML/Window/OSX/WindowImplCocoa.hpp>
+#import <SFML/Window/macOS/SFOpenGLView+mouse_priv.h>
+#import <SFML/Window/macOS/SFOpenGLView.h>
+#include <SFML/Window/macOS/WindowImplCocoa.hpp>
 
 #include <cmath>
 

src/SFML/Window/macOS/SFOpenGLView+mouse_priv.h

@@ -27,7 +27,7 @@
 // Headers
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/Mouse.hpp>
-#import <SFML/Window/OSX/SFOpenGLView.h>
+#import <SFML/Window/macOS/SFOpenGLView.h>
 
 #import <AppKit/AppKit.h>
 

src/SFML/Window/macOS/SFOpenGLView.mm

@@ -26,10 +26,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#import <SFML/Window/OSX/SFOpenGLView+mouse_priv.h>
-#import <SFML/Window/OSX/SFOpenGLView.h>
-#import <SFML/Window/OSX/SFSilentResponder.h>
-#include <SFML/Window/OSX/WindowImplCocoa.hpp>
+#import <SFML/Window/macOS/SFOpenGLView+mouse_priv.h>
+#import <SFML/Window/macOS/SFOpenGLView.h>
+#import <SFML/Window/macOS/SFSilentResponder.h>
+#include <SFML/Window/macOS/WindowImplCocoa.hpp>
 
 #include <SFML/System/Err.hpp>
 

src/SFML/Window/macOS/SFSilentResponder.m

@@ -26,7 +26,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#import <SFML/Window/OSX/SFSilentResponder.h>
+#import <SFML/Window/macOS/SFSilentResponder.h>
 
 @implementation SFSilentResponder
 

src/SFML/Window/macOS/SFViewController.h

@@ -26,7 +26,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#import <SFML/Window/OSX/WindowImplDelegateProtocol.h>
+#import <SFML/Window/macOS/WindowImplDelegateProtocol.h>
 
 ////////////////////////////////////////////////////////////
 /// Predefine some classes

src/SFML/Window/macOS/SFViewController.mm

@@ -26,10 +26,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#import <SFML/Window/OSX/SFApplication.h>
-#import <SFML/Window/OSX/SFOpenGLView.h>
-#import <SFML/Window/OSX/SFViewController.h>
-#include <SFML/Window/OSX/WindowImplCocoa.hpp>
+#import <SFML/Window/macOS/SFApplication.h>
+#import <SFML/Window/macOS/SFOpenGLView.h>
+#import <SFML/Window/macOS/SFViewController.h>
+#include <SFML/Window/macOS/WindowImplCocoa.hpp>
 
 #include <SFML/System/Err.hpp>
 

src/SFML/Window/macOS/SFWindow.m

@@ -26,7 +26,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#import <SFML/Window/OSX/SFWindow.h>
+#import <SFML/Window/macOS/SFWindow.h>
 
 
 @implementation SFWindow

src/SFML/Window/macOS/SFWindowController.h

@@ -26,8 +26,8 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#import <SFML/Window/OSX/WindowImplDelegateProtocol.h>
 #include <SFML/Window/VideoMode.hpp>
+#import <SFML/Window/macOS/WindowImplDelegateProtocol.h>
 
 ////////////////////////////////////////////////////////////
 /// Predefine some classes

src/SFML/Window/macOS/SFWindowController.mm

@@ -26,16 +26,16 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#import <SFML/Window/OSX/NSImage+raw.h>
-#import <SFML/Window/OSX/SFApplication.h>
-#import <SFML/Window/OSX/SFOpenGLView.h>
-#import <SFML/Window/OSX/SFWindow.h>
-#import <SFML/Window/OSX/SFWindowController.h>
-#import <SFML/Window/OSX/Scaling.h>
-#include <SFML/Window/OSX/WindowImplCocoa.hpp>
 #include <SFML/Window/VideoMode.hpp>
 #include <SFML/Window/WindowHandle.hpp>
 #include <SFML/Window/WindowStyle.hpp>
+#import <SFML/Window/macOS/NSImage+raw.h>
+#import <SFML/Window/macOS/SFApplication.h>
+#import <SFML/Window/macOS/SFOpenGLView.h>
+#import <SFML/Window/macOS/SFWindow.h>
+#import <SFML/Window/macOS/SFWindowController.h>
+#import <SFML/Window/macOS/Scaling.h>
+#include <SFML/Window/macOS/WindowImplCocoa.hpp>
 
 #include <SFML/System/Err.hpp>
 

src/SFML/Window/macOS/Scaling.h

@@ -26,7 +26,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#import <SFML/Window/OSX/WindowImplDelegateProtocol.h>
+#import <SFML/Window/macOS/WindowImplDelegateProtocol.h>
 
 #import <AppKit/AppKit.h>