diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index c194df6c6..0401ea0be 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       max-parallel: 1
       matrix:
-        compiler: [mingw-w64, msvc16]
+        compiler: [mingw-w64, clang, msvc16]
         bits: [32, 64]
         include:
         - compiler: mingw-w64
@@ -26,6 +26,14 @@ jobs:
           ARCH: "x86_64"
           COMPILER_PATH: "C:\\msys64\\mingw64\\bin"
           WINDRES_ARCH: pe-x86-64
+        - compiler: clang
+          bits: 32
+          ARCH: "i686"
+          COMPILER_PATH: "C:\\msys64\\clang32\\bin"
+        - compiler: clang
+          bits: 64
+          ARCH: "x86_64"
+          COMPILER_PATH: "C:\\msys64\\clang64\\bin"
         - compiler: msvc16
           bits: 32
           ARCH: "x86"
@@ -53,8 +61,7 @@ jobs:
         mkdir include
         mkdir lib
         cd ../../../raylib
-        dir C:\msys64\clang32
-        dir C:\msys64\clang64
+        dir C:\msys64\clang32\bin
 
     # Setup MSBuild.exe path if required
     - name: Setup MSBuild
@@ -64,7 +71,6 @@ jobs:
     - name: Build Library (MinGW-w64)
       run: |
         cd src
-        set PATH=%PATH%;${{ matrix.COMPILER_PATH }}
         ${{ matrix.ARCH }}-w64-mingw32-gcc.exe -v
         ${{ matrix.COMPILER_PATH }}/windres.exe -h
         make PLATFORM=PLATFORM_DESKTOP CC=${{ matrix.ARCH }}-w64-mingw32-gcc.exe RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
@@ -73,6 +79,16 @@ jobs:
         cd ..
       shell: cmd
       if: matrix.compiler == 'mingw-w64'
+  
+    - name: Build Library (Clang)
+      run: |
+        cd src
+        ${{ matrix.COMPILER_PATH }}\clang.exe -v
+        make PLATFORM=PLATFORM_DESKTOP CC=${{ matrix.ARCH }}-w64-mingw32-gcc.exe RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
+        make PLATFORM=PLATFORM_DESKTOP CC=${{ matrix.ARCH }}-w64-mingw32-gcc.exe RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
+        cd ..
+      shell: cmd
+      if: matrix.compiler == 'clang'
 
     - name: Build Library (MSVC16)
       run: |