diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0731310..1c7031d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,8 +23,8 @@ jobs:
         sudo apt-get install -yq libasound2-dev libpulse-dev liblo-dev libgl1-mesa-dev
     - name: Build Linux native
       env:
-        CFLAGS: $BASE_FLAGS -mfpmath=sse
-        CXXFLAGS: $BASE_FLAGS -mfpmath=sse
+        CFLAGS: "${BASE_FLAGS} -mfpmath=sse"
+        CXXFLAGS: "${BASE_FLAGS} $BASE_FLAGS -mfpmath=sse"
       run: |
         make NOOPT=true
     - uses: actions/upload-artifact@v2
@@ -56,39 +56,25 @@ jobs:
           bin/*
           !bin/*-dssi.dylib
 
-  # linux with win64 cross-compilation
-  #win64:
-    #runs-on: ubuntu-20.04
-    #steps:
-    #- uses: actions/checkout@v2
-      #with:
-        #submodules: recursive
-    #- name: Set up cache
-      #uses: actions/cache@v2
-      #with:
-        #path: ~/apt-archives
-        #key: cache-win64
-    #- name: Restore debian packages cache
-      #run: |
-        #if [ -d ~/apt-archives ] && [ "$(ls ~/apt-archives | wc -l)" -ne 0 ]; then \
-          #sudo cp ~/apt-archives/*.deb /var/cache/apt/archives/; \
-        #fi
-    #- name: Set up dependencies
-      #run: |
-        #wget -qO- https://dl.winehq.org/wine-builds/winehq.key | sudo apt-key add - && \
-        #sudo dpkg --add-architecture i386 && \
-        #sudo apt-add-repository -y 'deb https://dl.winehq.org/wine-builds/ubuntu/ focal main' && \
-        #sudo apt-get update -qq && \
-        #sudo apt-get install -yq mingw-w64 binfmt-support binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 winehq-stable
-    #- name: Cache debian packages
-      #run: |
-        #mkdir -p ~/apt-archives && \
-        #sudo mv /var/cache/apt/archives/*.deb ~/apt-archives/
-    #- name: Build win64 cross-compiled
-      #shell: bash
-      #run: |
-        #make
-    #- uses: actions/upload-artifact@v2
-      #with:
-        #name: win64 installer
-        #path: setup/inno/PawPaw-*.exe
+  win64:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: recursive
+    - name: Set up dependencies
+      run: |
+        sudo apt-get install -yq mingw-w64 binfmt-support binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64
+    - name: Build win64 cross-compiled
+      env:
+        CC: x86_64-w64-mingw32-gcc
+        CXX: x86_64-w64-mingw32-g++
+        LDFLAGS: -static -static-libgcc -static-libstdc++
+      run: |
+        make
+    - uses: actions/upload-artifact@v2
+      with:
+        name: macOS universal
+        path: |
+          bin/*
+          !bin/*-dssi.dll
diff --git a/dpf b/dpf
index 1b5a74a..8514dc7 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit 1b5a74ac5580ca6ad3343024a891e5ce3ecbfcd7
+Subproject commit 8514dc72ad3bbefb1a5ac4cf0df2ddab60d261db