From 9ae589e23858bda819d9749b63b4dfd1865bf51d Mon Sep 17 00:00:00 2001 From: Rokas Puzonas Date: Mon, 17 Jul 2023 16:25:13 +0300 Subject: [PATCH] update raylib to 4.5 --- .gitignore | 1 - .gitmodules | 8 ++++---- Makefile | 10 +++++----- depends/raylib | 1 + depends/raylib-cpp | 1 + vendor/raylib | 1 - vendor/raylib-cpp | 1 - 7 files changed, 11 insertions(+), 12 deletions(-) create mode 160000 depends/raylib create mode 160000 depends/raylib-cpp delete mode 160000 vendor/raylib delete mode 160000 vendor/raylib-cpp diff --git a/.gitignore b/.gitignore index 5148772..fc687bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ include lib bin -.idea \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index c019d90..d039609 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[submodule "vendor/raylib-cpp"] - path = vendor/raylib-cpp +[submodule "depends/raylib-cpp"] + path = depends/raylib-cpp url = https://github.com/robloach/raylib-cpp -[submodule "vendor/raylib"] - path = vendor/raylib +[submodule "depends/raylib"] + path = depends/raylib url = https://github.com/raysan5/raylib diff --git a/Makefile b/Makefile index 7228402..057ec5f 100644 --- a/Makefile +++ b/Makefile @@ -71,15 +71,15 @@ submodules: # Copy the relevant header files into includes include: submodules $(MKDIR) $(call platformpth, ./include) - $(call COPY,vendor/raylib/src,./include,raylib.h) - $(call COPY,vendor/raylib/src,./include,raymath.h) - $(call COPY,vendor/raylib-cpp/include,./include,*.hpp) + $(call COPY,depends/raylib/src,./include,raylib.h) + $(call COPY,depends/raylib/src,./include,raymath.h) + $(call COPY,depends/raylib-cpp/include,./include,*.hpp) # Build the raylib static library file and copy it into lib lib: submodules - cd vendor/raylib/src $(THEN) "$(MAKE)" PLATFORM=PLATFORM_DESKTOP + cd depends/raylib/src $(THEN) "$(MAKE)" PLATFORM=PLATFORM_DESKTOP $(MKDIR) $(call platformpth, lib/$(platform)) - $(call COPY,vendor/raylib/$(libGenDir),lib/$(platform),libraylib.a) + $(call COPY,depends/raylib/src/$(libGenDir),lib/$(platform),libraylib.a) # Link the program and create the executable $(target): $(objects) diff --git a/depends/raylib b/depends/raylib new file mode 160000 index 0000000..fec9613 --- /dev/null +++ b/depends/raylib @@ -0,0 +1 @@ +Subproject commit fec96137e8d10ee6c88914fbe5e5429c13ee1dac diff --git a/depends/raylib-cpp b/depends/raylib-cpp new file mode 160000 index 0000000..3f2b428 --- /dev/null +++ b/depends/raylib-cpp @@ -0,0 +1 @@ +Subproject commit 3f2b428211ad04b2a3acefd65a9621a116678108 diff --git a/vendor/raylib b/vendor/raylib deleted file mode 160000 index 0851960..0000000 --- a/vendor/raylib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0851960397f02a477d80eda2239f90fae14dec64 diff --git a/vendor/raylib-cpp b/vendor/raylib-cpp deleted file mode 160000 index a8f803e..0000000 --- a/vendor/raylib-cpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a8f803edae6db67dafa1f84c1099f1bbc74925ef