From 8e05a07e6627c18ef817b7c6e940b71d6a9c9816 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 14:37:59 +1100 Subject: [PATCH 1/4] Update Makefile --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 722d388..ce8a04a 100644 --- a/Makefile +++ b/Makefile @@ -55,6 +55,7 @@ pull: # Copy the relevant header files into includes include: pull mkdir $(mkdirOptions) include + IF EXIST vendor\raylib-cpp\vendor\raylib\src\raylib.h ECHO vendor\raylib-cpp\vendor\raylib\src\raylib.h exists. cp vendor/raylib-cpp/vendor/raylib/src/raylib.h include/raylib.h cp vendor/raylib-cpp/vendor/raylib/src/raymath.h include/raymath.h cp vendor/raylib-cpp/include/*.hpp include From 3ce7351edef28f216f861586ea42935704778678 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 14:46:42 +1100 Subject: [PATCH 2/4] Update Makefile --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index ce8a04a..722d388 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,6 @@ pull: # Copy the relevant header files into includes include: pull mkdir $(mkdirOptions) include - IF EXIST vendor\raylib-cpp\vendor\raylib\src\raylib.h ECHO vendor\raylib-cpp\vendor\raylib\src\raylib.h exists. cp vendor/raylib-cpp/vendor/raylib/src/raylib.h include/raylib.h cp vendor/raylib-cpp/vendor/raylib/src/raymath.h include/raymath.h cp vendor/raylib-cpp/include/*.hpp include From 0cdeb09ad0cb514555c753894e2b730dd5925671 Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Fri, 27 Nov 2020 23:44:42 +1100 Subject: [PATCH 3/4] Simplified pull target --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 722d388..7aa5902 100644 --- a/Makefile +++ b/Makefile @@ -49,8 +49,7 @@ setup: include lib # Pull and update the the build submodules pull: - git submodule init; git submodule update - cd vendor/raylib-cpp; git submodule init; git submodule update + git submodule update --init --recursive # Copy the relevant header files into includes include: pull From d0251f88653e06275f441ee43025bc37c72da58d Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Sat, 28 Nov 2020 23:49:13 +1100 Subject: [PATCH 4/4] Renamed pull target to submodules --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7aa5902..0afe234 100644 --- a/Makefile +++ b/Makefile @@ -42,24 +42,24 @@ endif run: compile execute clean # Lists phony targets for Make compile -.PHONY: run setup pull compile execute clean +.PHONY: run setup submodules compile execute clean # Sets up the project for compiling, creates libs and includes setup: include lib # Pull and update the the build submodules -pull: +submodules: git submodule update --init --recursive # Copy the relevant header files into includes -include: pull +include: submodules mkdir $(mkdirOptions) include cp vendor/raylib-cpp/vendor/raylib/src/raylib.h include/raylib.h cp vendor/raylib-cpp/vendor/raylib/src/raymath.h include/raymath.h cp vendor/raylib-cpp/include/*.hpp include # Build the raylib static library file and copy it into lib -lib: pull +lib: submodules cd vendor/raylib-cpp/vendor/raylib/src; make PLATFORM=PLATFORM_DESKTOP mkdir $(mkdirOptions) lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a