diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index ecc2c0a..1513246 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -1,5 +1,5 @@
 name: Android Build
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml
index 39821ff..f38931d 100644
--- a/.github/workflows/emscripten.yml
+++ b/.github/workflows/emscripten.yml
@@ -1,5 +1,5 @@
 name: Emscripten Build
-on: [push]
+on: [push, pull_request]
 
 env:
   emscripten-version: 1.39.16
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 237da17..eead1ea 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -1,10 +1,14 @@
 name: Linux Build
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        build-type: ["Debug", "Release"]
 
+    name: Linux ${{ matrix.build-type }}
     steps:
     - uses: actions/checkout@v2
 
@@ -13,7 +17,7 @@ jobs:
 
     - name: Build
       run: |
-        mkdir -p out/debug
-        cd out/debug
-        cmake -DCMAKE_BUILD_TYPE=Debug ../../src/
+        mkdir -p out/${{ matrix.build-type }}
+        cd out/${{ matrix.build-type }}
+        cmake -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} ../../src/
         make
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
new file mode 100644
index 0000000..4f452d0
--- /dev/null
+++ b/.github/workflows/windows.yml
@@ -0,0 +1,44 @@
+name: Windows Build
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: windows-2019
+    strategy:
+      matrix:
+        mingw: ["MINGW32", "MINGW64"]
+        include:
+          - mingw: "MINGW32"
+            package: "mingw-w64-i686"
+          - mingw: "MINGW64"
+            package: "mingw-w64-x86_64"
+    defaults:
+      run:
+        shell: bash.exe --login -eo pipefail "{0}"
+    env:
+      MSYSTEM: ${{ matrix.mingw }}
+      CHERE_INVOKING: 1
+    name: MSYS2 ${{ matrix.mingw }}
+    steps:
+
+    - name: Set up shell
+      run: echo ::add-path::C:\msys64\usr\bin\
+      shell: pwsh
+
+    - name: Print system version
+      run: |
+        uname
+        echo PATH: $PATH
+
+    - name: Install Deps
+      run: pacman -S --noconfirm ${{ matrix.package }}-SDL2 ${{ matrix.package }}-SDL2_ttf
+
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Build
+      run: |
+        mkdir -p out/debug
+        cd out/debug
+        cmake -G"MSYS Makefiles" -DCMAKE_BUILD_TYPE=Debug ../../src/
+        make