From feb10e3dd351637255cc1a7a33b9123c968f8d42 Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Wed, 6 Jul 2022 21:25:39 +1000 Subject: [PATCH] Updated Makefile explanation to reflect raylib 4.2.3 changes --- docs/MakefileExplanation.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/MakefileExplanation.md b/docs/MakefileExplanation.md index 961ecc3..c49549f 100644 --- a/docs/MakefileExplanation.md +++ b/docs/MakefileExplanation.md @@ -111,7 +111,7 @@ include: submodules ... ``` -`submodules` is a very simple target that will update the git submodules in the project recursively, pulling in the current raylib-cpp repository under the `/vendor` directory and then raylib itself under its own `/vendor` directory. The reason for this, is to make sure that the pulled versions of raylib and the bindings match in version. You can [read more about git submodules here](https://git-scm.com/book/en/v2/Git-Tools-Submodules). +`submodules` is a very simple target that will update the git submodules in the project recursively, pulling in the current raylib and raylib-cpp repositories. You can [read more about git submodules here](https://git-scm.com/book/en/v2/Git-Tools-Submodules). ```Makefile submodules: git submodule update --init --recursive @@ -125,8 +125,8 @@ Next, the target proceeds to call another custom function, `COPY` (a platform ag ```Makefile include: submodules $(MKDIR) $(call platformpth, ./include) - $(call COPY,vendor/raylib-cpp/vendor/raylib/src,./include,raylib.h) - $(call COPY,vendor/raylib-cpp/vendor/raylib/src,./include,raymath.h) + $(call COPY,vendor/raylib/src,./include,raylib.h) + $(call COPY,vendor/raylib/src,./include,raymath.h) $(call COPY,vendor/raylib-cpp/include,./include,*.hpp) ``` @@ -139,9 +139,9 @@ Moving on to the body of the target, we move into raylib's `/src` directory and To complete the target, it then copies that library file into the relevant directory for your platform under `/lib`. ```Makefile lib: submodules - cd vendor/raylib-cpp/vendor/raylib/src $(THEN) "$(MAKE)" PLATFORM=PLATFORM_DESKTOP - $(MKDIR) $(call platformpth, lib/$(platform)) - $(call COPY,vendor/raylib-cpp/vendor/raylib/$(libGenDir),lib/$(platform),libraylib.a) + cd vendor/raylib/src $(THEN) "$(MAKE)" PLATFORM=PLATFORM_DESKTOP + $(MKDIR) $(call platformpth, lib/$(platform)) + $(call COPY,vendor/raylib/$(libGenDir),lib/$(platform),libraylib.a) ``` Once all of these targets have been fulfilled, `setup` ends and your project should now contain a copy of the relevant static library for your platform in `/lib`, and all the necessary header files under `/include`.