mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve script generating glad headers

Browse Source 
The script assumes glad got cloned into glad subdirectory. This is the
case if you follow the procedure outlined in the README, however if you
are using system glad or or glad installed via pip this assumption
doesn't hold.

Therefore relax the requirement on where to get glad from. While at it
add shell option errexit and make the script callable from repository root.

Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
This commit is contained in:
Ralph Sennhauser
2024-11-04 18:36:28 +01:00
parent eecc5a8fea
commit 50aae8763f
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/third_party/glad/README.md
Vendored
+4
View File
@@ -4,6 +4,10 @@ This folder contains the files generated by the glad GL loader for the game.
## Instructions
Install glad via package manager or pip, for the latter create a venv if
necessary. Alternatively fetch the glad git repo as outlined below. On
Windows fetching the git repo is assumed.
Download glad v2:
```sh
git clone https://github.com/Dav1dde/glad.git -b glad2
source/third_party/glad/update-headers.sh
Vendored
+16 -9
View File
@@ -1,14 +1,21 @@
#!/bin/sh
(
cd glad || exit
python -m glad --api="gl:core=2.1" --extensions="../extensions/gl.txt" --out-path="../" c
python -m glad --api="gles2=2.0" --extensions="../extensions/gles2.txt" --out-path="../" c
python -m glad --api="glx=1.4" --extensions="../extensions/glx.txt" --out-path="../" c
python -m glad --api="wgl=1.0" --extensions="../extensions/wgl.txt" --out-path="../" c
python -m glad --api="egl=1.5" --extensions="../extensions/egl.txt" --out-path="../" c
python -m glad --api="vulkan=1.1" --extensions="../extensions/vulkan.txt" --out-path="../" c
)
set -e
cd "$(dirname "$0")"
# In case glad is not installed system wide or not installed via pip assume glad
# repository was fetched into glad subdirectory.
export PYTHONPATH="glad"
python -m glad --api="gl:core=2.1" --extensions="extensions/gl.txt" --out-path="." c
python -m glad --api="gles2=2.0" --extensions="extensions/gles2.txt" --out-path="." c
python -m glad --api="glx=1.4" --extensions="extensions/glx.txt" --out-path="." c
python -m glad --api="wgl=1.0" --extensions="extensions/wgl.txt" --out-path="." c
python -m glad --api="egl=1.5" --extensions="extensions/egl.txt" --out-path="." c
python -m glad --api="vulkan=1.1" --extensions="extensions/vulkan.txt" --out-path="." c
patch -p1 --ignore-whitespace --fuzz 1 <fix_macos.patch
mv src/gl.c src/gl.cpp
mv src/gles2.c src/gles2.cpp
mv src/glx.c src/glx.cpp