Im support rebase 20240131

.appveyor.yml

@@ -15,10 +15,10 @@ environment:
  - GENERATOR: MinGW Makefiles
  BUILD_SHARED_LIBS: OFF
  CFLAGS: -Werror
- - GENERATOR: Visual Studio 10 2010
+ - GENERATOR: Visual Studio 12 2013
  BUILD_SHARED_LIBS: ON
  CFLAGS: /WX
- - GENERATOR: Visual Studio 10 2010
+ - GENERATOR: Visual Studio 12 2013
  BUILD_SHARED_LIBS: OFF
  CFLAGS: /WX
 matrix:
@@ -30,14 +30,14 @@ for:
  - GENERATOR: MinGW Makefiles
  build_script:
  - set PATH=%PATH:C:\Program Files\Git\usr\bin=C:\MinGW\bin%
- - cmake -S . -B build -G "%GENERATOR%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS%
+ - cmake -B build -G "%GENERATOR%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS%
  - cmake --build build
 -
  matrix:
  only:
- - GENERATOR: Visual Studio 10 2010
+ - GENERATOR: Visual Studio 12 2013
  build_script:
- - cmake -S . -B build -G "%GENERATOR%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS%
+ - cmake -B build -G "%GENERATOR%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS%
  - cmake --build build --target glfw
 notifications:
  - provider: Email

.editorconfig

@@ -0,0 +1,67 @@
+# EditorConfig for GLFW and its internal dependencies
+#
+# All files created by GLFW should indent with four spaces unless their format requires
+# otherwise. A few files still use other indent styles for historical reasons.
+#
+# Dependencies have (what seemed to be) their existing styles described. Those with
+# existing trailing whitespace have it preserved to avoid cluttering future commits.
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+
+[include/GLFW/*.h]
+indent_style = space
+indent_size = 4
+
+[{src,examples,tests}/*.{c,m,h,rc,in}]
+indent_style = space
+indent_size = 4
+
+[CMakeLists.txt]
+indent_style = space
+indent_size = 4
+
+[CMake/**.{cmake,in}]
+indent_style = space
+indent_size = 4
+
+[*.{dox,md}]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = false
+
+[DoxygenLayout.xml]
+indent_style = space
+indent_size = 2
+
+[docs/*.{scss,html}]
+indent_style = tab
+indent_size = unset
+
+[deps/mingw/*.h]
+indent_style = space
+indent_size = 4
+tab_width = 8
+trim_trailing_whitespace = false
+
+[deps/getopt.{c,h}]
+indent_style = space
+indent_size = 2
+
+[deps/linmath.h]
+indent_style = tab
+tab_width = 4
+indent_size = 4
+trim_trailing_whitespace = false
+
+[deps/nuklear*.h]
+indent_style = space
+indent_size = 4
+
+[deps/tinycthread.{c,h}]
+indent_style = space
+indent_size = 2
+

.github/CODEOWNERS

@@ -1,8 +1,6 @@
 
 * @elmindreda
 
-src/wl_* @linkmauve
-
 docs/*.css @glfw/webdev
 docs/*.scss @glfw/webdev
 docs/*.html @glfw/webdev

.github/workflows/build.yml

@@ -9,86 +9,92 @@ permissions:
  contents: read
 
 jobs:
- build-linux-x11-clang:
- name: X11 (Linux, Clang)
+ build-linux-clang:
+ name: Linux (Clang)
  runs-on: ubuntu-latest
+ timeout-minutes: 4
  env:
  CC: clang
  CFLAGS: -Werror
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
  - name: Install dependencies
  run: |
  sudo apt update
- sudo apt install libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev
+ sudo apt install libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev libwayland-dev libxkbcommon-dev
 
- - name: Configure static library
- run: cmake -S . -B build-static
- - name: Build static library
- run: cmake --build build-static --parallel
+ - name: Configure Null shared library
+ run: cmake -B build-null-shared -D GLFW_BUILD_WAYLAND=OFF -D GLFW_BUILD_X11=OFF -D BUILD_SHARED_LIBS=ON
+ - name: Build Null shared library
+ run: cmake --build build-null-shared --parallel
 
- - name: Configure shared library
- run: cmake -S . -B build-shared -D BUILD_SHARED_LIBS=ON
- - name: Build shared library
- run: cmake --build build-shared --parallel
+ - name: Configure X11 shared library
+ run: cmake -B build-x11-shared -D GLFW_BUILD_WAYLAND=OFF -D GLFW_BUILD_X11=ON -D BUILD_SHARED_LIBS=ON
+ - name: Build X11 shared library
+ run: cmake --build build-x11-shared --parallel
 
- build-linux-full-clang:
- name: X11+Wayland (Linux, Clang)
- runs-on: ubuntu-latest
- env:
- CC: clang
- CFLAGS: -Werror
- steps:
- - uses: actions/checkout@v3
- - name: Install dependencies
- run: |
- sudo apt update
- sudo apt install libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev wayland-protocols libwayland-dev libxkbcommon-dev
+ - name: Configure Wayland shared library
+ run: cmake -B build-wayland-shared -D GLFW_BUILD_WAYLAND=ON -D GLFW_BUILD_X11=OFF -D BUILD_SHARED_LIBS=ON
+ - name: Build Wayland shared library
+ run: cmake --build build-wayland-shared --parallel
 
- - name: Configure static library
- run: cmake -S . -B build-static -D GLFW_BUILD_WAYLAND=ON
- - name: Build static library
- run: cmake --build build-static --parallel
+ - name: Configure Wayland+X11 static library
+ run: cmake -B build-full-static -D GLFW_BUILD_WAYLAND=ON -D GLFW_BUILD_X11=ON
+ - name: Build Wayland+X11 static library
+ run: cmake --build build-full-static --parallel
 
- - name: Configure shared library
- run: cmake -S . -B build-shared -D GLFW_BUILD_WAYLAND=ON -D BUILD_SHARED_LIBS=ON
- - name: Build shared library
- run: cmake --build build-shared --parallel
+ - name: Configure Wayland+X11 shared library
+ run: cmake -B build-full-shared -D GLFW_BUILD_WAYLAND=ON -D BUILD_SHARED_LIBS=ON -D GLFW_BUILD_X11=ON
+ - name: Build Wayland+X11 shared library
+ run: cmake --build build-full-shared --parallel
 
- build-macos-cocoa-clang:
- name: Cocoa (macOS, Clang)
+ build-macos-clang:
+ name: macOS (Clang)
  runs-on: macos-latest
+ timeout-minutes: 4
  env:
  CFLAGS: -Werror
  MACOSX_DEPLOYMENT_TARGET: 10.8
+ CMAKE_OSX_ARCHITECTURES: x86_64;arm64
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
 
- - name: Configure static library
- run: cmake -S . -B build-static
- - name: Build static library
- run: cmake --build build-static --parallel
+ - name: Configure Null shared library
+ run: cmake -B build-null-shared -D GLFW_BUILD_COCOA=OFF -D BUILD_SHARED_LIBS=ON
+ - name: Build Null shared library
+ run: cmake --build build-null-shared --parallel
 
- - name: Configure shared library
- run: cmake -S . -B build-shared -D BUILD_SHARED_LIBS=ON
- - name: Build shared library
- run: cmake --build build-shared --parallel
+ - name: Configure Cocoa static library
+ run: cmake -B build-cocoa-static
+ - name: Build Cocoa static library
+ run: cmake --build build-cocoa-static --parallel
 
- build-windows-win32-vs2022:
- name: Win32 (Windows, VS2022)
+ - name: Configure Cocoa shared library
+ run: cmake -B build-cocoa-shared -D BUILD_SHARED_LIBS=ON
+ - name: Build Cocoa shared library
+ run: cmake --build build-cocoa-shared --parallel
+
+ build-windows-vs2022:
+ name: Windows (VS2022)
  runs-on: windows-latest
+ timeout-minutes: 4
  env:
  CFLAGS: /WX
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
+
+ - name: Configure Win32 shared x86 library
+ run: cmake -B build-win32-shared-x86 -G "Visual Studio 17 2022" -A Win32 -D BUILD_SHARED_LIBS=ON
+ - name: Build Win32 shared x86 library
+ run: cmake --build build-win32-shared-x86 --parallel
 
- - name: Configure static library
- run: cmake -S . -B build-static -G "Visual Studio 17 2022"
- - name: Build static library
- run: cmake --build build-static --parallel
+ - name: Configure Win32 static x64 library
+ run: cmake -B build-win32-static-x64 -G "Visual Studio 17 2022" -A x64
+ - name: Build Win32 static x64 library
+ run: cmake --build build-win32-static-x64 --parallel
 
- - name: Configure shared library
- run: cmake -S . -B build-shared -G "Visual Studio 17 2022" -D BUILD_SHARED_LIBS=ON
- - name: Build shared library
- run: cmake --build build-shared --parallel
+ - name: Configure Win32 shared x64 library
+ run: cmake -B build-win32-shared-x64 -G "Visual Studio 17 2022" -A x64 -D BUILD_SHARED_LIBS=ON
+ - name: Build Win32 shared x64 library
+ run: cmake --build build-win32-shared-x64 --parallel
 

.gitignore

@@ -1,5 +1,6 @@
 # The canonical out-of-tree build subdirectory
 build
+build-*
 
 # Visual Studio clutter
 _ReSharper*

CMake/glfw3.pc.in

@@ -8,6 +8,6 @@ Description: A multi-platform library for OpenGL, window and input
 Version: @GLFW_VERSION@
 URL: https://www.glfw.org/
 Requires.private: @GLFW_PKG_CONFIG_REQUIRES_PRIVATE@
-Libs: -L${libdir} -l@GLFW_LIB_NAME@
+Libs: -L${libdir} -l@GLFW_LIB_NAME@@GLFW_LIB_NAME_SUFFIX@
 Libs.private: @GLFW_PKG_CONFIG_LIBS_PRIVATE@
 Cflags: -I${includedir}

CMakeLists.txt

@@ -27,11 +27,15 @@ if (GLFW_USE_OSMESA)
  message(FATAL_ERROR "GLFW_USE_OSMESA has been removed; set the GLFW_PLATFORM init hint")
 endif()
 
+if (DEFINED GLFW_USE_WAYLAND AND UNIX AND NOT APPLE)
+ message(FATAL_ERROR
+ "GLFW_USE_WAYLAND has been removed; set the GLFW_BUILD_WAYLAND and GLFW_BUILD_X11 options")
+endif()
+
 cmake_dependent_option(GLFW_BUILD_WIN32 "Build support for Win32" ON "WIN32" OFF)
 cmake_dependent_option(GLFW_BUILD_COCOA "Build support for Cocoa" ON "APPLE" OFF)
 cmake_dependent_option(GLFW_BUILD_X11 "Build support for X11" ON "UNIX;NOT APPLE" OFF)
-cmake_dependent_option(GLFW_BUILD_WAYLAND "Build support for Wayland"
- "${GLFW_USE_WAYLAND}" "UNIX;NOT APPLE" OFF)
+cmake_dependent_option(GLFW_BUILD_WAYLAND "Build support for Wayland" ON "UNIX;NOT APPLE" OFF)
 
 cmake_dependent_option(GLFW_USE_HYBRID_HPG "Force use of high-performance GPU on hybrid systems" OFF
  "WIN32" OFF)