Skip to content

Commit 205b6a0

Browse files
authored
Merge branch 'raysan5:master' into safety-comments
2 parents 9f6d37e + 7f8dfc6 commit 205b6a0

File tree

221 files changed

+16504
-12570
lines changed

Some content is hidden

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

221 files changed

+16504
-12570
lines changed

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
# - https://gh.io/supported-runners-and-hardware-resources
2727
# - https://gh.io/using-larger-runners
2828
# Consider using larger runners for possible analysis time improvements.
29-
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-20.04' }}
29+
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
3030
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
3131
permissions:
3232
actions: read

.github/workflows/linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
build:
2323
permissions:
2424
contents: write # for actions/upload-release-asset to upload release asset
25-
runs-on: ubuntu-20.04
25+
runs-on: ubuntu-latest
2626
strategy:
2727
fail-fast: false
2828
max-parallel: 1

BINDINGS.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@ Some people ported raylib to other languages in the form of bindings or wrappers
1313
| [raylib-cs](https://github.com/raylib-cs/raylib-cs) | **5.5** | [C#](https://en.wikipedia.org/wiki/C_Sharp_(programming_language)) | Zlib |
1414
| [Raylib-CsLo](https://github.com/NotNotTech/Raylib-CsLo) | 4.2 | [C#](https://en.wikipedia.org/wiki/C_Sharp_(programming_language)) | MPL-2.0 |
1515
| [Raylib-CSharp-Vinculum](https://github.com/ZeroElectric/Raylib-CSharp-Vinculum) | **5.0** | [C#](https://en.wikipedia.org/wiki/C_Sharp_(programming_language)) | MPL-2.0 |
16-
| [Raylib-CSharp](https://github.com/MrScautHD/Raylib-CSharp) | **5.1-dev** | [C#](https://en.wikipedia.org/wiki/C_Sharp_(programming_language)) | MIT |
16+
| [Raylib-CSharp](https://github.com/MrScautHD/Raylib-CSharp) | **5.5** | [C#](https://en.wikipedia.org/wiki/C_Sharp_(programming_language)) | MIT |
17+
| [Raylib-cs.BleedingEdge](https://github.com/danilwhale/Raylib-cs.BleedingEdge) | **5.6-dev** | [C#](https://en.wikipedia.org/wiki/C_Sharp_(programming_language)) | Zlib |
1718
| [cl-raylib](https://github.com/longlene/cl-raylib) | 4.0 | [Common Lisp](https://common-lisp.net) | MIT |
1819
| [claylib/wrap](https://github.com/defun-games/claylib) | 4.5 | [Common Lisp](https://common-lisp.net) | Zlib |
1920
| [claw-raylib](https://github.com/bohonghuang/claw-raylib) | **auto** | [Common Lisp](https://common-lisp.net) | Apache-2.0 |
21+
| [raylib](https://github.com/fosskers/raylib) | 5.5 | [Common Lisp](https://common-lisp.net) | MPL-2.0 |
2022
| [chez-raylib](https://github.com/Yunoinsky/chez-raylib) | **auto** | [Chez Scheme](https://cisco.github.io/ChezScheme) | GPLv3 |
2123
| [CLIPSraylib](https://github.com/mrryanjohnston/CLIPSraylib) | **auto** | [CLIPS](https://www.clipsrules.net/) | MIT |
2224
| [raylib-cr](https://github.com/sol-vin/raylib-cr) | 4.6-dev (5e1a81) | [Crystal](https://crystal-lang.org) | Apache-2.0 |
@@ -49,7 +51,7 @@ Some people ported raylib to other languages in the form of bindings or wrappers
4951
| [raylib-luajit-generated](https://github.com/james2doyle/raylib-luajit-generated) | 5.5 | [Lua](http://www.lua.org) | MIT |
5052
| [raylib-matte](https://github.com/jcorks/raylib-matte) | 4.6-dev | [Matte](https://github.com/jcorks/matte) | **???** |
5153
| [Raylib.nelua](https://github.com/AuzFox/Raylib.nelua) | **5.5** | [nelua](https://nelua.io) | Zlib |
52-
| [raylib-bindings](https://github.com/vaiorabbit/raylib-bindings) | 5.6-dev | [Ruby](https://www.ruby-lang.org/en) | Zlib |
54+
| [raylib-bindings](https://github.com/vaiorabbit/raylib-bindings) | 5.6-dev | [Ruby](https://www.ruby-lang.org/en) | Zlib |
5355
| [naylib](https://github.com/planetis-m/naylib) | **5.6-dev** | [Nim](https://nim-lang.org) | MIT |
5456
| [node-raylib](https://github.com/RobLoach/node-raylib) | 4.5 | [Node.js](https://nodejs.org/en) | Zlib |
5557
| [raylib-odin](https://github.com/odin-lang/Odin/tree/master/vendor/raylib) | **5.5** | [Odin](https://odin-lang.org) | BSD-3Clause |
@@ -71,7 +73,7 @@ Some people ported raylib to other languages in the form of bindings or wrappers
7173
| [raylib-rs](https://github.com/raylib-rs/raylib-rs) | **5.5** | [Rust](https://www.rust-lang.org) | Zlib |
7274
| [raylib-ruby](https://github.com/wilsonsilva/raylib-ruby) | 4.5 | [Ruby](https://www.ruby-lang.org) | Zlib |
7375
| [Relib](https://github.com/RedCubeDev-ByteSpace/Relib) | 3.5 | [ReCT](https://github.com/RedCubeDev-ByteSpace/ReCT) | **???** |
74-
| [racket-raylib](https://github.com/eutro/racket-raylib) | 4.0 | [Racket](https://racket-lang.org) | MIT/Apache-2.0 |
76+
| [racket-raylib](https://github.com/eutro/racket-raylib) | **5.5** | [Racket](https://racket-lang.org) | MIT/Apache-2.0 |
7577
| [raylib-swift](https://github.com/STREGAsGate/Raylib) | 4.0 | [Swift](https://swift.org) | MIT |
7678
| [raylib-scopes](https://github.com/salotz/raylib-scopes) | auto | [Scopes](http://scopes.rocks) | MIT |
7779
| [raylib-SmallBASIC](https://github.com/smallbasic/smallbasic.plugins/tree/master/raylib) | **5.5** | [SmallBASIC](https://github.com/smallbasic/SmallBASIC) | GPLv3 |
@@ -93,6 +95,7 @@ Some people ported raylib to other languages in the form of bindings or wrappers
9395
| [raylib-apl](https://github.com/Brian-ED/raylib-apl) | **5.0** | [Dyalog APL](https://www.dyalog.com/) | MIT |
9496
| [raylib-jai](https://github.com/ahmedqarmout2/raylib-jai) | **5.5** | [Jai](https://github.com/BSVino/JaiPrimer/blob/master/JaiPrimer.md) | MIT |
9597
| [fnl-raylib](https://github.com/0riginaln0/fnl-raylib) | **5.5** | [Fennel](https://fennel-lang.org/) | MIT |
98+
| [Rayua](https://github.com/uiua-lang/rayua) | **5.5** | [Uiua](https://www.uiua.org/) | **???** |
9699

97100
### Utility Wrapers
98101

@@ -103,6 +106,7 @@ These are utility wrappers for specific languages, they are not required to use
103106
| [claylib](https://github.com/defun-games/claylib) | 4.5 | [Common Lisp](https://common-lisp.net) | Zlib |
104107
| [rayed-bqn](https://github.com/Brian-ED/rayed-bqn) | **5.0** | [BQN](https://mlochbaum.github.io/BQN) | MIT |
105108
| [DOOR](https://github.com/RealDoigt/DOOR) | 4.0 | [D](https://dlang.org) | MIT |
109+
| [Iris](https://github.com/Marcos-cat/iris) | **5.5** | [Uiua](https://www.uiua.org/) | MIT |
106110

107111
### Older or Unmaintained Language Bindings
108112

CMakeLists.txt

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,6 @@ cmake_policy(SET CMP0063 NEW)
2323
# Anywhere you see include(...) you can check <root>/cmake for that file
2424
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
2525

26-
# RAYLIB_IS_MAIN determines whether the project is being used from root
27-
# or if it is added as a dependency (through add_subdirectory for example).
28-
if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
29-
set(RAYLIB_IS_MAIN TRUE)
30-
else()
31-
set(RAYLIB_IS_MAIN FALSE)
32-
endif()
33-
3426
# Sets compiler flags and language standard
3527
include(CompilerFlags)
3628

@@ -46,8 +38,9 @@ endif()
4638
# Main sources directory (the second parameter sets the output directory name to raylib)
4739
add_subdirectory(src raylib)
4840

49-
# Uninstall target
50-
if(NOT TARGET uninstall)
41+
# Uninstall target, only create when building raylib by itself
42+
# Avoid conflicting target names when using raylib with other libraries
43+
if(NOT TARGET uninstall AND PROJECT_IS_TOP_LEVEL)
5144
configure_file(
5245
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Uninstall.cmake"
5346
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"

CMakeOptions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ enum_option(PLATFORM "Desktop;Web;Android;Raspberry Pi;DRM;SDL" "Platform to bui
1111
enum_option(OPENGL_VERSION "OFF;4.3;3.3;2.1;1.1;ES 2.0;ES 3.0" "Force a specific OpenGL Version?")
1212

1313
# Configuration options
14-
option(BUILD_EXAMPLES "Build the examples." ${RAYLIB_IS_MAIN})
14+
option(BUILD_EXAMPLES "Build the examples." ${PROJECT_IS_TOP_LEVEL})
1515
option(CUSTOMIZE_BUILD "Show options for customizing your Raylib library build." OFF)
1616
option(ENABLE_ASAN "Enable AddressSanitizer (ASAN) for debugging (degrades performance)" OFF)
1717
option(ENABLE_UBSAN "Enable UndefinedBehaviorSanitizer (UBSan) for debugging" OFF)

ROADMAP.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@
33
Here is a wishlist with features and ideas to improve the library. Note that features listed here are usually long term improvements or just describe a route to follow for the library. There are also some additional places to look for raylib improvements and ideas:
44

55
- [GitHub Issues](https://github.com/raysan5/raylib/issues) has several open issues for possible improvements or bugs to fix.
6+
- [GitHub PRs](https://github.com/raysan5/raylib/pulls) open with improvements to be reviewed.
67
- [raylib source code](https://github.com/raysan5/raylib/tree/master/src) has multiple *TODO* comments around code with pending things to review or improve.
78
- raylib wishlists discussions are open to everyone to ask for improvements, feel free to check and comment:
8-
- [raylib wishlist 2021](https://github.com/raysan5/raylib/discussions/1502)
9-
- [raylib wishlist 2022](https://github.com/raysan5/raylib/discussions/2272)
9+
- [raylib 6.0 wishlist](https://github.com/raysan5/raylib/discussions/4660)
1010
- [raylib 5.0 wishlist](https://github.com/raysan5/raylib/discussions/2952)
11-
11+
- [raylib wishlist 2022](https://github.com/raysan5/raylib/discussions/2272)
12+
- [raylib wishlist 2021](https://github.com/raysan5/raylib/discussions/1502)
13+
1214
_Current version of raylib is complete and functional but there is always room for improvements._
1315

1416
**raylib 5.x**
15-
- [ ] `rcore`: Support additional platforms: iOS, Xbox Series S|X
17+
- [ ] `rcore`: Support additional platforms: iOS, consoles?
1618
- [ ] `rcore_web`: Avoid GLFW dependency, functionality can be directly implemented using emscripten SDK
1719
- [ ] `rlgl`: Review GLSL shaders naming conventions for consistency
1820
- [ ] `textures`: Improve compressed textures support, loading and saving

0 commit comments

Comments
 (0)