From 9c00b1338ceaab88c2df326575ca2df36491ea69 Mon Sep 17 00:00:00 2001
From: Ray <raysan5@gmail.com>
Date: Wed, 19 Aug 2020 23:13:48 +0200
Subject: [PATCH 01/14] Update windows.yml

---
 .github/workflows/windows.yml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 932aac87a..cfa972346 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -54,15 +54,28 @@ jobs:
       uses: microsoft/setup-msbuild@v1.0.1
       if: matrix.compiler == 'msvc16'
    
-    # TODO: Review x86 dynamic library building or remove it
+    # TODO: Review x86 dynamic library building, linking does not work because x86 libraries are not available
     - name: Build Library (MinGW-w64)
       run: |
         cd src
         gcc -v
         make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
+        # make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
         cd ..
       shell: cmd
-      if: matrix.compiler == 'mingw-w64'
+      if: matrix.compiler == 'mingw-w64' && matrix.bits == 32
+      
+    # Previous job should do 32bit and 64bit but there are config issues with the host-machine
+    # TODO: Compile resource file raylib.dll.rc for linkage on raylib.dll generation
+    - name: Build Library (MinGW-w64)
+      run: |
+        cd src
+        gcc -v
+        make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
+        make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
+        cd ..
+      shell: cmd
+      if: matrix.compiler == 'mingw-w64' && matrix.bits == 64
       
     - name: Build Library (MSVC16)
       run: |

From 864ff48e119fdcf137d256e5331e6c66382f6f18 Mon Sep 17 00:00:00 2001
From: Ray <raysan5@gmail.com>
Date: Wed, 19 Aug 2020 23:16:18 +0200
Subject: [PATCH 02/14] Update linux.yml

---
 .github/workflows/linux.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 3269e1a3b..26d3943cb 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -45,15 +45,24 @@ jobs:
         sudo apt-get install -y --no-install-recommends libglfw3 libglfw3-dev libx11-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libxext-dev libxfixes-dev
       
     # TODO: Review i386 shared library building or remove it
-    - name: Build Library
+    - name: Build Library i386
+      run: |
+        cd src
+        gcc -v
+        make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
+        # make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
+        cd ..
+      if: matrix.bits == 32
+ 
+    - name: Build Library amd64
       run: |
-        ls //usr/lib
         cd src
         gcc -v
         make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
         make clean
         make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
         cd ..
+      if: matrix.bits == 64
     
     - name: Generate Artifacts
       run: |

From 5876825bcdef4bcdc8b06745dc47884f821bb028 Mon Sep 17 00:00:00 2001
From: Ray <raysan5@gmail.com>
Date: Thu, 20 Aug 2020 00:05:23 +0200
Subject: [PATCH 03/14] Update webassembly.yml

---
 .github/workflows/webassembly.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/webassembly.yml b/.github/workflows/webassembly.yml
index 56746052c..d4031b616 100644
--- a/.github/workflows/webassembly.yml
+++ b/.github/workflows/webassembly.yml
@@ -35,6 +35,9 @@ jobs:
         mkdir include
         mkdir lib
         cd ../..
+        dir C:\
+        dir C:\Program Files (x86)\
+        dir D:\
    
     - name: Build Library
       run: |

From 3352d54554e136c8a4e84095c34fc9f97a06daa1 Mon Sep 17 00:00:00 2001
From: Ray <raysan5@gmail.com>
Date: Thu, 20 Aug 2020 00:10:52 +0200
Subject: [PATCH 04/14] Update webassembly.yml

---
 .github/workflows/webassembly.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/webassembly.yml b/.github/workflows/webassembly.yml
index d4031b616..e73dc629e 100644
--- a/.github/workflows/webassembly.yml
+++ b/.github/workflows/webassembly.yml
@@ -36,7 +36,9 @@ jobs:
         mkdir lib
         cd ../..
         dir C:\
-        dir C:\Program Files (x86)\
+        dir C:\tools
+        dir C:\tools\msys64
+        dir C:\PROGRA~2\
         dir D:\
    
     - name: Build Library

From 2d86705314482c07b61ee5a6b9765308af5429ce Mon Sep 17 00:00:00 2001
From: Ray <raysan5@gmail.com>
Date: Thu, 20 Aug 2020 00:13:15 +0200
Subject: [PATCH 05/14] Update webassembly.yml

---
 .github/workflows/webassembly.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/webassembly.yml b/.github/workflows/webassembly.yml
index e73dc629e..c641d9fe8 100644
--- a/.github/workflows/webassembly.yml
+++ b/.github/workflows/webassembly.yml
@@ -37,7 +37,7 @@ jobs:
         cd ../..
         dir C:\
         dir C:\tools
-        dir C:\tools\msys64
+        dir C:\msys64
         dir C:\PROGRA~2\
         dir D:\
    

From 4f55d833d35a5925006d9253220eb5f959ca9bc2 Mon Sep 17 00:00:00 2001
From: Ray <raysan5@gmail.com>
Date: Thu, 20 Aug 2020 00:23:55 +0200
Subject: [PATCH 06/14] Update webassembly.yml

---
 .github/workflows/webassembly.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/webassembly.yml b/.github/workflows/webassembly.yml
index c641d9fe8..22bda5604 100644
--- a/.github/workflows/webassembly.yml
+++ b/.github/workflows/webassembly.yml
@@ -35,11 +35,8 @@ jobs:
         mkdir include
         mkdir lib
         cd ../..
-        dir C:\
-        dir C:\tools
-        dir C:\msys64
-        dir C:\PROGRA~2\
-        dir D:\
+        dir C:\msys64\mingw32
+        dir C:\msys64\mingw64
    
     - name: Build Library
       run: |

From 9d74f27abd3a6676c56089ad7fff4883a7d816db Mon Sep 17 00:00:00 2001
From: Ray <raysan5@gmail.com>
Date: Thu, 20 Aug 2020 12:03:07 +0200
Subject: [PATCH 07/14] Update webassembly.yml

---
 .github/workflows/webassembly.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/webassembly.yml b/.github/workflows/webassembly.yml
index 22bda5604..7db3142b9 100644
--- a/.github/workflows/webassembly.yml
+++ b/.github/workflows/webassembly.yml
@@ -22,9 +22,6 @@ jobs:
       with:
         version: 2.0.0
         actions-cache-folder: 'emsdk-cache'
-        
-    - name: Test emsdk
-      run: emcc -v
 
     - name: Setup Environment
       run: | 
@@ -35,12 +32,11 @@ jobs:
         mkdir include
         mkdir lib
         cd ../..
-        dir C:\msys64\mingw32
-        dir C:\msys64\mingw64
    
     - name: Build Library
       run: |
         cd src
+        emcc -v
         make PLATFORM=PLATFORM_WEB EMSDK_PATH="D:/a/raylib/raylib/emsdk-cache/emsdk-master" RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
         cd ..
   

From ec768bb83eb873fddf2db2d76655130222b614e4 Mon Sep 17 00:00:00 2001
From: Ray <raysan5@gmail.com>
Date: Thu, 20 Aug 2020 12:07:13 +0200
Subject: [PATCH 08/14] Update windows.yml

---
 .github/workflows/windows.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index cfa972346..7f2c711d4 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -18,10 +18,12 @@ jobs:
         include:
         - compiler: mingw-w64
           bits: 32
-          ARCH: "x86"  
+          ARCH: "x86"
+          COMPILER_PATH: "C:\\msys64\\mingw32\\bin" 
         - compiler: mingw-w64
           bits: 64
           ARCH: "x64"
+          COMPILER_PATH: "C:\\msys64\\mingw64\\bin"  
         - compiler: msvc16
           bits: 32
           ARCH: "x86"
@@ -59,8 +61,8 @@ jobs:
       run: |
         cd src
         gcc -v
-        make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
-        # make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
+        make PLATFORM=PLATFORM_DESKTOP CC="${{ matrix.COMPILER_PATH }}\\gcc" RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
+        make PLATFORM=PLATFORM_DESKTOP CC="${{ matrix.COMPILER_PATH }}\\gcc" RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
         cd ..
       shell: cmd
       if: matrix.compiler == 'mingw-w64' && matrix.bits == 32

From cb5e4f9b44e5204654d3023ec2cc75ac99dc5972 Mon Sep 17 00:00:00 2001
From: Ray <raysan5@gmail.com>
Date: Thu, 20 Aug 2020 12:09:43 +0200
Subject: [PATCH 09/14] Update windows.yml

---
 .github/workflows/windows.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 7f2c711d4..092648cfd 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -60,9 +60,9 @@ jobs:
     - name: Build Library (MinGW-w64)
       run: |
         cd src
-        gcc -v
-        make PLATFORM=PLATFORM_DESKTOP CC="${{ matrix.COMPILER_PATH }}\\gcc" RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
-        make PLATFORM=PLATFORM_DESKTOP CC="${{ matrix.COMPILER_PATH }}\\gcc" RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
+        ${{ matrix.COMPILER_PATH }}\gcc -v
+        make PLATFORM=PLATFORM_DESKTOP CC="${{ matrix.COMPILER_PATH }}\gcc" RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
+        make PLATFORM=PLATFORM_DESKTOP CC="${{ matrix.COMPILER_PATH }}\gcc" RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
         cd ..
       shell: cmd
       if: matrix.compiler == 'mingw-w64' && matrix.bits == 32

From 600d7b524d8e2de88f003c2f4ef7e964afc2bc5d Mon Sep 17 00:00:00 2001
From: Ray <raysan5@gmail.com>
Date: Thu, 20 Aug 2020 12:16:03 +0200
Subject: [PATCH 10/14] Update windows.yml

---
 .github/workflows/windows.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 092648cfd..95b209aef 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -19,7 +19,7 @@ jobs:
         - compiler: mingw-w64
           bits: 32
           ARCH: "x86"
-          COMPILER_PATH: "C:\\msys64\\mingw32\\bin" 
+          COMPILER_PATH: "C:/msys64/mingw32/bin" 
         - compiler: mingw-w64
           bits: 64
           ARCH: "x64"
@@ -60,9 +60,9 @@ jobs:
     - name: Build Library (MinGW-w64)
       run: |
         cd src
-        ${{ matrix.COMPILER_PATH }}\gcc -v
-        make PLATFORM=PLATFORM_DESKTOP CC="${{ matrix.COMPILER_PATH }}\gcc" RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
-        make PLATFORM=PLATFORM_DESKTOP CC="${{ matrix.COMPILER_PATH }}\gcc" RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
+        ${{ matrix.COMPILER_PATH }}/gcc -v
+        make PLATFORM=PLATFORM_DESKTOP CC="${{ matrix.COMPILER_PATH }}/gcc" RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
+        make PLATFORM=PLATFORM_DESKTOP CC="${{ matrix.COMPILER_PATH }}/gcc" RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
         cd ..
       shell: cmd
       if: matrix.compiler == 'mingw-w64' && matrix.bits == 32

From d43514a44d918705475f706abdefb144959db6c3 Mon Sep 17 00:00:00 2001
From: Ray <raysan5@gmail.com>
Date: Thu, 20 Aug 2020 12:21:38 +0200
Subject: [PATCH 11/14] Update windows.yml

---
 .github/workflows/windows.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 95b209aef..b7b9ab070 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -23,7 +23,7 @@ jobs:
         - compiler: mingw-w64
           bits: 64
           ARCH: "x64"
-          COMPILER_PATH: "C:\\msys64\\mingw64\\bin"  
+          COMPILER_PATH: "C:/msys64/mingw64/bin"  
         - compiler: msvc16
           bits: 32
           ARCH: "x86"
@@ -60,9 +60,9 @@ jobs:
     - name: Build Library (MinGW-w64)
       run: |
         cd src
-        ${{ matrix.COMPILER_PATH }}/gcc -v
-        make PLATFORM=PLATFORM_DESKTOP CC="${{ matrix.COMPILER_PATH }}/gcc" RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
-        make PLATFORM=PLATFORM_DESKTOP CC="${{ matrix.COMPILER_PATH }}/gcc" RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
+        ${{ matrix.COMPILER_PATH }}/i686-w64-mingw32-gcc.exe -v
+        ${{ matrix.COMPILER_PATH }}/mingw32-make PLATFORM=PLATFORM_DESKTOP CC="${{ matrix.COMPILER_PATH }}/i686-w64-mingw32-gcc.exe" RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
+        ${{ matrix.COMPILER_PATH }}/mingw32-make PLATFORM=PLATFORM_DESKTOP CC="${{ matrix.COMPILER_PATH }}/i686-w64-mingw32-gcc.exe" RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
         cd ..
       shell: cmd
       if: matrix.compiler == 'mingw-w64' && matrix.bits == 32

From aa6c3c869d3672338eeb8c985915a0b4d42f4fa3 Mon Sep 17 00:00:00 2001
From: Ray <raysan5@gmail.com>
Date: Thu, 20 Aug 2020 12:28:32 +0200
Subject: [PATCH 12/14] Update windows.yml

---
 .github/workflows/windows.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index b7b9ab070..d1c865164 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -60,9 +60,10 @@ jobs:
     - name: Build Library (MinGW-w64)
       run: |
         cd src
-        ${{ matrix.COMPILER_PATH }}/i686-w64-mingw32-gcc.exe -v
-        ${{ matrix.COMPILER_PATH }}/mingw32-make PLATFORM=PLATFORM_DESKTOP CC="${{ matrix.COMPILER_PATH }}/i686-w64-mingw32-gcc.exe" RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
-        ${{ matrix.COMPILER_PATH }}/mingw32-make PLATFORM=PLATFORM_DESKTOP CC="${{ matrix.COMPILER_PATH }}/i686-w64-mingw32-gcc.exe" RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
+        set PATH=%PATH%;${{ matrix.COMPILER_PATH }}
+        i686-w64-mingw32-gcc.exe -v
+        mingw32-make PLATFORM=PLATFORM_DESKTOP CC="i686-w64-mingw32-gcc.exe" RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
+        mingw32-make PLATFORM=PLATFORM_DESKTOP CC="i686-w64-mingw32-gcc.exe" RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
         cd ..
       shell: cmd
       if: matrix.compiler == 'mingw-w64' && matrix.bits == 32

From d6a566da062ffaa800bcd3cddcd30d450bd8f101 Mon Sep 17 00:00:00 2001
From: Ray <raysan5@gmail.com>
Date: Thu, 20 Aug 2020 12:34:10 +0200
Subject: [PATCH 13/14] Update windows.yml

---
 .github/workflows/windows.yml | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index d1c865164..0bd21b1b5 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -19,11 +19,11 @@ jobs:
         - compiler: mingw-w64
           bits: 32
           ARCH: "x86"
-          COMPILER_PATH: "C:/msys64/mingw32/bin" 
+          COMPILER_NAME: "i686-w64-mingw32-gcc.exe" 
         - compiler: mingw-w64
           bits: 64
           ARCH: "x64"
-          COMPILER_PATH: "C:/msys64/mingw64/bin"  
+          COMPILER_NAME: "x86_64-w64-mingw32-gcc.exe"  
         - compiler: msvc16
           bits: 32
           ARCH: "x86"
@@ -56,30 +56,17 @@ jobs:
       uses: microsoft/setup-msbuild@v1.0.1
       if: matrix.compiler == 'msvc16'
    
-    # TODO: Review x86 dynamic library building, linking does not work because x86 libraries are not available
-    - name: Build Library (MinGW-w64)
-      run: |
-        cd src
-        set PATH=%PATH%;${{ matrix.COMPILER_PATH }}
-        i686-w64-mingw32-gcc.exe -v
-        mingw32-make PLATFORM=PLATFORM_DESKTOP CC="i686-w64-mingw32-gcc.exe" RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
-        mingw32-make PLATFORM=PLATFORM_DESKTOP CC="i686-w64-mingw32-gcc.exe" RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
-        cd ..
-      shell: cmd
-      if: matrix.compiler == 'mingw-w64' && matrix.bits == 32
-      
-    # Previous job should do 32bit and 64bit but there are config issues with the host-machine
     # TODO: Compile resource file raylib.dll.rc for linkage on raylib.dll generation
     - name: Build Library (MinGW-w64)
       run: |
         cd src
-        gcc -v
-        make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
-        make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
+        ${{ matrix.COMPILER_NAME }} -v
+        make PLATFORM=PLATFORM_DESKTOP CC=${{ matrix.COMPILER_NAME }} RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
+        make PLATFORM=PLATFORM_DESKTOP CC=${{ matrix.COMPILER_NAME }} RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
         cd ..
       shell: cmd
-      if: matrix.compiler == 'mingw-w64' && matrix.bits == 64
-      
+      if: matrix.compiler == 'mingw-w64' && matrix.bits == 32
+           
     - name: Build Library (MSVC16)
       run: |
         cd projects/VS2017

From c47fb0a46398b518fd137401047632fe0d34e8e3 Mon Sep 17 00:00:00 2001
From: Ray <raysan5@gmail.com>
Date: Thu, 20 Aug 2020 12:38:56 +0200
Subject: [PATCH 14/14] 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 0bd21b1b5..e28368d10 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -19,10 +19,12 @@ jobs:
         - compiler: mingw-w64
           bits: 32
           ARCH: "x86"
+          COMPILER_PATH: "C:\\msys64\\mingw32\\bin"
           COMPILER_NAME: "i686-w64-mingw32-gcc.exe" 
         - compiler: mingw-w64
           bits: 64
           ARCH: "x64"
+          COMPILER_PATH: "C:\\msys64\\mingw64\\bin"
           COMPILER_NAME: "x86_64-w64-mingw32-gcc.exe"  
         - compiler: msvc16
           bits: 32
@@ -60,6 +62,7 @@ jobs:
     - name: Build Library (MinGW-w64)
       run: |
         cd src
+        set PATH=%PATH%;${{ matrix.COMPILER_PATH }}
         ${{ matrix.COMPILER_NAME }} -v
         make PLATFORM=PLATFORM_DESKTOP CC=${{ matrix.COMPILER_NAME }} RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
         make PLATFORM=PLATFORM_DESKTOP CC=${{ matrix.COMPILER_NAME }} RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B