From 012259869e37d2b739734e71a2b21ccd3243213c Mon Sep 17 00:00:00 2001 From: aryeh Date: Fri, 27 Nov 2020 11:44:38 +1100 Subject: [PATCH 01/75] Got windows building. Need to test with CI/CD --- Makefile | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 722d388..cf15fe8 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ # Set general macros buildFile = build/app +libGenDirectory = src # Check for Windows ifeq ($(OS), Windows_NT) @@ -7,7 +8,13 @@ ifeq ($(OS), Windows_NT) platform = Windows compiler = g++ options = -pthread -lopengl32 -lgdi32 -lwinmm -mwindows + + # Windows-specific syntax + THEN = && + MAKE = mingw32-make + + # Set Windows commands cleanCommand = del build\app.exe else @@ -25,11 +32,16 @@ else platform = macOS compiler = clang++ options = -framework CoreVideo -framework IOKit -framework Cocoa -framework GLUT -framework OpenGL - libGenDirectory = src endif # Set UNIX commands mkdirOptions = -p + MAKE = make + + # Copy Directories for Unix/Linux + RaylibDirectory = vendor/raylib-cpp/vendor/raylib/src/raylib.h + + cleanCommand = rm $(buildFile) endif @@ -49,22 +61,35 @@ 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 init $(THEN) git submodule update + cd vendor/raylib-cpp $(THEN) git submodule init $(THEN) git submodule update # Copy the relevant header files into includes include: pull +# Copy commands for Windows +ifeq ($(OS), Windows_NT) + -mkdir $(mkdirOptions) include + copy vendor\raylib-cpp\vendor\raylib\src\raylib.h include + copy vendor\raylib-cpp\vendor\raylib\src\raymath.h include + copy vendor\raylib-cpp\include\*.hpp include +# Copy commands for UNIX/Linux +else 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 +endif # Build the raylib static library file and copy it into lib lib: pull - cd vendor/raylib-cpp/vendor/raylib/src; make PLATFORM=PLATFORM_DESKTOP + cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP +ifeq ($(OS), Windows_NT) + -mkdir $(mkdirOptions) lib\$(platform) + copy vendor\raylib-cpp\vendor\raylib\$(libGenDirectory)\libraylib.a lib\$(platform) +else mkdir $(mkdirOptions) lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a - +endif # Create the build folder build: mkdir $(mkdirOptions) build From 6a73638ec7b43d8fe6002050ab87832515312ce9 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 11:59:32 +1100 Subject: [PATCH 02/75] Added ';' as UNIX multi-line command --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cf15fe8..40c4386 100644 --- a/Makefile +++ b/Makefile @@ -13,8 +13,6 @@ ifeq ($(OS), Windows_NT) THEN = && MAKE = mingw32-make - - # Set Windows commands cleanCommand = del build\app.exe else @@ -37,6 +35,7 @@ else # Set UNIX commands mkdirOptions = -p MAKE = make + THEN = ; # Copy Directories for Unix/Linux RaylibDirectory = vendor/raylib-cpp/vendor/raylib/src/raylib.h From 261d9ed88ac34f1093f644a33a14e47d3fc59109 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 12:03:28 +1100 Subject: [PATCH 03/75] Updated to run setup and clean commands --- .github/workflows/windows.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c4c7023..686ece7 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -13,5 +13,15 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v2 - - name: make - run: mingw32-make + - name: make setup + run: make setup + + - name: make compile + run: make compile + - name: make clean + run: make clean + + - name: make compile CXX=g++ + run: make compile CXX=g++ + - name: make clean + run: make clean From f5a58f52f549ef758a619e15e7607b8991cd72c4 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 12:18:40 +1100 Subject: [PATCH 04/75] Edited commands --- .github/workflows/windows.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 686ece7..dea8f1a 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -14,14 +14,14 @@ jobs: steps: - uses: actions/checkout@v2 - name: make setup - run: make setup + run: mingw32-make setup - name: make compile - run: make compile + run: mingw32-make compile - name: make clean - run: make clean + run: mingw32-make clean - name: make compile CXX=g++ - run: make compile CXX=g++ + run: mingw32-make compile CXX=g++ - name: make clean - run: make clean + run: mingw32-make clean From 916a50f7120f38f0b742d1085bc6b924ed430b9d Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 12:25:36 +1100 Subject: [PATCH 05/75] Update Makefile --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 40c4386..5bd9e42 100644 --- a/Makefile +++ b/Makefile @@ -68,6 +68,8 @@ include: pull # Copy commands for Windows ifeq ($(OS), Windows_NT) -mkdir $(mkdirOptions) include + cd + dir copy vendor\raylib-cpp\vendor\raylib\src\raylib.h include copy vendor\raylib-cpp\vendor\raylib\src\raymath.h include copy vendor\raylib-cpp\include\*.hpp include From f0747eb368ff420fcd91b41ec32a049e33a8de5a Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 12:35:15 +1100 Subject: [PATCH 06/75] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5bd9e42..b26b8dd 100644 --- a/Makefile +++ b/Makefile @@ -68,8 +68,8 @@ include: pull # Copy commands for Windows ifeq ($(OS), Windows_NT) -mkdir $(mkdirOptions) include - cd dir + dir vendor\raylib-cpp\vendor\raylib\src copy vendor\raylib-cpp\vendor\raylib\src\raylib.h include copy vendor\raylib-cpp\vendor\raylib\src\raymath.h include copy vendor\raylib-cpp\include\*.hpp include From eade038095019443b7a45da9b633ec678cba470a Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 12:53:30 +1100 Subject: [PATCH 07/75] Update Makefile --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b26b8dd..baede0d 100644 --- a/Makefile +++ b/Makefile @@ -67,12 +67,13 @@ pull: include: pull # Copy commands for Windows ifeq ($(OS), Windows_NT) - -mkdir $(mkdirOptions) include + -mkdir $(mkdirOptions) .\include + cd dir dir vendor\raylib-cpp\vendor\raylib\src - copy vendor\raylib-cpp\vendor\raylib\src\raylib.h include - copy vendor\raylib-cpp\vendor\raylib\src\raymath.h include - copy vendor\raylib-cpp\include\*.hpp include + copy .\vendor\raylib-cpp\vendor\raylib\src\raylib.h include + copy .\vendor\raylib-cpp\vendor\raylib\src\raymath.h include + copy .\vendor\raylib-cpp\include\*.hpp include # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include From d059bb80528201c160346e9e82eb6b5552cc2b5c Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 13:16:48 +1100 Subject: [PATCH 08/75] Update Makefile --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index baede0d..f332c4c 100644 --- a/Makefile +++ b/Makefile @@ -71,9 +71,9 @@ ifeq ($(OS), Windows_NT) cd dir dir vendor\raylib-cpp\vendor\raylib\src - copy .\vendor\raylib-cpp\vendor\raylib\src\raylib.h include - copy .\vendor\raylib-cpp\vendor\raylib\src\raymath.h include - copy .\vendor\raylib-cpp\include\*.hpp include + xcopy /y .\vendor\raylib-cpp\vendor\raylib\src\raylib.h .\include\raylib.h + xcopy /y .\vendor\raylib-cpp\vendor\raylib\src\raymath.h .\include\raymath.h + xcopy /y .\vendor\raylib-cpp\include\*.hpp .\include # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include From 98365748be9991091c634a66a3c7ecfc352bbd0a Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 13:25:04 +1100 Subject: [PATCH 09/75] Update windows.yml --- .github/workflows/windows.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index dea8f1a..6547f1c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -15,13 +15,16 @@ jobs: - uses: actions/checkout@v2 - name: make setup run: mingw32-make setup + shell: cmd - name: make compile run: mingw32-make compile - name: make clean run: mingw32-make clean + shell: cmd - name: make compile CXX=g++ run: mingw32-make compile CXX=g++ - name: make clean run: mingw32-make clean + shell: cmd From 90568d40223528505f78d2eed711ced7e77df5b5 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 13:27:36 +1100 Subject: [PATCH 10/75] Update Makefile --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f332c4c..2effd2d 100644 --- a/Makefile +++ b/Makefile @@ -71,9 +71,9 @@ ifeq ($(OS), Windows_NT) cd dir dir vendor\raylib-cpp\vendor\raylib\src - xcopy /y .\vendor\raylib-cpp\vendor\raylib\src\raylib.h .\include\raylib.h - xcopy /y .\vendor\raylib-cpp\vendor\raylib\src\raymath.h .\include\raymath.h - xcopy /y .\vendor\raylib-cpp\include\*.hpp .\include + copy .\vendor\raylib-cpp\vendor\raylib\src\raylib.h .\include\raylib.h + copy .\vendor\raylib-cpp\vendor\raylib\src\raymath.h .\include\raymath.h + copy .\vendor\raylib-cpp\include\*.hpp .\include # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include From bdab6a078463ca8ebff5926bb36d88135bf61269 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 13:51:40 +1100 Subject: [PATCH 11/75] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2effd2d..15784f8 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ include: pull # Copy commands for Windows ifeq ($(OS), Windows_NT) -mkdir $(mkdirOptions) .\include - cd + echo the currect working directory is %CD% dir dir vendor\raylib-cpp\vendor\raylib\src copy .\vendor\raylib-cpp\vendor\raylib\src\raylib.h .\include\raylib.h From dd1cc3daee4ac6d3e19cddbd5a2c7ecd13ead754 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 14:05:56 +1100 Subject: [PATCH 12/75] Update windows.yml --- .github/workflows/windows.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 6547f1c..866baf4 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -16,15 +16,18 @@ jobs: - name: make setup run: mingw32-make setup shell: cmd + working-directory: D:/a/raylib-cpp-starter - name: make compile run: mingw32-make compile - name: make clean run: mingw32-make clean shell: cmd + working-directory: D:/a/raylib-cpp-starter - name: make compile CXX=g++ run: mingw32-make compile CXX=g++ - name: make clean run: mingw32-make clean shell: cmd + working-directory: D:/a/raylib-cpp-starter From c99b6e00f748d4ebce1ebbddf580c430c3570e88 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 14:11:21 +1100 Subject: [PATCH 13/75] Update windows.yml --- .github/workflows/windows.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 866baf4..70672fe 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -13,21 +13,28 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v2 + - name: make setup + working-directory: D:/a/raylib-cpp-starter run: mingw32-make setup shell: cmd - working-directory: D:/a/raylib-cpp-starter - name: make compile + working-directory: D:/a/raylib-cpp-starter run: mingw32-make compile + shell: cmd + - name: make clean + working-directory: D:/a/raylib-cpp-starter run: mingw32-make clean shell: cmd - working-directory: D:/a/raylib-cpp-starter - name: make compile CXX=g++ + working-directory: D:/a/raylib-cpp-starter run: mingw32-make compile CXX=g++ + shell: cmd + - name: make clean + working-directory: D:/a/raylib-cpp-starter run: mingw32-make clean shell: cmd - working-directory: D:/a/raylib-cpp-starter From 26ada82c426cf3527b1966ea6c3091a8d9d45374 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 14:13:59 +1100 Subject: [PATCH 14/75] Update windows.yml --- .github/workflows/windows.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 70672fe..a9f8d9c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -15,26 +15,21 @@ jobs: - uses: actions/checkout@v2 - name: make setup - working-directory: D:/a/raylib-cpp-starter run: mingw32-make setup shell: cmd - name: make compile - working-directory: D:/a/raylib-cpp-starter run: mingw32-make compile shell: cmd - name: make clean - working-directory: D:/a/raylib-cpp-starter run: mingw32-make clean shell: cmd - name: make compile CXX=g++ - working-directory: D:/a/raylib-cpp-starter run: mingw32-make compile CXX=g++ shell: cmd - name: make clean - working-directory: D:/a/raylib-cpp-starter run: mingw32-make clean shell: cmd From 1ee1b4e27036fbe30e94dbd331e766737739ab36 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 14:16:52 +1100 Subject: [PATCH 15/75] Update windows.yml --- .github/workflows/windows.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a9f8d9c..dd7f4db 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -16,20 +16,20 @@ jobs: - name: make setup run: mingw32-make setup - shell: cmd + shell: bash - name: make compile run: mingw32-make compile - shell: cmd + shell: bash - name: make clean run: mingw32-make clean - shell: cmd + shell: bash - name: make compile CXX=g++ run: mingw32-make compile CXX=g++ - shell: cmd + shell: bash - name: make clean run: mingw32-make clean - shell: cmd + shell: bash From 46e510ad8112afb26b34df50e87b8ee46b76a4dd Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 14:39:18 +1100 Subject: [PATCH 16/75] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 15784f8..85842b1 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ include: pull # Copy commands for Windows ifeq ($(OS), Windows_NT) -mkdir $(mkdirOptions) .\include - echo the currect working directory is %CD% + IF EXIST vendor\raylib-cpp\vendor\raylib\src\raylib.h ECHO exists. dir dir vendor\raylib-cpp\vendor\raylib\src copy .\vendor\raylib-cpp\vendor\raylib\src\raylib.h .\include\raylib.h From cbb990660367fd80c3b804425a847cb56bd1e9d0 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 14:42:19 +1100 Subject: [PATCH 17/75] Update Makefile --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 85842b1..4bc0bac 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,6 @@ include: pull # Copy commands for Windows ifeq ($(OS), Windows_NT) -mkdir $(mkdirOptions) .\include - IF EXIST vendor\raylib-cpp\vendor\raylib\src\raylib.h ECHO exists. dir dir vendor\raylib-cpp\vendor\raylib\src copy .\vendor\raylib-cpp\vendor\raylib\src\raylib.h .\include\raylib.h From 159a339e84eaeb20311224a6449d5e3212e4ad83 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 14:52:56 +1100 Subject: [PATCH 18/75] Update Makefile --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index 4bc0bac..eeaacdc 100644 --- a/Makefile +++ b/Makefile @@ -68,8 +68,6 @@ include: pull # Copy commands for Windows ifeq ($(OS), Windows_NT) -mkdir $(mkdirOptions) .\include - dir - dir vendor\raylib-cpp\vendor\raylib\src copy .\vendor\raylib-cpp\vendor\raylib\src\raylib.h .\include\raylib.h copy .\vendor\raylib-cpp\vendor\raylib\src\raymath.h .\include\raymath.h copy .\vendor\raylib-cpp\include\*.hpp .\include From b836f009371da8979b16bf0d3b30f3ad917f9723 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 15:00:54 +1100 Subject: [PATCH 19/75] Update Makefile --- Makefile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Makefile b/Makefile index eeaacdc..6995e34 100644 --- a/Makefile +++ b/Makefile @@ -68,6 +68,17 @@ include: pull # Copy commands for Windows ifeq ($(OS), Windows_NT) -mkdir $(mkdirOptions) .\include + dir + cd vendor + dir + cd raylib-cpp + dir + cd vendor + dir + cd raylib + dir + cd src + dir copy .\vendor\raylib-cpp\vendor\raylib\src\raylib.h .\include\raylib.h copy .\vendor\raylib-cpp\vendor\raylib\src\raymath.h .\include\raymath.h copy .\vendor\raylib-cpp\include\*.hpp .\include From 2df19d1d7471ab9aa7a7a49b7f24f9ab0c5d4469 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 15:03:53 +1100 Subject: [PATCH 20/75] Update Makefile --- Makefile | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 6995e34..4d0d86e 100644 --- a/Makefile +++ b/Makefile @@ -68,17 +68,8 @@ include: pull # Copy commands for Windows ifeq ($(OS), Windows_NT) -mkdir $(mkdirOptions) .\include - dir - cd vendor - dir - cd raylib-cpp - dir - cd vendor - dir - cd raylib - dir - cd src - dir + dir vendor + dir vendor\raylib-cpp copy .\vendor\raylib-cpp\vendor\raylib\src\raylib.h .\include\raylib.h copy .\vendor\raylib-cpp\vendor\raylib\src\raymath.h .\include\raymath.h copy .\vendor\raylib-cpp\include\*.hpp .\include From f87332aee8bb2fed2869f33e33407e0025e3c52f Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 15:06:42 +1100 Subject: [PATCH 21/75] Update Makefile --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 4d0d86e..330ce12 100644 --- a/Makefile +++ b/Makefile @@ -70,6 +70,10 @@ ifeq ($(OS), Windows_NT) -mkdir $(mkdirOptions) .\include dir vendor dir vendor\raylib-cpp + dir vendor\raylib-cpp\vendor + dir vendor\raylib-cpp\vendor\raylib + dir vendor\raylib-cpp\vendor\raylib\src\raylib.h + dir include copy .\vendor\raylib-cpp\vendor\raylib\src\raylib.h .\include\raylib.h copy .\vendor\raylib-cpp\vendor\raylib\src\raymath.h .\include\raymath.h copy .\vendor\raylib-cpp\include\*.hpp .\include From 4c717c095c82e6700aa2e6c88130a1eedda371b7 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 15:10:14 +1100 Subject: [PATCH 22/75] Update Makefile --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 330ce12..592b9a9 100644 --- a/Makefile +++ b/Makefile @@ -72,8 +72,9 @@ ifeq ($(OS), Windows_NT) dir vendor\raylib-cpp dir vendor\raylib-cpp\vendor dir vendor\raylib-cpp\vendor\raylib - dir vendor\raylib-cpp\vendor\raylib\src\raylib.h + dir vendor\raylib-cpp\vendor\raylib\src\ dir include + copy .\vendor\raylib-cpp\vendor\raylib\src\raylib.h copy .\vendor\raylib-cpp\vendor\raylib\src\raylib.h .\include\raylib.h copy .\vendor\raylib-cpp\vendor\raylib\src\raymath.h .\include\raymath.h copy .\vendor\raylib-cpp\include\*.hpp .\include From 4adf9712d50a9ec9756730dac2f3a4da9e1d453b Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 15:12:35 +1100 Subject: [PATCH 23/75] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 592b9a9..d2768c2 100644 --- a/Makefile +++ b/Makefile @@ -72,7 +72,7 @@ ifeq ($(OS), Windows_NT) dir vendor\raylib-cpp dir vendor\raylib-cpp\vendor dir vendor\raylib-cpp\vendor\raylib - dir vendor\raylib-cpp\vendor\raylib\src\ + dir vendor\raylib-cpp\vendor\raylib\src dir include copy .\vendor\raylib-cpp\vendor\raylib\src\raylib.h copy .\vendor\raylib-cpp\vendor\raylib\src\raylib.h .\include\raylib.h From fbe052cd64a7f43c930a194b13ab48bb8ca71011 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 15:33:22 +1100 Subject: [PATCH 24/75] Update Makefile --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d2768c2..df683a0 100644 --- a/Makefile +++ b/Makefile @@ -75,9 +75,9 @@ ifeq ($(OS), Windows_NT) dir vendor\raylib-cpp\vendor\raylib\src dir include copy .\vendor\raylib-cpp\vendor\raylib\src\raylib.h - copy .\vendor\raylib-cpp\vendor\raylib\src\raylib.h .\include\raylib.h - copy .\vendor\raylib-cpp\vendor\raylib\src\raymath.h .\include\raymath.h - copy .\vendor\raylib-cpp\include\*.hpp .\include + copy "${CURDIR}\vendor\raylib-cpp\vendor\raylib\src\raylib.h" "${CURDIR}\include\raylib.h" + copy "${CURDIR}\vendor\raylib-cpp\vendor\raylib\src\raymath.h" "${CURDIR}\include\raymath.h" + copy "${CURDIR}\vendor\raylib-cpp\include\*.hpp" ".\include" # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include From 2550f404b006d5f18ab398a74a64ee013febefd8 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 15:36:28 +1100 Subject: [PATCH 25/75] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index df683a0..0a1053f 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ ifeq ($(OS), Windows_NT) dir vendor\raylib-cpp\vendor\raylib dir vendor\raylib-cpp\vendor\raylib\src dir include - copy .\vendor\raylib-cpp\vendor\raylib\src\raylib.h + copy "${CURDIR}\vendor\raylib-cpp\vendor\raylib\src\raylib.h" copy "${CURDIR}\vendor\raylib-cpp\vendor\raylib\src\raylib.h" "${CURDIR}\include\raylib.h" copy "${CURDIR}\vendor\raylib-cpp\vendor\raylib\src\raymath.h" "${CURDIR}\include\raymath.h" copy "${CURDIR}\vendor\raylib-cpp\include\*.hpp" ".\include" From 9a5e21932b5f8045073a24fff403c7c0ead17827 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 15:38:28 +1100 Subject: [PATCH 26/75] Update windows.yml --- .github/workflows/windows.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index dd7f4db..a9f8d9c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -16,20 +16,20 @@ jobs: - name: make setup run: mingw32-make setup - shell: bash + shell: cmd - name: make compile run: mingw32-make compile - shell: bash + shell: cmd - name: make clean run: mingw32-make clean - shell: bash + shell: cmd - name: make compile CXX=g++ run: mingw32-make compile CXX=g++ - shell: bash + shell: cmd - name: make clean run: mingw32-make clean - shell: bash + shell: cmd From 6846db508038bd175e458c639e7b479e9f8bb505 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 15:42:19 +1100 Subject: [PATCH 27/75] Update windows.yml --- .github/workflows/windows.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a9f8d9c..0e18a75 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -16,20 +16,15 @@ jobs: - name: make setup run: mingw32-make setup - shell: cmd - name: make compile run: mingw32-make compile - shell: cmd - name: make clean run: mingw32-make clean - shell: cmd - name: make compile CXX=g++ run: mingw32-make compile CXX=g++ - shell: cmd - name: make clean run: mingw32-make clean - shell: cmd From 5479ca36c1ed4218f563e4d48e623fd5bb5516af Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 15:55:14 +1100 Subject: [PATCH 28/75] Update windows.yml --- .github/workflows/windows.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 0e18a75..a9f8d9c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -16,15 +16,20 @@ jobs: - name: make setup run: mingw32-make setup + shell: cmd - name: make compile run: mingw32-make compile + shell: cmd - name: make clean run: mingw32-make clean + shell: cmd - name: make compile CXX=g++ run: mingw32-make compile CXX=g++ + shell: cmd - name: make clean run: mingw32-make clean + shell: cmd From b2145015503152a4263065d42f073b4ac9cf2919 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 16:14:17 +1100 Subject: [PATCH 29/75] Update Makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0a1053f..894d814 100644 --- a/Makefile +++ b/Makefile @@ -74,10 +74,10 @@ ifeq ($(OS), Windows_NT) dir vendor\raylib-cpp\vendor\raylib dir vendor\raylib-cpp\vendor\raylib\src dir include - copy "${CURDIR}\vendor\raylib-cpp\vendor\raylib\src\raylib.h" - copy "${CURDIR}\vendor\raylib-cpp\vendor\raylib\src\raylib.h" "${CURDIR}\include\raylib.h" - copy "${CURDIR}\vendor\raylib-cpp\vendor\raylib\src\raymath.h" "${CURDIR}\include\raymath.h" - copy "${CURDIR}\vendor\raylib-cpp\include\*.hpp" ".\include" + copy "vendor\raylib-cpp\vendor\raylib\src\raylib.h" + copy "vendor\raylib-cpp\vendor\raylib\src\raylib.h" "include" + copy "vendor\raylib-cpp\vendor\raylib\src\raymath.h" "include" + copy "vendor\raylib-cpp\include\*.hpp" "include" # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include From 30fd28c3a24440687ddb48701ab0b10104cd9141 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 16:16:26 +1100 Subject: [PATCH 30/75] Update Makefile --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 894d814..4d5512a 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,6 @@ ifeq ($(OS), Windows_NT) dir vendor\raylib-cpp\vendor\raylib dir vendor\raylib-cpp\vendor\raylib\src dir include - copy "vendor\raylib-cpp\vendor\raylib\src\raylib.h" copy "vendor\raylib-cpp\vendor\raylib\src\raylib.h" "include" copy "vendor\raylib-cpp\vendor\raylib\src\raymath.h" "include" copy "vendor\raylib-cpp\include\*.hpp" "include" From 4175c9e1cfa66e702e10bf9e729ada34a98f7a26 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 16:38:38 +1100 Subject: [PATCH 31/75] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4d5512a..cdd462c 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ ifeq ($(OS), Windows_NT) dir vendor\raylib-cpp\vendor\raylib dir vendor\raylib-cpp\vendor\raylib\src dir include - copy "vendor\raylib-cpp\vendor\raylib\src\raylib.h" "include" + xcopy "vendor\raylib-cpp\vendor\raylib\src\raylib.h" "include" copy "vendor\raylib-cpp\vendor\raylib\src\raymath.h" "include" copy "vendor\raylib-cpp\include\*.hpp" "include" # Copy commands for UNIX/Linux From 4ddf333b7c0f0b6f976bbabef8fdda5c99e6570c Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 16:40:36 +1100 Subject: [PATCH 32/75] Update Makefile --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index cdd462c..a9a6d51 100644 --- a/Makefile +++ b/Makefile @@ -75,8 +75,8 @@ ifeq ($(OS), Windows_NT) dir vendor\raylib-cpp\vendor\raylib\src dir include xcopy "vendor\raylib-cpp\vendor\raylib\src\raylib.h" "include" - copy "vendor\raylib-cpp\vendor\raylib\src\raymath.h" "include" - copy "vendor\raylib-cpp\include\*.hpp" "include" + xcopy "vendor\raylib-cpp\vendor\raylib\src\raymath.h" "include" + xcopy "vendor\raylib-cpp\include\*.hpp" "include" # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include @@ -90,7 +90,7 @@ lib: pull cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP ifeq ($(OS), Windows_NT) -mkdir $(mkdirOptions) lib\$(platform) - copy vendor\raylib-cpp\vendor\raylib\$(libGenDirectory)\libraylib.a lib\$(platform) + xcopy vendor\raylib-cpp\vendor\raylib\$(libGenDirectory)\libraylib.a lib\$(platform) else mkdir $(mkdirOptions) lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a From 37f4eabb492faf4cf4faf914792da6406e7f973e Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 16:47:35 +1100 Subject: [PATCH 33/75] Update Makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a9a6d51..386c676 100644 --- a/Makefile +++ b/Makefile @@ -74,9 +74,9 @@ ifeq ($(OS), Windows_NT) dir vendor\raylib-cpp\vendor\raylib dir vendor\raylib-cpp\vendor\raylib\src dir include - xcopy "vendor\raylib-cpp\vendor\raylib\src\raylib.h" "include" - xcopy "vendor\raylib-cpp\vendor\raylib\src\raymath.h" "include" - xcopy "vendor\raylib-cpp\include\*.hpp" "include" + xcopy "vendor\raylib-cpp\vendor\raylib\src\raylib.h" "include" /Y + xcopy "vendor\raylib-cpp\vendor\raylib\src\raymath.h" "include" /Y + xcopy "vendor\raylib-cpp\include\*.hpp" "include" /Y # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include @@ -90,7 +90,7 @@ lib: pull cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP ifeq ($(OS), Windows_NT) -mkdir $(mkdirOptions) lib\$(platform) - xcopy vendor\raylib-cpp\vendor\raylib\$(libGenDirectory)\libraylib.a lib\$(platform) + xcopy "vendor\raylib-cpp\vendor\raylib\$(libGenDirectory)\libraylib.a" "lib\$(platform) /Y" else mkdir $(mkdirOptions) lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a From 5bb8b43cf62c65ca3a6bf048bd6ff7a2d9c5b1de Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 16:52:48 +1100 Subject: [PATCH 34/75] Update Makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 386c676..b4d0014 100644 --- a/Makefile +++ b/Makefile @@ -74,9 +74,9 @@ ifeq ($(OS), Windows_NT) dir vendor\raylib-cpp\vendor\raylib dir vendor\raylib-cpp\vendor\raylib\src dir include - xcopy "vendor\raylib-cpp\vendor\raylib\src\raylib.h" "include" /Y - xcopy "vendor\raylib-cpp\vendor\raylib\src\raymath.h" "include" /Y - xcopy "vendor\raylib-cpp\include\*.hpp" "include" /Y + xcopy "vendor\raylib-cpp\vendor\raylib\src\raylib.h" "include" + xcopy "vendor\raylib-cpp\vendor\raylib\src\raymath.h" "include" + xcopy "vendor\raylib-cpp\include\*.hpp" "include" # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include @@ -90,7 +90,7 @@ lib: pull cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP ifeq ($(OS), Windows_NT) -mkdir $(mkdirOptions) lib\$(platform) - xcopy "vendor\raylib-cpp\vendor\raylib\$(libGenDirectory)\libraylib.a" "lib\$(platform) /Y" + xcopy "vendor\raylib-cpp\vendor\raylib\$(libGenDirectory)\libraylib.a" "lib\$(platform)" else mkdir $(mkdirOptions) lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a From 3d8d0589191ca9d0325e02835573fbaf93bab60f Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 16:58:00 +1100 Subject: [PATCH 35/75] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b4d0014..23fa31c 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,7 @@ lib: pull cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP ifeq ($(OS), Windows_NT) -mkdir $(mkdirOptions) lib\$(platform) - xcopy "vendor\raylib-cpp\vendor\raylib\$(libGenDirectory)\libraylib.a" "lib\$(platform)" + xcopy "vendor\raylib-cpp\vendor\raylib\src\libraylib.a" "lib\Windows\libraylib.a" else mkdir $(mkdirOptions) lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a From a8b4630a774feff6fbe64873928814fb00b9f93f Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 17:03:14 +1100 Subject: [PATCH 36/75] Update Makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 23fa31c..1c007c1 100644 --- a/Makefile +++ b/Makefile @@ -74,9 +74,9 @@ ifeq ($(OS), Windows_NT) dir vendor\raylib-cpp\vendor\raylib dir vendor\raylib-cpp\vendor\raylib\src dir include - xcopy "vendor\raylib-cpp\vendor\raylib\src\raylib.h" "include" - xcopy "vendor\raylib-cpp\vendor\raylib\src\raymath.h" "include" - xcopy "vendor\raylib-cpp\include\*.hpp" "include" + xcopy /Y /f "vendor\raylib-cpp\vendor\raylib\src\raylib.h" "include" + xcopy /Y /f "vendor\raylib-cpp\vendor\raylib\src\raymath.h" "include" + xcopy /Y /f "vendor\raylib-cpp\include\*.hpp" "include" # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include @@ -90,7 +90,7 @@ lib: pull cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP ifeq ($(OS), Windows_NT) -mkdir $(mkdirOptions) lib\$(platform) - xcopy "vendor\raylib-cpp\vendor\raylib\src\libraylib.a" "lib\Windows\libraylib.a" + xcopy /Y /f "vendor\raylib-cpp\vendor\raylib\src\libraylib.a" "lib\Windows\libraylib.a" else mkdir $(mkdirOptions) lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a From b486dce1eef654739f07584ee1faae6144c69d6d Mon Sep 17 00:00:00 2001 From: Aryeh Date: Fri, 27 Nov 2020 17:17:25 +1100 Subject: [PATCH 37/75] Update Makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 1c007c1..9deb96e 100644 --- a/Makefile +++ b/Makefile @@ -74,9 +74,9 @@ ifeq ($(OS), Windows_NT) dir vendor\raylib-cpp\vendor\raylib dir vendor\raylib-cpp\vendor\raylib\src dir include - xcopy /Y /f "vendor\raylib-cpp\vendor\raylib\src\raylib.h" "include" - xcopy /Y /f "vendor\raylib-cpp\vendor\raylib\src\raymath.h" "include" - xcopy /Y /f "vendor\raylib-cpp\include\*.hpp" "include" + xcopy "vendor\raylib-cpp\vendor\raylib\src\raylib.h" /Y /f "include" + xcopy "vendor\raylib-cpp\vendor\raylib\src\raymath.h" /Y /f "include" + xcopy "vendor\raylib-cpp\include\*.hpp" /Y /f "include" # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include @@ -90,7 +90,7 @@ lib: pull cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP ifeq ($(OS), Windows_NT) -mkdir $(mkdirOptions) lib\$(platform) - xcopy /Y /f "vendor\raylib-cpp\vendor\raylib\src\libraylib.a" "lib\Windows\libraylib.a" + xcopy "vendor\raylib-cpp\vendor\raylib\src\libraylib.a" /Y /f "lib\Windows\libraylib.a" else mkdir $(mkdirOptions) lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a From abd2b8a8894560dc828a27d4d15a8879b9152760 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Sun, 29 Nov 2020 15:42:01 +1100 Subject: [PATCH 38/75] Replaced scopy with robocopy --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 15ce456..35c0f5a 100644 --- a/Makefile +++ b/Makefile @@ -58,9 +58,9 @@ include: submodules # Copy commands for Windows ifeq ($(platform), Windows) -mkdir $(mkdirOptions) .\include - xcopy "vendor\raylib-cpp\vendor\raylib\src\raylib.h" /Y /f "include" - xcopy "vendor\raylib-cpp\vendor\raylib\src\raymath.h" /Y /f "include" - xcopy "vendor\raylib-cpp\include\*.hpp" /Y /f "include" + robocopy vendor\raylib-cpp\vendor\raylib\src 'include' raylib.h + robocopy vendor\raylib-cpp\vendor\raylib\src 'include' raymath.h + robocopy vendor\raylib-cpp\include 'include' *.hpp # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include @@ -74,7 +74,7 @@ lib: submodules cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP ifeq ($(platform), Windows) -mkdir $(mkdirOptions) lib\$(platform) - xcopy "vendor\raylib-cpp\vendor\raylib\src\libraylib.a" /Y /f "lib\Windows\libraylib.a" + robocopy vendor\raylib-cpp\vendor\raylib\src 'lib\Windows' libraylib.a else mkdir $(mkdirOptions) lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a @@ -93,4 +93,4 @@ execute: # Clean up all relevant files clean: - $(cleanCommand) \ No newline at end of file + $(cleanCommand) From 5122c03fbd72d3ab01c2078749abd6a2dc14438b Mon Sep 17 00:00:00 2001 From: Aryeh Date: Sun, 29 Nov 2020 15:51:25 +1100 Subject: [PATCH 39/75] Update Makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 35c0f5a..9318895 100644 --- a/Makefile +++ b/Makefile @@ -58,9 +58,9 @@ include: submodules # Copy commands for Windows ifeq ($(platform), Windows) -mkdir $(mkdirOptions) .\include - robocopy vendor\raylib-cpp\vendor\raylib\src 'include' raylib.h - robocopy vendor\raylib-cpp\vendor\raylib\src 'include' raymath.h - robocopy vendor\raylib-cpp\include 'include' *.hpp + -robocopy vendor\raylib-cpp\vendor\raylib\src 'include' raylib.h + -robocopy vendor\raylib-cpp\vendor\raylib\src 'include' raymath.h + -robocopy vendor\raylib-cpp\include 'include' *.hpp # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include @@ -74,7 +74,7 @@ lib: submodules cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP ifeq ($(platform), Windows) -mkdir $(mkdirOptions) lib\$(platform) - robocopy vendor\raylib-cpp\vendor\raylib\src 'lib\Windows' libraylib.a + -robocopy vendor\raylib-cpp\vendor\raylib\src 'lib\Windows' libraylib.a else mkdir $(mkdirOptions) lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a From e1ae369fbf607b528d42bf79bb15428df1936d7b Mon Sep 17 00:00:00 2001 From: Aryeh Date: Sun, 29 Nov 2020 16:03:30 +1100 Subject: [PATCH 40/75] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9318895..51f6627 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ ifeq ($(platform), Windows) -mkdir $(mkdirOptions) .\include -robocopy vendor\raylib-cpp\vendor\raylib\src 'include' raylib.h -robocopy vendor\raylib-cpp\vendor\raylib\src 'include' raymath.h - -robocopy vendor\raylib-cpp\include 'include' *.hpp + -robocopy vendor\raylib-cpp\include 'include' # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include From 28d4e3e5f7883ffaf8ad43daf21d10694faf67c2 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Sun, 29 Nov 2020 16:14:05 +1100 Subject: [PATCH 41/75] Added double q Added double quotes --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 51f6627..ee8f4c4 100644 --- a/Makefile +++ b/Makefile @@ -58,9 +58,9 @@ include: submodules # Copy commands for Windows ifeq ($(platform), Windows) -mkdir $(mkdirOptions) .\include - -robocopy vendor\raylib-cpp\vendor\raylib\src 'include' raylib.h - -robocopy vendor\raylib-cpp\vendor\raylib\src 'include' raymath.h - -robocopy vendor\raylib-cpp\include 'include' + -robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h + -robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h + -robocopy "vendor\raylib-cpp\include" "include" *.hpp # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include @@ -74,7 +74,7 @@ lib: submodules cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP ifeq ($(platform), Windows) -mkdir $(mkdirOptions) lib\$(platform) - -robocopy vendor\raylib-cpp\vendor\raylib\src 'lib\Windows' libraylib.a + -robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a else mkdir $(mkdirOptions) lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a @@ -93,4 +93,5 @@ execute: # Clean up all relevant files clean: + dir build $(cleanCommand) From 320bc1b7f43241caf46d878d5da7690dfc8a6bdc Mon Sep 17 00:00:00 2001 From: Aryeh Date: Sun, 29 Nov 2020 16:23:52 +1100 Subject: [PATCH 42/75] Update Makefile --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ee8f4c4..b6fa035 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ ifeq ($(OS), Windows_NT) # Set Windows commands THEN = && - cleanCommand = del build\app.exe + cleanCommand = del ${CURDIR}\build\app.exe else # Check for MacOS/Linux UNAMEOS := $(shell uname) @@ -93,5 +93,4 @@ execute: # Clean up all relevant files clean: - dir build $(cleanCommand) From bb08e6b6cbb852e9a04d7c901dd3177f4b18b9af Mon Sep 17 00:00:00 2001 From: Aryeh Date: Sun, 29 Nov 2020 16:30:10 +1100 Subject: [PATCH 43/75] Added error level remapping --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b6fa035..731a39d 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ ifeq ($(OS), Windows_NT) # Set Windows commands THEN = && - cleanCommand = del ${CURDIR}\build\app.exe + cleanCommand = del ${CURDIR}\build\*.exe else # Check for MacOS/Linux UNAMEOS := $(shell uname) @@ -58,9 +58,9 @@ include: submodules # Copy commands for Windows ifeq ($(platform), Windows) -mkdir $(mkdirOptions) .\include - -robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h - -robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h - -robocopy "vendor\raylib-cpp\include" "include" *.hpp + robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h $(THEN) if errorlevel gtr 7 exit errorlevel + robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h $(THEN) if errorlevel gtr 7 exit errorlevel + robocopy "vendor\raylib-cpp\include" "include" *.hpp $(THEN) if errorlevel gtr 7 exit errorlevel # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include @@ -74,7 +74,7 @@ lib: submodules cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP ifeq ($(platform), Windows) -mkdir $(mkdirOptions) lib\$(platform) - -robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a + robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a $(THEN) if errorlevel gtr 7 exit errorlevel else mkdir $(mkdirOptions) lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a From 39b4a90e5a20406b3fa412a3e40bb85599cbc2fd Mon Sep 17 00:00:00 2001 From: Aryeh Date: Sun, 29 Nov 2020 16:38:16 +1100 Subject: [PATCH 44/75] Update Makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 731a39d..fcc7e08 100644 --- a/Makefile +++ b/Makefile @@ -58,9 +58,9 @@ include: submodules # Copy commands for Windows ifeq ($(platform), Windows) -mkdir $(mkdirOptions) .\include - robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h $(THEN) if errorlevel gtr 7 exit errorlevel - robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h $(THEN) if errorlevel gtr 7 exit errorlevel - robocopy "vendor\raylib-cpp\include" "include" *.hpp $(THEN) if errorlevel gtr 7 exit errorlevel + robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h $(THEN) if errorlevel gtr 7 exit /b errorlevel + robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h $(THEN) if errorlevel gtr 7 exit /b errorlevel + robocopy "vendor\raylib-cpp\include" "include" *.hpp $(THEN) if errorlevel gtr 7 exit /b errorlevel # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include @@ -74,7 +74,7 @@ lib: submodules cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP ifeq ($(platform), Windows) -mkdir $(mkdirOptions) lib\$(platform) - robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a $(THEN) if errorlevel gtr 7 exit errorlevel + robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a $(THEN) if errorlevel gtr 7 exit /b errorlevel else mkdir $(mkdirOptions) lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a From 9adda4ead06044ad7eae9e71a91fe8b25637fd94 Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Sun, 29 Nov 2020 16:45:08 +1100 Subject: [PATCH 45/75] Changed then to logical OR --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index fcc7e08..3a370cb 100644 --- a/Makefile +++ b/Makefile @@ -58,9 +58,9 @@ include: submodules # Copy commands for Windows ifeq ($(platform), Windows) -mkdir $(mkdirOptions) .\include - robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h $(THEN) if errorlevel gtr 7 exit /b errorlevel - robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h $(THEN) if errorlevel gtr 7 exit /b errorlevel - robocopy "vendor\raylib-cpp\include" "include" *.hpp $(THEN) if errorlevel gtr 7 exit /b errorlevel + robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h || if errorlevel gtr 7 exit errorlevel + robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h || if errorlevel gtr 7 exit errorlevel + robocopy "vendor\raylib-cpp\include" "include" *.hpp || if errorlevel gtr 7 exit errorlevel # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include @@ -74,7 +74,7 @@ lib: submodules cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP ifeq ($(platform), Windows) -mkdir $(mkdirOptions) lib\$(platform) - robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a $(THEN) if errorlevel gtr 7 exit /b errorlevel + robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a || if errorlevel gtr 7 exit /b errorlevel else mkdir $(mkdirOptions) lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a From e0a772ed90a9ae4d58f64c08598eef9e4d8f77fd Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Sun, 29 Nov 2020 16:51:26 +1100 Subject: [PATCH 46/75] Updated THEN macro to be single ampersand --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 3a370cb..2cf4d7e 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ ifeq ($(OS), Windows_NT) options = -pthread -lopengl32 -lgdi32 -lwinmm -mwindows # Set Windows commands - THEN = && + THEN = & cleanCommand = del ${CURDIR}\build\*.exe else # Check for MacOS/Linux @@ -58,9 +58,9 @@ include: submodules # Copy commands for Windows ifeq ($(platform), Windows) -mkdir $(mkdirOptions) .\include - robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h || if errorlevel gtr 7 exit errorlevel - robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h || if errorlevel gtr 7 exit errorlevel - robocopy "vendor\raylib-cpp\include" "include" *.hpp || if errorlevel gtr 7 exit errorlevel + robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h $(THEN) if errorlevel gtr 7 exit errorlevel + robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h $(THEN) if errorlevel gtr 7 exit errorlevel + robocopy "vendor\raylib-cpp\include" "include" *.hpp $(THEN) if errorlevel gtr 7 exit errorlevel # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include @@ -74,7 +74,7 @@ lib: submodules cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP ifeq ($(platform), Windows) -mkdir $(mkdirOptions) lib\$(platform) - robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a || if errorlevel gtr 7 exit /b errorlevel + robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a $(THEN) if errorlevel gtr 7 exit /b errorlevel else mkdir $(mkdirOptions) lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a From 9e94a8f761dc29b29bf655f40cf4b85febbf2477 Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Sun, 29 Nov 2020 16:53:20 +1100 Subject: [PATCH 47/75] Replaced exit with echo --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 2cf4d7e..96b77a0 100644 --- a/Makefile +++ b/Makefile @@ -58,9 +58,9 @@ include: submodules # Copy commands for Windows ifeq ($(platform), Windows) -mkdir $(mkdirOptions) .\include - robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h $(THEN) if errorlevel gtr 7 exit errorlevel - robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h $(THEN) if errorlevel gtr 7 exit errorlevel - robocopy "vendor\raylib-cpp\include" "include" *.hpp $(THEN) if errorlevel gtr 7 exit errorlevel + robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h $(THEN) if errorlevel gtr 7 echo errorlevel + robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h $(THEN) if errorlevel gtr 7 echo errorlevel + robocopy "vendor\raylib-cpp\include" "include" *.hpp $(THEN) if errorlevel gtr 7 echo errorlevel # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include @@ -74,7 +74,7 @@ lib: submodules cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP ifeq ($(platform), Windows) -mkdir $(mkdirOptions) lib\$(platform) - robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a $(THEN) if errorlevel gtr 7 exit /b errorlevel + robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a $(THEN) if errorlevel gtr 7 echo /b errorlevel else mkdir $(mkdirOptions) lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a From 6438ffb483cfaf7f1cb6b7ad55183c0ad8924fe3 Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Sun, 29 Nov 2020 16:58:47 +1100 Subject: [PATCH 48/75] Update Makefile --- Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 96b77a0..efba5e9 100644 --- a/Makefile +++ b/Makefile @@ -58,9 +58,12 @@ include: submodules # Copy commands for Windows ifeq ($(platform), Windows) -mkdir $(mkdirOptions) .\include - robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h $(THEN) if errorlevel gtr 7 echo errorlevel - robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h $(THEN) if errorlevel gtr 7 echo errorlevel - robocopy "vendor\raylib-cpp\include" "include" *.hpp $(THEN) if errorlevel gtr 7 echo errorlevel + -robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h + if errorlevel gtr 7 exit errorlevel + -robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h + if errorlevel gtr 7 exit errorlevel + -robocopy "vendor\raylib-cpp\include" "include" *.hpp $(THEN) + if errorlevel gtr 7 exit errorlevel # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include @@ -74,7 +77,8 @@ lib: submodules cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP ifeq ($(platform), Windows) -mkdir $(mkdirOptions) lib\$(platform) - robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a $(THEN) if errorlevel gtr 7 echo /b errorlevel + -robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a + if errorlevel gtr 7 exit errorlevel else mkdir $(mkdirOptions) lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a From e53330b6f410763ee2987c351be8f473358d291f Mon Sep 17 00:00:00 2001 From: Aryeh Date: Sun, 29 Nov 2020 17:00:40 +1100 Subject: [PATCH 49/75] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index efba5e9..1c484b2 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,7 @@ ifeq ($(platform), Windows) if errorlevel gtr 7 exit errorlevel -robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h if errorlevel gtr 7 exit errorlevel - -robocopy "vendor\raylib-cpp\include" "include" *.hpp $(THEN) + -robocopy "vendor\raylib-cpp\include" "include" *.hpp if errorlevel gtr 7 exit errorlevel # Copy commands for UNIX/Linux else From 01638ccd276ad102691de42b11b81f6517e59bee Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Sun, 29 Nov 2020 17:07:36 +1100 Subject: [PATCH 50/75] Update Makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 1c484b2..941ad4b 100644 --- a/Makefile +++ b/Makefile @@ -59,11 +59,11 @@ include: submodules ifeq ($(platform), Windows) -mkdir $(mkdirOptions) .\include -robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h - if errorlevel gtr 7 exit errorlevel + cmd if errorlevel gtr 7 exit errorlevel -robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h - if errorlevel gtr 7 exit errorlevel + cmd if errorlevel gtr 7 exit errorlevel -robocopy "vendor\raylib-cpp\include" "include" *.hpp - if errorlevel gtr 7 exit errorlevel + cmd if errorlevel gtr 7 exit errorlevel # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include @@ -78,7 +78,7 @@ lib: submodules ifeq ($(platform), Windows) -mkdir $(mkdirOptions) lib\$(platform) -robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a - if errorlevel gtr 7 exit errorlevel + cmd if errorlevel gtr 7 exit errorlevel else mkdir $(mkdirOptions) lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a From d4093b8bd71701b65aed6eccc02008e1ab7c8077 Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Sun, 29 Nov 2020 17:24:43 +1100 Subject: [PATCH 51/75] Update Makefile --- Makefile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 941ad4b..8ae0c2e 100644 --- a/Makefile +++ b/Makefile @@ -58,12 +58,9 @@ include: submodules # Copy commands for Windows ifeq ($(platform), Windows) -mkdir $(mkdirOptions) .\include - -robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h - cmd if errorlevel gtr 7 exit errorlevel - -robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h - cmd if errorlevel gtr 7 exit errorlevel - -robocopy "vendor\raylib-cpp\include" "include" *.hpp - cmd if errorlevel gtr 7 exit errorlevel + robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h $(THEN) errorlevel gtr 7 && exit errorlevel + robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h $(THEN) errorlevel gtr 7 && exit errorlevel + robocopy "vendor\raylib-cpp\include" "include" *.hpp $(THEN) errorlevel gtr 7 && exit errorlevel # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include @@ -77,8 +74,7 @@ lib: submodules cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP ifeq ($(platform), Windows) -mkdir $(mkdirOptions) lib\$(platform) - -robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a - cmd if errorlevel gtr 7 exit errorlevel + robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a $(THEN) errorlevel gtr 7 && exit errorlevel else mkdir $(mkdirOptions) lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a From c8e225e51513c00d39c5446e73285baa13d5b0ac Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Sun, 29 Nov 2020 17:37:54 +1100 Subject: [PATCH 52/75] Update Makefile --- Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8ae0c2e..e79ff2e 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,9 @@ ifeq ($(OS), Windows_NT) # Set Windows commands THEN = & cleanCommand = del ${CURDIR}\build\*.exe + + echo if errorlevel gtr 7 exit errorlevel > CheckCopyError.bat + type CheckError.bat else # Check for MacOS/Linux UNAMEOS := $(shell uname) @@ -58,9 +61,9 @@ include: submodules # Copy commands for Windows ifeq ($(platform), Windows) -mkdir $(mkdirOptions) .\include - robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h $(THEN) errorlevel gtr 7 && exit errorlevel - robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h $(THEN) errorlevel gtr 7 && exit errorlevel - robocopy "vendor\raylib-cpp\include" "include" *.hpp $(THEN) errorlevel gtr 7 && exit errorlevel + robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h $(THEN) CheckCopyError.bat + robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h $(THEN) CheckCopyError.bat + robocopy "vendor\raylib-cpp\include" "include" *.hpp $(THEN) CheckCopyError.bat # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include @@ -74,7 +77,7 @@ lib: submodules cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP ifeq ($(platform), Windows) -mkdir $(mkdirOptions) lib\$(platform) - robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a $(THEN) errorlevel gtr 7 && exit errorlevel + robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a $(THEN) CheckCopyError.bat else mkdir $(mkdirOptions) lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a From 6b961629f67f03ab397ce2c0fc80647d17f7c3bd Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Sun, 29 Nov 2020 17:42:42 +1100 Subject: [PATCH 53/75] Update Makefile --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index e79ff2e..83d1856 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,6 @@ ifeq ($(OS), Windows_NT) # Set Windows commands THEN = & cleanCommand = del ${CURDIR}\build\*.exe - echo if errorlevel gtr 7 exit errorlevel > CheckCopyError.bat type CheckError.bat else From db1646f00cffe1cb88c3b3ae2df32f8cc0f32ccf Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Sun, 29 Nov 2020 17:49:47 +1100 Subject: [PATCH 54/75] Update Makefile --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 83d1856..7093b09 100644 --- a/Makefile +++ b/Makefile @@ -12,8 +12,6 @@ ifeq ($(OS), Windows_NT) # Set Windows commands THEN = & cleanCommand = del ${CURDIR}\build\*.exe - echo if errorlevel gtr 7 exit errorlevel > CheckCopyError.bat - type CheckError.bat else # Check for MacOS/Linux UNAMEOS := $(shell uname) @@ -50,6 +48,10 @@ run: compile execute clean # Sets up the project for compiling, creates libs and includes setup: include lib +ifeq ($(platform), Windows) + echo if errorlevel gtr 7 exit errorlevel > CheckCopyError.bat + type CheckError.bat +endif # Pull and update the the build submodules submodules: From f5018d994e9438362f1b74fa49ff9f5b0b8580fc Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Sun, 29 Nov 2020 17:54:12 +1100 Subject: [PATCH 55/75] Update Makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7093b09..89dbaa7 100644 --- a/Makefile +++ b/Makefile @@ -62,9 +62,9 @@ include: submodules # Copy commands for Windows ifeq ($(platform), Windows) -mkdir $(mkdirOptions) .\include - robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h $(THEN) CheckCopyError.bat - robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h $(THEN) CheckCopyError.bat - robocopy "vendor\raylib-cpp\include" "include" *.hpp $(THEN) CheckCopyError.bat + robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h $(THEN) call CheckCopyError.bat + robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h $(THEN) call CheckCopyError.bat + robocopy "vendor\raylib-cpp\include" "include" *.hpp $(THEN) call CheckCopyError.bat # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include @@ -78,7 +78,7 @@ lib: submodules cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP ifeq ($(platform), Windows) -mkdir $(mkdirOptions) lib\$(platform) - robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a $(THEN) CheckCopyError.bat + robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a $(THEN) call CheckCopyError.bat else mkdir $(mkdirOptions) lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a From f96230ee032e04207bcf57e04eea3ca436d29e7b Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Sun, 29 Nov 2020 17:57:52 +1100 Subject: [PATCH 56/75] Update Makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 89dbaa7..de7d31b 100644 --- a/Makefile +++ b/Makefile @@ -62,9 +62,9 @@ include: submodules # Copy commands for Windows ifeq ($(platform), Windows) -mkdir $(mkdirOptions) .\include - robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h $(THEN) call CheckCopyError.bat - robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h $(THEN) call CheckCopyError.bat - robocopy "vendor\raylib-cpp\include" "include" *.hpp $(THEN) call CheckCopyError.bat + robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h $(THEN) ./CheckCopyError.bat + robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h $(THEN) ./CheckCopyError.bat + robocopy "vendor\raylib-cpp\include" "include" *.hpp $(THEN) ./CheckCopyError.bat # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include @@ -78,7 +78,7 @@ lib: submodules cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP ifeq ($(platform), Windows) -mkdir $(mkdirOptions) lib\$(platform) - robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a $(THEN) call CheckCopyError.bat + robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a $(THEN) ./CheckCopyError.bat else mkdir $(mkdirOptions) lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a From 4d7258bda1aaef830879fb9c369a313c35d5bdc9 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Sun, 29 Nov 2020 18:01:52 +1100 Subject: [PATCH 57/75] Moved bat file creation to submodlues target --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index de7d31b..93e3f59 100644 --- a/Makefile +++ b/Makefile @@ -48,23 +48,23 @@ run: compile execute clean # Sets up the project for compiling, creates libs and includes setup: include lib -ifeq ($(platform), Windows) - echo if errorlevel gtr 7 exit errorlevel > CheckCopyError.bat - type CheckError.bat -endif # Pull and update the the build submodules submodules: git submodule update --init --recursive +ifeq ($(platform), Windows) + echo if errorlevel gtr 7 exit errorlevel > CheckCopyError.bat + type CheckError.bat +endif # Copy the relevant header files into includes include: submodules # Copy commands for Windows ifeq ($(platform), Windows) -mkdir $(mkdirOptions) .\include - robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h $(THEN) ./CheckCopyError.bat - robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h $(THEN) ./CheckCopyError.bat - robocopy "vendor\raylib-cpp\include" "include" *.hpp $(THEN) ./CheckCopyError.bat + robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h $(THEN) .\CheckCopyError.bat + robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h $(THEN) .\CheckCopyError.bat + robocopy "vendor\raylib-cpp\include" "include" *.hpp $(THEN) .\CheckCopyError.bat # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include @@ -78,7 +78,7 @@ lib: submodules cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP ifeq ($(platform), Windows) -mkdir $(mkdirOptions) lib\$(platform) - robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a $(THEN) ./CheckCopyError.bat + robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a $(THEN) .\CheckCopyError.bat else mkdir $(mkdirOptions) lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a From 41decacdc8f6a610996b4c0c76ab3b3e49e49c0f Mon Sep 17 00:00:00 2001 From: Aryeh Date: Sun, 29 Nov 2020 18:04:02 +1100 Subject: [PATCH 58/75] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 93e3f59..ac35e16 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,7 @@ submodules: git submodule update --init --recursive ifeq ($(platform), Windows) echo if errorlevel gtr 7 exit errorlevel > CheckCopyError.bat - type CheckError.bat + type CheckCopyError.bat endif # Copy the relevant header files into includes From 62e5a06b39c699439bb3f51fff6680dff5e01af0 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Sun, 29 Nov 2020 18:06:13 +1100 Subject: [PATCH 59/75] Removed type command --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index ac35e16..dcd3c46 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,6 @@ submodules: git submodule update --init --recursive ifeq ($(platform), Windows) echo if errorlevel gtr 7 exit errorlevel > CheckCopyError.bat - type CheckCopyError.bat endif # Copy the relevant header files into includes From a9feb9f3302e041671f0acb40edd7977d93a5e06 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Sun, 29 Nov 2020 18:08:39 +1100 Subject: [PATCH 60/75] Added dir command --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dcd3c46..91aec98 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,8 @@ setup: include lib submodules: git submodule update --init --recursive ifeq ($(platform), Windows) - echo if errorlevel gtr 7 exit errorlevel > CheckCopyError.bat + echo if errorlevel gtr 7 exit errorlevel > "CheckCopyError.bat" + dir endif # Copy the relevant header files into includes From 6d8ff0b61f30b08b7d5de25a8262d0789315acac Mon Sep 17 00:00:00 2001 From: Aryeh Date: Sun, 29 Nov 2020 18:11:24 +1100 Subject: [PATCH 61/75] Removed trailing . --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 91aec98..bd75f28 100644 --- a/Makefile +++ b/Makefile @@ -62,9 +62,9 @@ include: submodules # Copy commands for Windows ifeq ($(platform), Windows) -mkdir $(mkdirOptions) .\include - robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h $(THEN) .\CheckCopyError.bat - robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h $(THEN) .\CheckCopyError.bat - robocopy "vendor\raylib-cpp\include" "include" *.hpp $(THEN) .\CheckCopyError.bat + robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h $(THEN) "CheckCopyError.bat" + robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h $(THEN) "CheckCopyError.bat" + robocopy "vendor\raylib-cpp\include" "include" *.hpp $(THEN) "CheckCopyError.bat" # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include @@ -83,6 +83,7 @@ else mkdir $(mkdirOptions) lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a endif + # Create the build folder build: mkdir $(mkdirOptions) build From f0581b83fbb21e7cef5d2773db21621fbccb2548 Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Sun, 29 Nov 2020 18:16:13 +1100 Subject: [PATCH 62/75] Removed batch file creation logic --- Makefile | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index bd75f28..9782d0b 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ ifeq ($(OS), Windows_NT) cleanCommand = del ${CURDIR}\build\*.exe else # Check for MacOS/Linux - UNAMEOS := $(shell uname) + UNAMEOS = $(shell uname) ifeq ($(UNAMEOS), Linux) # Set Linux compile macros platform = Linux @@ -52,19 +52,15 @@ setup: include lib # Pull and update the the build submodules submodules: git submodule update --init --recursive -ifeq ($(platform), Windows) - echo if errorlevel gtr 7 exit errorlevel > "CheckCopyError.bat" - dir -endif # Copy the relevant header files into includes include: submodules # Copy commands for Windows ifeq ($(platform), Windows) -mkdir $(mkdirOptions) .\include - robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h $(THEN) "CheckCopyError.bat" - robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h $(THEN) "CheckCopyError.bat" - robocopy "vendor\raylib-cpp\include" "include" *.hpp $(THEN) "CheckCopyError.bat" + -robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h + -robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h + -robocopy "vendor\raylib-cpp\include" "include" *.hpp # Copy commands for UNIX/Linux else mkdir $(mkdirOptions) include @@ -78,7 +74,7 @@ lib: submodules cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP ifeq ($(platform), Windows) -mkdir $(mkdirOptions) lib\$(platform) - robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a $(THEN) .\CheckCopyError.bat + -robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a else mkdir $(mkdirOptions) lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a From 9cb0fe368dcda4a486c9eef2ce2ac7fc60c764f6 Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Sun, 29 Nov 2020 18:27:04 +1100 Subject: [PATCH 63/75] Re-specified mkdir per platform --- Makefile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 9782d0b..f7246dd 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,6 @@ else endif # Set UNIX commands - mkdirOptions = -p THEN = ; cleanCommand = rm $(buildFile) endif @@ -55,15 +54,13 @@ submodules: # Copy the relevant header files into includes include: submodules -# Copy commands for Windows ifeq ($(platform), Windows) - -mkdir $(mkdirOptions) .\include + -mkdir .\include -robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h -robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h -robocopy "vendor\raylib-cpp\include" "include" *.hpp -# Copy commands for UNIX/Linux else - mkdir $(mkdirOptions) include + mkdir -p 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 @@ -73,16 +70,21 @@ endif lib: submodules cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP ifeq ($(platform), Windows) - -mkdir $(mkdirOptions) lib\$(platform) + -mkdir lib\$(platform) -robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a else - mkdir $(mkdirOptions) lib/$(platform) + mkdir -p lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a endif # Create the build folder build: - mkdir $(mkdirOptions) build +ifeq ($(platform), Windows) + -mkdir build +else + mkdir -p build +endif + # Create the build folder and compile the executable compile: build From 6fa0959ac65f473ad0f74561f4fc470979e0c508 Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Sun, 29 Nov 2020 18:30:28 +1100 Subject: [PATCH 64/75] Fixed then command --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f7246dd..c4dfced 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ ifeq ($(OS), Windows_NT) options = -pthread -lopengl32 -lgdi32 -lwinmm -mwindows # Set Windows commands - THEN = & + THEN = && cleanCommand = del ${CURDIR}\build\*.exe else # Check for MacOS/Linux From f2d4a606c3cdd87f4c70da54cb1eaebbc91be6a9 Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Sun, 29 Nov 2020 18:36:18 +1100 Subject: [PATCH 65/75] Separated platforms in Makefile --- Makefile | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index c4dfced..37d6799 100644 --- a/Makefile +++ b/Makefile @@ -8,10 +8,6 @@ ifeq ($(OS), Windows_NT) platform = Windows compiler = g++ options = -pthread -lopengl32 -lgdi32 -lwinmm -mwindows - - # Set Windows commands - THEN = && - cleanCommand = del ${CURDIR}\build\*.exe else # Check for MacOS/Linux UNAMEOS = $(shell uname) @@ -28,10 +24,6 @@ else compiler = clang++ options = -framework CoreVideo -framework IOKit -framework Cocoa -framework GLUT -framework OpenGL endif - - # Set UNIX commands - THEN = ; - cleanCommand = rm $(buildFile) endif # Explicitly set compiler to platform default if unset @@ -68,11 +60,12 @@ endif # Build the raylib static library file and copy it into lib lib: submodules - cd vendor/raylib-cpp/vendor/raylib/src $(THEN) $(MAKE) PLATFORM=PLATFORM_DESKTOP ifeq ($(platform), Windows) + cd vendor/raylib-cpp/vendor/raylib/src && $(MAKE) PLATFORM=PLATFORM_DESKTOP -mkdir lib\$(platform) -robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a else + cd vendor/raylib-cpp/vendor/raylib/src; $(MAKE) PLATFORM=PLATFORM_DESKTOP mkdir -p lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a endif @@ -96,4 +89,8 @@ execute: # Clean up all relevant files clean: - $(cleanCommand) +ifeq ($(platform), Windows) + del "${CURDIR}\build\*.exe" +else + rm $(buildFile) +endif From 8da969e9f7007c7ac9a573a1e75d2ce1034d907a Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Sun, 29 Nov 2020 18:40:09 +1100 Subject: [PATCH 66/75] Updated windows del command --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 37d6799..acc79d3 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,6 @@ ifeq ($(platform), Windows) else mkdir -p build endif - # Create the build folder and compile the executable compile: build @@ -90,7 +89,7 @@ execute: # Clean up all relevant files clean: ifeq ($(platform), Windows) - del "${CURDIR}\build\*.exe" + del build else rm $(buildFile) endif From b825e02264a694b7d74f58798e8dbb21b7020792 Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Sun, 29 Nov 2020 18:44:21 +1100 Subject: [PATCH 67/75] Update clean command for windows --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index acc79d3..f6e9e4c 100644 --- a/Makefile +++ b/Makefile @@ -89,7 +89,7 @@ execute: # Clean up all relevant files clean: ifeq ($(platform), Windows) - del build + rmdir /S build else rm $(buildFile) endif From f26dc388dba5991f6d38dbd10ec12b524b3b8979 Mon Sep 17 00:00:00 2001 From: aryeh Date: Sun, 29 Nov 2020 21:15:41 +1100 Subject: [PATCH 68/75] Removed rmdir --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f6e9e4c..6a78590 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,7 @@ endif # Build the raylib static library file and copy it into lib lib: submodules ifeq ($(platform), Windows) - cd vendor/raylib-cpp/vendor/raylib/src && $(MAKE) PLATFORM=PLATFORM_DESKTOP + cd vendor/raylib-cpp/vendor/raylib/src && "$(MAKE)" PLATFORM=PLATFORM_DESKTOP -mkdir lib\$(platform) -robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a else @@ -89,7 +89,7 @@ execute: # Clean up all relevant files clean: ifeq ($(platform), Windows) - rmdir /S build + del build\app.exe else rm $(buildFile) endif From 65a363ff4390343e61f7f379ac374a719ba329b1 Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Mon, 30 Nov 2020 09:38:03 +1100 Subject: [PATCH 69/75] Updated del command in clean --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6a78590..b8d4956 100644 --- a/Makefile +++ b/Makefile @@ -89,7 +89,8 @@ execute: # Clean up all relevant files clean: ifeq ($(platform), Windows) - del build\app.exe + dir + del \build\app.exe else rm $(buildFile) endif From dcd700de57f90393ae7b173a8481ea7fc5cb4690 Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Mon, 30 Nov 2020 14:24:43 +1100 Subject: [PATCH 70/75] Added extra debugging output for clean target --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b8d4956..56f291c 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,8 @@ execute: clean: ifeq ($(platform), Windows) dir - del \build\app.exe + dir \build + del D:\a\raylib-cpp-starter\raylib-cpp-starter\build\app.exe else rm $(buildFile) endif From 43e4b7a079284203da06dfba0821e2d5f6d1e92a Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Mon, 30 Nov 2020 14:27:02 +1100 Subject: [PATCH 71/75] Removed pre-path from build --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 56f291c..5c3aecf 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,7 @@ execute: clean: ifeq ($(platform), Windows) dir - dir \build + dir build del D:\a\raylib-cpp-starter\raylib-cpp-starter\build\app.exe else rm $(buildFile) From db4d947ebe7443691dfeee1d362e6d4820743d25 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Mon, 30 Nov 2020 14:46:20 +1100 Subject: [PATCH 72/75] Replaced del with erase --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5c3aecf..1dcdb08 100644 --- a/Makefile +++ b/Makefile @@ -91,7 +91,7 @@ clean: ifeq ($(platform), Windows) dir dir build - del D:\a\raylib-cpp-starter\raylib-cpp-starter\build\app.exe + erase build\*.exe else rm $(buildFile) endif From d533475df5031672aa485171154eeb6924c68c06 Mon Sep 17 00:00:00 2001 From: Aryeh Date: Mon, 30 Nov 2020 14:49:10 +1100 Subject: [PATCH 73/75] Removed wildcard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1dcdb08..c497991 100644 --- a/Makefile +++ b/Makefile @@ -91,7 +91,7 @@ clean: ifeq ($(platform), Windows) dir dir build - erase build\*.exe + erase build else rm $(buildFile) endif From c8a4c1a8b4a65d69bce5c315609e8ef2102830ba Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Mon, 30 Nov 2020 15:06:39 +1100 Subject: [PATCH 74/75] Cleaned up Makefile and ignored clean target del for Windows --- Makefile | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index c497991..e66d731 100644 --- a/Makefile +++ b/Makefile @@ -1,29 +1,33 @@ # Set general macros buildFile = build/app -libGenDirectory = src # Check for Windows ifeq ($(OS), Windows_NT) - # Set Windows compile macros + # Set Windows macros platform = Windows compiler = g++ options = -pthread -lopengl32 -lgdi32 -lwinmm -mwindows + THEN = && else # Check for MacOS/Linux UNAMEOS = $(shell uname) ifeq ($(UNAMEOS), Linux) - # Set Linux compile macros + # Set Linux macros platform = Linux compiler = g++ options = -l GL -l m -l pthread -l dl -l rt -l X11 libGenDirectory = # Empty endif ifeq ($(UNAMEOS), Darwin) - # Set macOS compile macros + # Set macOS macros platform = macOS compiler = clang++ options = -framework CoreVideo -framework IOKit -framework Cocoa -framework GLUT -framework OpenGL + libGenDirectory = src endif + + # Set UNIX macros + THEN = ; endif # Explicitly set compiler to platform default if unset @@ -48,24 +52,21 @@ submodules: include: submodules ifeq ($(platform), Windows) -mkdir .\include - -robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h - -robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raymath.h + -robocopy "vendor\raylib-cpp\vendor\raylib\src" "include" raylib.h raymath.h -robocopy "vendor\raylib-cpp\include" "include" *.hpp else mkdir -p 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/vendor/raylib/src/{raylib.h,raymath.h} include cp vendor/raylib-cpp/include/*.hpp include endif # Build the raylib static library file and copy it into lib lib: submodules + cd vendor/raylib-cpp/vendor/raylib/src $(THEN) "$(MAKE)" PLATFORM=PLATFORM_DESKTOP ifeq ($(platform), Windows) - cd vendor/raylib-cpp/vendor/raylib/src && "$(MAKE)" PLATFORM=PLATFORM_DESKTOP -mkdir lib\$(platform) -robocopy "vendor\raylib-cpp\vendor\raylib\src" "lib\Windows" libraylib.a else - cd vendor/raylib-cpp/vendor/raylib/src; $(MAKE) PLATFORM=PLATFORM_DESKTOP mkdir -p lib/$(platform) cp vendor/raylib-cpp/vendor/raylib/$(libGenDirectory)/libraylib.a lib/$(platform)/libraylib.a endif @@ -89,9 +90,7 @@ execute: # Clean up all relevant files clean: ifeq ($(platform), Windows) - dir - dir build - erase build + -del build\app.exe else rm $(buildFile) endif From 727c7d9f758a60861e9c233345fa89fe79c4e226 Mon Sep 17 00:00:00 2001 From: Jonathan Moallem Date: Mon, 30 Nov 2020 15:14:25 +1100 Subject: [PATCH 75/75] Fixed cp command for Linux --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e66d731..87dbff3 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,7 @@ ifeq ($(platform), Windows) -robocopy "vendor\raylib-cpp\include" "include" *.hpp else mkdir -p include - cp vendor/raylib-cpp/vendor/raylib/src/{raylib.h,raymath.h} include + cp vendor/raylib-cpp/vendor/raylib/src/raylib.h vendor/raylib-cpp/vendor/raylib/src/raymath.h include cp vendor/raylib-cpp/include/*.hpp include endif