Skip to content

Commit fb853ea

Browse files
Merge branch 'raysan5:master' into Add-RL_POINTS
2 parents 27ea78e + 9400199 commit fb853ea

172 files changed

Lines changed: 15080 additions & 4022 deletions

File tree

Some content is hidden

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

.github/workflows/build_android.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,20 @@ jobs:
2828
max-parallel: 1
2929
matrix:
3030
ARCH: ["arm64", "x86_64"]
31-
31+
3232
env:
3333
RELEASE_NAME: raylib-dev_android_api29_${{ matrix.ARCH }}
34-
34+
3535
steps:
3636
- name: Checkout
3737
uses: actions/checkout@master
38-
38+
3939
- name: Setup Release Version
4040
run: |
4141
echo "RELEASE_NAME=raylib-${{ github.event.release.tag_name }}_android_api29_${{ matrix.ARCH }}" >> $GITHUB_ENV
4242
shell: bash
4343
if: github.event_name == 'release' && github.event.action == 'published'
44-
44+
4545
- name: Setup Android NDK
4646
id: setup-ndk
4747
uses: nttld/setup-ndk@v1
@@ -52,15 +52,15 @@ jobs:
5252
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
5353

5454
- name: Setup Environment
55-
run: |
55+
run: |
5656
mkdir build
5757
cd build
5858
mkdir ${{ env.RELEASE_NAME }}
5959
cd ${{ env.RELEASE_NAME }}
6060
mkdir include
6161
mkdir lib
6262
cd ../..
63-
63+
6464
# Generating static + shared library for 64bit arquitectures and API version 29
6565
- name: Build Library
6666
run: |
@@ -69,7 +69,7 @@ jobs:
6969
make PLATFORM=PLATFORM_ANDROID ANDROID_ARCH=${{ matrix.ARCH }} ANDROID_API_VERSION=29 ANDROID_NDK=${{ env.ANDROID_NDK_HOME }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
7070
cd ..
7171
shell: cmd
72-
72+
7373
- name: Generate Artifacts
7474
run: |
7575
cp -v ./src/raylib.h ./build/${{ env.RELEASE_NAME }}/include
@@ -80,15 +80,15 @@ jobs:
8080
cp -v ./LICENSE ./build/${{ env.RELEASE_NAME }}/LICENSE
8181
cd build
8282
tar -czvf ${{ env.RELEASE_NAME }}.tar.gz ${{ env.RELEASE_NAME }}
83-
83+
8484
- name: Upload Artifacts
8585
uses: actions/upload-artifact@v4
8686
with:
8787
name: ${{ env.RELEASE_NAME }}
8888
path: |
8989
./build/${{ env.RELEASE_NAME }}
9090
!./build/${{ env.RELEASE_NAME }}.tar.gz
91-
91+
9292
- name: Upload Artifact to Release
9393
uses: softprops/action-gh-release@v1
9494
with:

.github/workflows/build_examples_linux.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ jobs:
2323
steps:
2424
- name: Checkout code
2525
uses: actions/checkout@v4
26-
26+
2727
- name: Setup Environment
28-
run: |
28+
run: |
2929
sudo apt-get update -qq
3030
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
31-
31+
3232
- name: Build Library
3333
run: |
3434
cd src
3535
make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_LIBTYPE=STATIC
3636
cd ..
37-
37+
3838
- name: Build Examples
3939
run: |
4040
cd examples

.github/workflows/build_examples_windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
- 'src/**'
1414
- 'examples/**'
1515
- '.github/workflows/windows_examples.yml'
16-
16+
1717
permissions:
1818
contents: read
1919

.github/workflows/build_linux.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,23 @@ jobs:
4242
ARCH_NAME: "arm64"
4343
COMPILER_PATH: "/usr/bin"
4444
runner: "ubuntu-24.04-arm"
45-
45+
4646
runs-on: ${{ matrix.runner }}
4747
env:
4848
RELEASE_NAME: raylib-dev_linux_${{ matrix.ARCH_NAME }}
49-
49+
5050
steps:
5151
- name: Checkout code
5252
uses: actions/checkout@master
53-
53+
5454
- name: Setup Release Version
5555
run: |
5656
echo "RELEASE_NAME=raylib-${{ github.event.release.tag_name }}_linux_${{ matrix.ARCH_NAME }}" >> $GITHUB_ENV
5757
shell: bash
5858
if: github.event_name == 'release' && github.event.action == 'published'
59-
59+
6060
- name: Setup Environment
61-
run: |
61+
run: |
6262
sudo apt-get update -qq
6363
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
6464
mkdir build
@@ -74,7 +74,7 @@ jobs:
7474
run : |
7575
sudo apt-get install gcc-multilib
7676
if: matrix.bits == 32 && matrix.ARCH == 'i386'
77-
77+
7878
# TODO: Support 32bit (i386) static/shared library building
7979
- name: Build Library (32-bit)
8080
run: |
@@ -91,15 +91,15 @@ jobs:
9191
make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
9292
cd ..
9393
if: matrix.bits == 64 && matrix.ARCH == 'x86_64'
94-
94+
9595
- name: Build Library (64-bit ARM)
9696
run: |
9797
cd src
9898
make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
9999
make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
100100
cd ..
101101
if: matrix.bits == 64 && matrix.ARCH == 'aarch64'
102-
102+
103103
- name: Generate Artifacts
104104
run: |
105105
cp -v ./src/raylib.h ./build/${{ env.RELEASE_NAME }}/include
@@ -110,15 +110,15 @@ jobs:
110110
cp -v ./LICENSE ./build/${{ env.RELEASE_NAME }}/LICENSE
111111
cd build
112112
tar -czvf ${{ env.RELEASE_NAME }}.tar.gz ${{ env.RELEASE_NAME }}
113-
113+
114114
- name: Upload Artifacts
115115
uses: actions/upload-artifact@v4
116116
with:
117117
name: ${{ env.RELEASE_NAME }}
118118
path: |
119119
./build/${{ env.RELEASE_NAME }}
120120
!./build/${{ env.RELEASE_NAME }}.tar.gz
121-
121+
122122
- name: Upload Artifact to Release
123123
uses: softprops/action-gh-release@v1
124124
with:

.github/workflows/build_macos.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,70 +23,70 @@ jobs:
2323
permissions:
2424
contents: write # for actions/upload-release-asset to upload release asset
2525
runs-on: macos-latest
26-
26+
2727
env:
2828
RELEASE_NAME: raylib-dev_macos
29-
29+
3030
steps:
3131
- name: Checkout
3232
uses: actions/checkout@master
33-
33+
3434
- name: Setup Release Version
3535
run: |
3636
echo "RELEASE_NAME=raylib-${{ github.event.release.tag_name }}_macos" >> $GITHUB_ENV
3737
shell: bash
3838
if: github.event_name == 'release' && github.event.action == 'published'
3939

4040
- name: Setup Environment
41-
run: |
41+
run: |
4242
mkdir build
4343
cd build
4444
mkdir ${{ env.RELEASE_NAME }}
4545
cd ${{ env.RELEASE_NAME }}
4646
mkdir include
4747
mkdir lib
4848
cd ../..
49-
49+
5050
# Generating static + shared library, note that i386 architecture is deprecated
5151
# Defining GL_SILENCE_DEPRECATION because OpenGL is deprecated on macOS
5252
- name: Build Library
5353
run: |
5454
cd src
5555
clang --version
56-
56+
5757
# Extract version numbers from Makefile
5858
brew install grep
5959
RAYLIB_API_VERSION=`ggrep -Po 'RAYLIB_API_VERSION\s*=\s\K(.*)' Makefile`
6060
RAYLIB_VERSION=`ggrep -Po 'RAYLIB_VERSION\s*=\s\K(.*)' Makefile`
61-
61+
6262
# Build raylib x86_64 static
6363
make PLATFORM=PLATFORM_DESKTOP RAYLIB_LIBTYPE=STATIC CUSTOM_CFLAGS="-target x86_64-apple-macos10.12 -DGL_SILENCE_DEPRECATION"
6464
mv libraylib.a /tmp/libraylib_x86_64.a
6565
make clean
66-
66+
6767
# Build raylib arm64 static
6868
make PLATFORM=PLATFORM_DESKTOP RAYLIB_LIBTYPE=STATIC CUSTOM_CFLAGS="-target arm64-apple-macos11 -DGL_SILENCE_DEPRECATION" -B
6969
mv libraylib.a /tmp/libraylib_arm64.a
7070
make clean
71-
71+
7272
# Join x86_64 and arm64 static
7373
lipo -create -output ../build/${{ env.RELEASE_NAME }}/lib/libraylib.a /tmp/libraylib_x86_64.a /tmp/libraylib_arm64.a
74-
74+
7575
# Build raylib x86_64 dynamic
7676
make PLATFORM=PLATFORM_DESKTOP RAYLIB_LIBTYPE=SHARED CUSTOM_CFLAGS="-target x86_64-apple-macos10.12 -DGL_SILENCE_DEPRECATION" CUSTOM_LDFLAGS="-target x86_64-apple-macos10.12" -B
7777
mv libraylib.${RAYLIB_VERSION}.dylib /tmp/libraylib_x86_64.${RAYLIB_VERSION}.dylib
7878
make clean
79-
79+
8080
# Build raylib arm64 dynamic
8181
make PLATFORM=PLATFORM_DESKTOP RAYLIB_LIBTYPE=SHARED CUSTOM_CFLAGS="-target arm64-apple-macos11 -DGL_SILENCE_DEPRECATION" CUSTOM_LDFLAGS="-target arm64-apple-macos11" -B
8282
mv libraylib.${RAYLIB_VERSION}.dylib /tmp/libraylib_arm64.${RAYLIB_VERSION}.dylib
83-
83+
8484
# Join x86_64 and arm64 dynamic
8585
lipo -create -output ../build/${{ env.RELEASE_NAME }}/lib/libraylib.${RAYLIB_VERSION}.dylib /tmp/libraylib_x86_64.${RAYLIB_VERSION}.dylib /tmp/libraylib_arm64.${RAYLIB_VERSION}.dylib
8686
ln -sv libraylib.${RAYLIB_VERSION}.dylib ../build/${{ env.RELEASE_NAME }}/lib/libraylib.dylib
8787
ln -sv libraylib.${RAYLIB_VERSION}.dylib ../build/${{ env.RELEASE_NAME }}/lib/libraylib.${RAYLIB_API_VERSION}.dylib
8888
cd ..
89-
89+
9090
- name: Generate Artifacts
9191
run: |
9292
cp -v ./src/raylib.h ./build/${{ env.RELEASE_NAME }}/include
@@ -97,15 +97,15 @@ jobs:
9797
cp -v ./LICENSE ./build/${{ env.RELEASE_NAME }}/LICENSE
9898
cd build
9999
tar -czvf ${{ env.RELEASE_NAME }}.tar.gz ${{ env.RELEASE_NAME }}
100-
100+
101101
- name: Upload Artifacts
102102
uses: actions/upload-artifact@v4
103103
with:
104104
name: ${{ env.RELEASE_NAME }}
105105
path: |
106106
./build/${{ env.RELEASE_NAME }}
107107
!./build/${{ env.RELEASE_NAME }}.tar.gz
108-
108+
109109
- name: Upload Artifact to Release
110110
uses: softprops/action-gh-release@v1
111111
with:

.github/workflows/update_examples.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ on:
1212
jobs:
1313
build:
1414
runs-on: ubuntu-latest
15-
15+
1616
steps:
1717
- name: Checkout
1818
uses: actions/checkout@v4
19-
19+
2020
- name: Setup emsdk
2121
uses: mymindstorm/setup-emsdk@v14
2222
with:

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,15 @@ GTAGS
118118
# Zig programming language
119119
.zig-cache/
120120
zig-cache/
121+
zig-pkg/
121122
zig-out/
122123
build/
123124
build-*/
124125
docgen_tmp/
125126

126127
# Tools stuff
127-
tools/parser/rlparser.exe
128-
tools/parser/rlparser
128+
tools/rlparser/rlparser.exe
129+
tools/rlparser/rlparser
129130
tools/rexm/rexm.exe
130131
tools/rexm/rexm
131132

0 commit comments

Comments
 (0)