From 209426304862c804a018423d96d9ebfb5042cfdf Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Mon, 5 May 2014 15:50:15 -0700
Subject: [PATCH] Update Win32/Win64 build scripts

---
 dist-build/Makefile.am                       |  4 ++--
 dist-build/msys-win32.sh                     |  9 ---------
 dist-build/msys2-win32.sh                    | 10 ++++++++++
 dist-build/{msys-win64.sh => msys2-win64.sh} |  2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)
 delete mode 100755 dist-build/msys-win32.sh
 create mode 100755 dist-build/msys2-win32.sh
 rename dist-build/{msys-win64.sh => msys2-win64.sh} (71%)

diff --git a/dist-build/Makefile.am b/dist-build/Makefile.am
index 06394af0..d888f6a0 100644
--- a/dist-build/Makefile.am
+++ b/dist-build/Makefile.am
@@ -5,5 +5,5 @@ EXTRA_DIST = \
 	android-x86.sh \
 	android-mips.sh \
 	ios.sh \
-	msys-win32.sh \
-	msys-win64.sh
+	msys2-win32.sh \
+	msys2-win64.sh
diff --git a/dist-build/msys-win32.sh b/dist-build/msys-win32.sh
deleted file mode 100755
index b91f2d93..00000000
--- a/dist-build/msys-win32.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-export CFLAGS="-O3 -fomit-frame-pointer -march=pentium2 -mtune=nocona"
-export PREFIX="$(pwd)/libsodium-win32"
-
-./configure --prefix="$PREFIX" --exec-prefix="$PREFIX" && \
-make && \
-make check && \
-make install
diff --git a/dist-build/msys2-win32.sh b/dist-build/msys2-win32.sh
new file mode 100755
index 00000000..5809d45c
--- /dev/null
+++ b/dist-build/msys2-win32.sh
@@ -0,0 +1,10 @@
+#! /bin/sh
+
+export CFLAGS="-O3 -fomit-frame-pointer -m32 -march=pentium2 -mtune=nocona"
+export PREFIX="$(pwd)/libsodium-win32"
+
+./configure --prefix="$PREFIX" --exec-prefix="$PREFIX" \
+            --host=i686-w64-mingw32 && \
+make && \
+make check && \
+make install
diff --git a/dist-build/msys-win64.sh b/dist-build/msys2-win64.sh
similarity index 71%
rename from dist-build/msys-win64.sh
rename to dist-build/msys2-win64.sh
index 06b22ff7..a8a98174 100755
--- a/dist-build/msys-win64.sh
+++ b/dist-build/msys2-win64.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-export CFLAGS="-O3 -fomit-frame-pointer -m64"
+export CFLAGS="-O3 -fomit-frame-pointer -m64 -march=pentium2 -mtune=nocona"
 export PREFIX="$(pwd)/libsodium-win64"
 
 ./configure --prefix="$PREFIX" --exec-prefix="$PREFIX" \