Skip to content

Commit 441a172

Browse files
Batres3Batres3
committed
Fixed issues with merge
 - Deleted extra files - Changed the github workflow - Changed build.zig to have x11 as default for linux
1 parent 0ed35ea commit 441a172

File tree

6 files changed

+49
-326
lines changed

6 files changed

+49
-326
lines changed

‎.appveyor.yml‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎.editorconfig‎

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎.github/CODEOWNERS‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎.github/workflows/build.yml‎

Lines changed: 46 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,49 @@
1-
name: Build
1+
name: CI
22
on:
3-
pull_request:
4-
push:
5-
branches: [ ci, master, latest, 3.3-stable ]
6-
workflow_dispatch:
7-
permissions:
8-
statuses: write
9-
contents: read
10-
3+
- push
4+
- pull_request
115
jobs:
12-
build-linux-clang:
13-
name: Linux (Clang)
14-
runs-on: ubuntu-latest
15-
timeout-minutes: 4
6+
x86_64-linux:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- name: Checkout
10+
uses: actions/checkout@v2
11+
with:
12+
submodules: 'true'
13+
- name: Setup Zig
14+
run: |
15+
sudo apt install xz-utils
16+
sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-linux-x86_64-0.14.0-dev.1911+3bf89f55c.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
17+
- name: build
18+
run: zig build
19+
x86_64-windows:
20+
runs-on: windows-latest
21+
steps:
22+
- name: Checkout
23+
uses: actions/checkout@v2
24+
with:
25+
submodules: 'true'
26+
- name: Setup Zig
27+
run: |
28+
$ProgressPreference = 'SilentlyContinue'
29+
Invoke-WebRequest -Uri "https://pkg.machengine.org/zig/zig-windows-x86_64-0.14.0-dev.1911+3bf89f55c.zip" -OutFile "C:\zig.zip"
30+
cd C:\
31+
7z x zig.zip
32+
Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.14.0-dev.1911+3bf89f55c\"
33+
- name: build
34+
run: zig build
35+
x86_64-macos:
36+
runs-on: macos-latest
37+
steps:
38+
- name: Checkout
39+
uses: actions/checkout@v2
40+
with:
41+
submodules: 'true'
42+
- name: Setup Zig
43+
run: |
44+
brew install xz
45+
sudo sh -c 'wget -c https://pkg.machengine.org/zig/zig-macos-x86_64-0.14.0-dev.1911+3bf89f55c.tar.xz -O - | tar -xJ --strip-components=1 -C /usr/local/bin'
46+
- name: build
47+
run: zig build
1648
env:
17-
CC: clang
18-
CFLAGS: -Werror
19-
steps:
20-
- uses: actions/checkout@v4
21-
- name: Install dependencies
22-
run: |
23-
sudo apt update
24-
sudo apt install libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev libwayland-dev libxkbcommon-dev
25-
26-
- name: Configure Null shared library
27-
run: cmake -B build-null-shared -D GLFW_BUILD_WAYLAND=OFF -D GLFW_BUILD_X11=OFF -D BUILD_SHARED_LIBS=ON
28-
- name: Build Null shared library
29-
run: cmake --build build-null-shared --parallel
30-
31-
- name: Configure X11 shared library
32-
run: cmake -B build-x11-shared -D GLFW_BUILD_WAYLAND=OFF -D GLFW_BUILD_X11=ON -D BUILD_SHARED_LIBS=ON
33-
- name: Build X11 shared library
34-
run: cmake --build build-x11-shared --parallel
35-
36-
- name: Configure Wayland shared library
37-
run: cmake -B build-wayland-shared -D GLFW_BUILD_WAYLAND=ON -D GLFW_BUILD_X11=OFF -D BUILD_SHARED_LIBS=ON
38-
- name: Build Wayland shared library
39-
run: cmake --build build-wayland-shared --parallel
40-
41-
- name: Configure Wayland+X11 static library
42-
run: cmake -B build-full-static -D GLFW_BUILD_WAYLAND=ON -D GLFW_BUILD_X11=ON
43-
- name: Build Wayland+X11 static library
44-
run: cmake --build build-full-static --parallel
45-
46-
- name: Configure Wayland+X11 shared library
47-
run: cmake -B build-full-shared -D GLFW_BUILD_WAYLAND=ON -D BUILD_SHARED_LIBS=ON -D GLFW_BUILD_X11=ON
48-
- name: Build Wayland+X11 shared library
49-
run: cmake --build build-full-shared --parallel
50-
51-
build-macos-clang:
52-
name: macOS (Clang)
53-
runs-on: macos-latest
54-
timeout-minutes: 4
55-
env:
56-
CFLAGS: -Werror
57-
MACOSX_DEPLOYMENT_TARGET: 10.11
58-
CMAKE_OSX_ARCHITECTURES: x86_64;arm64
59-
steps:
60-
- uses: actions/checkout@v4
61-
62-
- name: Configure Null shared library
63-
run: cmake -B build-null-shared -D GLFW_BUILD_COCOA=OFF -D BUILD_SHARED_LIBS=ON
64-
- name: Build Null shared library
65-
run: cmake --build build-null-shared --parallel
66-
67-
- name: Configure Cocoa static library
68-
run: cmake -B build-cocoa-static
69-
- name: Build Cocoa static library
70-
run: cmake --build build-cocoa-static --parallel
71-
72-
- name: Configure Cocoa shared library
73-
run: cmake -B build-cocoa-shared -D BUILD_SHARED_LIBS=ON
74-
- name: Build Cocoa shared library
75-
run: cmake --build build-cocoa-shared --parallel
76-
77-
build-windows-vs2022:
78-
name: Windows (VS2022)
79-
runs-on: windows-latest
80-
timeout-minutes: 4
81-
env:
82-
CFLAGS: /WX
83-
steps:
84-
- uses: actions/checkout@v4
85-
86-
- name: Configure Win32 shared x86 library
87-
run: cmake -B build-win32-shared-x86 -G "Visual Studio 17 2022" -A Win32 -D BUILD_SHARED_LIBS=ON
88-
- name: Build Win32 shared x86 library
89-
run: cmake --build build-win32-shared-x86 --parallel
90-
91-
- name: Configure Win32 static x64 library
92-
run: cmake -B build-win32-static-x64 -G "Visual Studio 17 2022" -A x64
93-
- name: Build Win32 static x64 library
94-
run: cmake --build build-win32-static-x64 --parallel
95-
96-
- name: Configure Win32 shared x64 library
97-
run: cmake -B build-win32-shared-x64 -G "Visual Studio 17 2022" -A x64 -D BUILD_SHARED_LIBS=ON
98-
- name: Build Win32 shared x64 library
99-
run: cmake --build build-win32-shared-x64 --parallel
100-
49+
AGREE: true

‎.gitignore‎

Lines changed: 1 addition & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,3 @@
1-
# The canonical out-of-tree build subdirectory
2-
build
3-
build-*
4-
5-
# Visual Studio clutter
6-
_ReSharper*
7-
*.sdf
8-
*.suo
9-
*.dir
10-
*.vcxproj*
11-
*.sln
12-
.vs
13-
CMakeSettings.json
14-
Win32
15-
x64
16-
Debug
17-
Release
18-
MinSizeRel
19-
RelWithDebInfo
20-
*.opensdf
21-
22-
# Xcode clutter
23-
GLFW.build
24-
GLFW.xcodeproj
25-
26-
# macOS clutter
27-
.DS_Store
28-
29-
# Makefile generator clutter
30-
Makefile
31-
32-
# Ninja generator clutter
33-
build.ninja
34-
rules.ninja
35-
.ninja_deps
36-
.ninja_log
37-
38-
# CMake clutter
39-
CMakeCache.txt
40-
CMakeFiles
41-
CMakeScripts
42-
CMakeDoxyfile.in
43-
CMakeDoxygenDefaults.cmake
44-
cmake_install.cmake
45-
cmake_uninstall.cmake
46-
47-
# Generated files
48-
docs/Doxyfile
49-
docs/html
50-
docs/warnings.txt
51-
docs/doxygen_sqlite3.db
52-
src/glfw_config.h
53-
src/glfw3.pc
54-
src/glfw3Config.cmake
55-
src/glfw3ConfigVersion.cmake
56-
57-
# Compiled binaries
58-
src/libglfw.so
59-
src/libglfw.so.3
60-
src/libglfw.so.3.5
61-
src/libglfw.dylib
62-
src/libglfw.dylib
63-
src/libglfw.3.dylib
64-
src/libglfw.3.5.dylib
65-
src/libglfw3.a
66-
src/glfw3.lib
67-
src/glfw3.dll
68-
src/glfw3dll.lib
69-
src/libglfw3dll.a
70-
examples/*.app
71-
examples/*.exe
72-
examples/boing
73-
examples/gears
74-
examples/heightmap
75-
examples/offscreen
76-
examples/particles
77-
examples/splitview
78-
examples/sharing
79-
examples/triangle-opengl
80-
examples/wave
81-
examples/windows
82-
tests/*.app
83-
tests/*.exe
84-
tests/clipboard
85-
tests/cursor
86-
tests/empty
87-
tests/events
88-
tests/gamma
89-
tests/glfwinfo
90-
tests/icon
91-
tests/iconify
92-
tests/inputlag
93-
tests/joysticks
94-
tests/monitors
95-
tests/msaa
96-
tests/reopen
97-
tests/tearing
98-
tests/threads
99-
tests/timeout
100-
tests/title
101-
tests/triangle-vulkan
102-
tests/window
103-
tests/windows
104-
1051
# Zig stuff
1062
zig-*
107-
.zig-cache
3+
.zig-cache

‎build.zig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ pub fn build(b: *std.Build) void {
77
const shared = b.option(bool, "shared", "Build as a shared library") orelse false;
88

99
const use_x11 = b.option(bool, "x11", "Build with X11. Only useful on Linux") orelse true;
10-
const use_wl = b.option(bool, "wayland", "Build with Wayland. Only useful on Linux") orelse true;
10+
const use_wl = b.option(bool, "wayland", "Build with Wayland. Only useful on Linux") orelse false;
1111

1212
const use_opengl = b.option(bool, "opengl", "Build with OpenGL; deprecated on MacOS") orelse false;
1313
const use_gles = b.option(bool, "gles", "Build with GLES; not supported on MacOS") orelse false;
14-
const use_metal = b.option(bool, "metal", "Build with Metal; only supported on MacOS") orelse true;
14+
const use_metal = b.option(bool, "metal", "Build with Metal; only supported on MacOS") orelse false;
1515

1616
const lib: *std.Build.Step.Compile = switch (shared) {
1717
inline else => |x| switch (x) {

0 commit comments

Comments
 (0)