diff --git a/Makefile.base.mk b/Makefile.base.mk
index 13940c1..b248d89 100644
--- a/Makefile.base.mk
+++ b/Makefile.base.mk
@@ -90,8 +90,9 @@ BASE_FLAGS += -D_WIN32_WINNT=0x0600
 BASE_FLAGS += -I$(abspath $(ROOT)/include/mingw-compat)
 endif
 
-BASE_OPTS += -fno-finite-math-only
-BASE_OPTS += -fno-strict-aliasing
+# make sure these flags always end up last
+BUILD_C_FLAGS += -fno-finite-math-only -fno-strict-aliasing
+BUILD_CXX_FLAGS += -fno-finite-math-only -fno-strict-aliasing
 
 # -----------------------------------------------------------------------------
 # Rack build flags
diff --git a/dpf b/dpf
index dc6557a..79cd0a4 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit dc6557a3c935ae4bb68f89d8bc698a805fff788e
+Subproject commit 79cd0a46b2caaa242ac8fd8ad198ae067826e5ea