Merge pull request #17 from return215/update-raylib-cpp

Update raylib-cpp to 4.2.3
This commit is contained in:
Jonathan Moallem 2022-07-06 21:23:31 +10:00 committed by GitHub
commit 254969d834
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 5 deletions

3
.gitmodules vendored
View File

@ -1,3 +1,6 @@
[submodule "vendor/raylib-cpp"] [submodule "vendor/raylib-cpp"]
path = vendor/raylib-cpp path = vendor/raylib-cpp
url = https://github.com/robloach/raylib-cpp url = https://github.com/robloach/raylib-cpp
[submodule "vendor/raylib"]
path = vendor/raylib
url = https://github.com/raysan5/raylib

View File

@ -71,15 +71,15 @@ submodules:
# Copy the relevant header files into includes # Copy the relevant header files into includes
include: submodules include: submodules
$(MKDIR) $(call platformpth, ./include) $(MKDIR) $(call platformpth, ./include)
$(call COPY,vendor/raylib-cpp/vendor/raylib/src,./include,raylib.h) $(call COPY,vendor/raylib/src,./include,raylib.h)
$(call COPY,vendor/raylib-cpp/vendor/raylib/src,./include,raymath.h) $(call COPY,vendor/raylib/src,./include,raymath.h)
$(call COPY,vendor/raylib-cpp/include,./include,*.hpp) $(call COPY,vendor/raylib-cpp/include,./include,*.hpp)
# Build the raylib static library file and copy it into lib # Build the raylib static library file and copy it into lib
lib: submodules lib: submodules
cd vendor/raylib-cpp/vendor/raylib/src $(THEN) "$(MAKE)" PLATFORM=PLATFORM_DESKTOP cd vendor/raylib/src $(THEN) "$(MAKE)" PLATFORM=PLATFORM_DESKTOP
$(MKDIR) $(call platformpth, lib/$(platform)) $(MKDIR) $(call platformpth, lib/$(platform))
$(call COPY,vendor/raylib-cpp/vendor/raylib/$(libGenDir),lib/$(platform),libraylib.a) $(call COPY,vendor/raylib/$(libGenDir),lib/$(platform),libraylib.a)
# Link the program and create the executable # Link the program and create the executable
$(target): $(objects) $(target): $(objects)

View File

@ -138,6 +138,7 @@ It's pretty simple actually:
- [mTvare6](https://github.com/mTvare6) mTvare6 - contributor - [mTvare6](https://github.com/mTvare6) mTvare6 - contributor
- [rafaeldelboni](https://github.com/rafaeldelboni) Rafael Delboni - contributor - [rafaeldelboni](https://github.com/rafaeldelboni) Rafael Delboni - contributor
- [jason-cannon](https://github.com/jason-cannon) Jason Cannon - contributor - [jason-cannon](https://github.com/jason-cannon) Jason Cannon - contributor
- [return215](https://github.com/return215) Muhammad Hidayat - contributor
## Licence ## Licence

1
vendor/raylib vendored Submodule

@ -0,0 +1 @@
Subproject commit 0851960397f02a477d80eda2239f90fae14dec64

2
vendor/raylib-cpp vendored

@ -1 +1 @@
Subproject commit 6aa148cbb8a46c30ed2e49c87cfd06ff255ae016 Subproject commit a8f803edae6db67dafa1f84c1099f1bbc74925ef