diff --git a/output64/dll/bizswan.dll b/output64/dll/bizswan.dll
index b41897fd48..7e3a0341d6 100644
Binary files a/output64/dll/bizswan.dll and b/output64/dll/bizswan.dll differ
diff --git a/output64/dll/libgcc_s_seh-1.dll b/output64/dll/libgcc_s_seh-1.dll
new file mode 100644
index 0000000000..12a362ad9d
Binary files /dev/null and b/output64/dll/libgcc_s_seh-1.dll differ
diff --git a/output64/dll/libquicknes.dll b/output64/dll/libquicknes.dll
new file mode 100644
index 0000000000..3e35c8bc7c
Binary files /dev/null and b/output64/dll/libquicknes.dll differ
diff --git a/output64/dll/libstdc++-6.dll b/output64/dll/libstdc++-6.dll
new file mode 100644
index 0000000000..bdb055a4bd
Binary files /dev/null and b/output64/dll/libstdc++-6.dll differ
diff --git a/output64/dll/libwinpthread-1.dll b/output64/dll/libwinpthread-1.dll
new file mode 100644
index 0000000000..e25834ad64
Binary files /dev/null and b/output64/dll/libwinpthread-1.dll differ
diff --git a/quicknes/mingw/Makefile b/quicknes/mingw/Makefile
index 6761074f8a..97ea9797d0 100644
--- a/quicknes/mingw/Makefile
+++ b/quicknes/mingw/Makefile
@@ -1,12 +1,29 @@
 CXX = g++
-CXXFLAGS = -Wall -DDISABLE_AUTO_FILE -D__LIBRETRO__ -DNDEBUG -I.. -O3 -Wno-multichar -fno-exceptions -fomit-frame-pointer -march=pentium4 -mtune=core2 -flto
+RM = rm
+CP = cp
+
+MACHINE = $(shell $(CXX) -dumpmachine)
+ifneq (,$(findstring i686,$(MACHINE)))
+	ARCH = 32
+else ifneq (,$(findstring x86_64,$(MACHINE)))
+	ARCH = 64
+else
+	$(error Unknown arch)
+endif
+
+CXXFLAGS_32 = -march=pentium4 -mtune=core2
+CXXFLAGS_64 =
+CXXFLAGS = -Wall -DDISABLE_AUTO_FILE -D__LIBRETRO__ -DNDEBUG -I.. -O3 -Wno-multichar -fno-exceptions -fomit-frame-pointer -flto $(CXXFLAGS_$(ARCH)) 
 # TODO: include these as options in the Makefile
 # -fprofile-generate
 # -fprofile-use
 TARGET = libquicknes.dll
-LDFLAGS = -shared -static -static-libgcc -static-libstdc++ $(CXXFLAGS)
-RM = rm
-CP = cp
+LDFLAGS_32 = -static -static-libgcc -static-libstdc++
+LDFLAGS_64 =
+LDFLAGS = -shared $(LDFLAGS_$(ARCH)) $(CXXFLAGS)
+
+DEST_32 = ../../output/dll
+DEST_64 = ../../output64/dll
 
 SRCS = \
 	../nes_emu/abstract_file.cpp \
@@ -62,4 +79,4 @@ clean:
 	$(RM) $(TARGET)
 	
 install:
-	$(CP) $(TARGET) ../../output/dll
+	$(CP) $(TARGET) $(DEST_$(ARCH))
diff --git a/wonderswan/mingw/Makefile b/wonderswan/mingw/Makefile
index 8995fa61ac..03e7b90727 100644
--- a/wonderswan/mingw/Makefile
+++ b/wonderswan/mingw/Makefile
@@ -13,7 +13,10 @@ endif
 
 CXXFLAGS = -Wall -DLSB_FIRST -I.. -Wno-multichar -O3 -Wzero-as-null-pointer-constant -std=gnu++11 -fomit-frame-pointer -fno-exceptions -flto
 TARGET = bizswan.dll
-LDFLAGS = -shared -static-libgcc -static-libstdc++ -static $(CXXFLAGS)
+
+LDFLAGS_32 = -static -static-libgcc -static-libstdc++
+LDFLAGS_64 =
+LDFLAGS = -shared $(LDFLAGS_$(ARCH)) $(CXXFLAGS)
 
 DEST_32 = ../../output/dll
 DEST_64 = ../../output64/dll