Skip to content

Commit 23de0e6

Browse files
raysan5raysan5
authored
Merge branch 'master' into win32
2 parents d092973 + ed3b5b2 commit 23de0e6

File tree

511 files changed

+38703
-16086
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

511 files changed

+38703
-16086
lines changed

.github/workflows/codeql.yml renamed to .github/workflows/analyze_codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# You may wish to alter this file to override the set of languages analyzed,
55
# or to provide custom queries or build logic.
6-
name: "CodeQL"
6+
name: Analyze raylib with CodeQL
77

88
on:
99
workflow_dispatch:

.github/workflows/android.yml renamed to .github/workflows/build_android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Android
1+
name: Build raylib - Android
22

33
on:
44
workflow_dispatch:

.github/workflows/cmake.yml renamed to .github/workflows/build_cmake.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: CMakeBuilds
1+
name: Build raylib CMake - Windows+Linux
22

33
on:
44
workflow_dispatch:

.github/workflows/linux_examples.yml renamed to .github/workflows/build_examples_linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Linux Examples
1+
name: Build raylib examples - Linux
22

33
on:
44
workflow_dispatch:

.github/workflows/windows_examples.yml renamed to .github/workflows/build_examples_windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Windows Examples
1+
name: Build raylib examples - Windows
22

33
on:
44
workflow_dispatch:

.github/workflows/linux.yml renamed to .github/workflows/build_linux.yml

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Linux
1+
name: Build raylib - Linux
22

33
on:
44
workflow_dispatch:
@@ -22,22 +22,28 @@ jobs:
2222
build:
2323
permissions:
2424
contents: write # for actions/upload-release-asset to upload release asset
25-
runs-on: ubuntu-latest
2625
strategy:
2726
fail-fast: false
2827
max-parallel: 1
2928
matrix:
30-
bits: [32, 64]
3129
include:
3230
- bits: 32
3331
ARCH: "i386"
3432
ARCH_NAME: "i386"
35-
COMPILER_PATH: "/user/bin"
33+
COMPILER_PATH: "/usr/bin"
34+
runner: "ubuntu-latest"
3635
- bits: 64
3736
ARCH: "x86_64"
3837
ARCH_NAME: "amd64"
39-
COMPILER_PATH: "/user/bin"
38+
COMPILER_PATH: "/usr/bin"
39+
runner: "ubuntu-latest"
40+
- bits: 64
41+
ARCH: "aarch64"
42+
ARCH_NAME: "arm64"
43+
COMPILER_PATH: "/usr/bin"
44+
runner: "ubuntu-24.04-arm"
4045

46+
runs-on: ${{ matrix.runner }}
4147
env:
4248
RELEASE_NAME: raylib-dev_linux_${{ matrix.ARCH_NAME }}
4349

@@ -54,7 +60,6 @@ jobs:
5460
- name: Setup Environment
5561
run: |
5662
sudo apt-get update -qq
57-
sudo apt-get install gcc-multilib
5863
sudo apt-get install -y --no-install-recommends libglfw3 libglfw3-dev libx11-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libxext-dev libxfixes-dev libwayland-dev libxkbcommon-dev
5964
mkdir build
6065
cd build
@@ -64,23 +69,36 @@ jobs:
6469
mkdir lib
6570
cd ../../../raylib
6671
# ${{ matrix.ARCH }}-linux-gnu-gcc -v
72+
73+
- name: Setup Environment (x86)
74+
run : |
75+
sudo apt-get install gcc-multilib
76+
if: matrix.bits == 32 && matrix.ARCH == 'i386'
6777

6878
# TODO: Support 32bit (i386) static/shared library building
69-
- name: Build Library
79+
- name: Build Library (32-bit)
7080
run: |
7181
cd src
7282
make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" CUSTOM_CFLAGS="-m32" -B
7383
# make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
7484
cd ..
7585
if: matrix.bits == 32
7686

77-
- name: Build Library
87+
- name: Build Library (64-bit x86)
88+
run: |
89+
cd src
90+
make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
91+
make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
92+
cd ..
93+
if: matrix.bits == 64 && matrix.ARCH == 'x86_64'
94+
95+
- name: Build Library (64-bit ARM)
7896
run: |
7997
cd src
8098
make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
8199
make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
82100
cd ..
83-
if: matrix.bits == 64
101+
if: matrix.bits == 64 && matrix.ARCH == 'aarch64'
84102

85103
- name: Generate Artifacts
86104
run: |

.github/workflows/macos.yml renamed to .github/workflows/build_macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: macOS
1+
name: Build raylib - macOS
22

33
on:
44
workflow_dispatch:

.github/workflows/webassembly.yml renamed to .github/workflows/build_webassembly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: WebAssembly
1+
name: Build raylib - WebAssembly
22

33
on:
44
workflow_dispatch:

.github/workflows/windows.yml renamed to .github/workflows/build_windows.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Windows
1+
name: Build raylib - Windows
22

33
on:
44
workflow_dispatch:
@@ -54,7 +54,6 @@ jobs:
5454
- compiler: mingw-w64
5555
ziptarget: winarm64 # We don't build arm64 with mingw-w64 yet
5656

57-
5857
env:
5958
RELEASE_NAME: raylib-dev_${{ matrix.ziptarget }}_${{ matrix.compiler }}
6059
GNUTARGET: default

.github/workflows/parse.yml renamed to .github/workflows/parse_api.yml

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
1-
name: Parse raylib_api
2-
3-
on:
4-
workflow_dispatch:
5-
push:
6-
paths:
7-
- "src/raylib.h"
8-
9-
jobs:
10-
build:
11-
runs-on: ubuntu-latest
12-
13-
steps:
14-
- uses: actions/checkout@v4
15-
16-
- name: Update parse files
17-
working-directory: parser
18-
run: |
19-
make raylib_api
20-
mv raylib_api.* output
21-
22-
- name: Diff parse files
23-
id: diff
24-
run: |
25-
git add -N parser
26-
git diff --name-only --exit-code
27-
continue-on-error: true
28-
29-
- name: Commit parse files
30-
if: steps.diff.outcome == 'failure'
31-
run: |
32-
set -x
33-
git config user.email "github-actions[bot]@users.noreply.github.com"
34-
git config user.name "github-actions[bot]"
35-
git add parser
36-
git commit -m "Update raylib_api.* by CI"
37-
git push
1+
name: Parse raylib API
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
paths:
7+
- "src/raylib.h"
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v4
15+
16+
- name: Update parse files
17+
working-directory: tools/parser
18+
run: |
19+
make raylib_api
20+
mv raylib_api.* output
21+
22+
- name: Diff parse files
23+
id: diff
24+
run: |
25+
git add -N parser
26+
git diff --name-only --exit-code
27+
continue-on-error: true
28+
29+
- name: Commit parse files
30+
if: steps.diff.outcome == 'failure'
31+
run: |
32+
set -x
33+
git config user.name "github-actions[bot]"
34+
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
35+
git add tools/parser
36+
git commit -m "Update raylib_api.* by CI"
37+
git push

0 commit comments

Comments
 (0)