diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index e28368d10..d2cc709d5 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -18,14 +18,12 @@ jobs:
         include:
         - compiler: mingw-w64
           bits: 32
-          ARCH: "x86"
+          ARCH: "i686"
           COMPILER_PATH: "C:\\msys64\\mingw32\\bin"
-          COMPILER_NAME: "i686-w64-mingw32-gcc.exe" 
         - compiler: mingw-w64
           bits: 64
-          ARCH: "x64"
+          ARCH: "x86_64"
           COMPILER_PATH: "C:\\msys64\\mingw64\\bin"
-          COMPILER_NAME: "x86_64-w64-mingw32-gcc.exe"  
         - compiler: msvc16
           bits: 32
           ARCH: "x86"
@@ -34,7 +32,7 @@ jobs:
           bits: 64
           ARCH: "x64" 
           VSBINPATH: "x64"
-          
+
     env:
       RELEASE_NAME: raylib-3.1_win${{ matrix.bits }}_${{ matrix.compiler }}
 
@@ -57,19 +55,20 @@ jobs:
     - name: Setup MSBuild
       uses: microsoft/setup-msbuild@v1.0.1
       if: matrix.compiler == 'msvc16'
-   
+
     # TODO: Compile resource file raylib.dll.rc for linkage on raylib.dll generation
     - 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
+        ${{ matrix.ARCH }}-w64-mingw32-gcc.exe -v
+        make PLATFORM=PLATFORM_DESKTOP CC=${{ matrix.ARCH }}-w64-mingw32-gcc.exe RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
+        windres raylib.dll.rc -o raylib.dll.rc.data --target=pe-${{ matrix.ARCH }}
+        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 == 'mingw-w64' && matrix.bits == 32
-           
+      if: matrix.compiler == 'mingw-w64'
+
     - name: Build Library (MSVC16)
       run: |
         cd projects/VS2017
@@ -81,7 +80,7 @@ jobs:
         cd ../..
       shell: cmd
       if: matrix.compiler == 'msvc16'
-      
+
     - name: Generate Artifacts
       run: |
         copy /Y .\src\raylib.h .\build\${{ env.RELEASE_NAME }}\include\raylib.h
@@ -89,7 +88,7 @@ jobs:
         7z a ./${{ env.RELEASE_NAME }}.zip ./${{ env.RELEASE_NAME }}
         dir
       shell: cmd
-        
+
     - name: Upload Artifacts
       uses: actions/upload-artifact@v2
       with:
@@ -106,4 +105,3 @@ jobs:
           asset_name: ${{ env.RELEASE_NAME }}.zip
           asset_content_type: application/zip
       if: github.event_name == 'release' && github.event.action == 'published'
-