X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cross-compile;h=852ec95972875592311934e5a7091f857b3c33b2;hb=240a6df48aebb5e17f82452c32e770cdfe9b5d5e;hp=285bb004d8e84109d265ce515d69bc508a0b3075;hpb=40e59fafacbc0df467b9d3c05a6199ff6138949b;p=virtualjaguar

diff --git a/cross-compile b/cross-compile
index 285bb00..852ec95 100755
--- a/cross-compile
+++ b/cross-compile
@@ -6,18 +6,21 @@
 # (C) 2012 Underground Software
 #
 #NOPE, doesn't work: PREFIX=i686-pc-mingw32.static
-echo "Cross compiling for Win32..."
-#echo "Cross compiling for Win64..."
-export PATH=/opt/mxe/usr/bin:$PATH
 #rm makefile-qt
 
-#/opt/mxe/usr/bin/i686-pc-mingw32.static-qmake -o makefile-qt
-#make CROSS=i686-pc-mingw32.static-
+echo "Cross compiling for Win32..."
+SUFFIX=-win32
+export PATH=/opt/mxe-32/usr/bin:$PATH
+/opt/mxe-32/usr/bin/i686-w64-mingw32.static-qmake-qt5 -o makefile-qt
+make CROSS=i686-w64-mingw32.static-
 
-/opt/mxe/usr/bin/x86_64-w64-mingw32.static-qmake-qt5 -o makefile-qt
-make CROSS=x86_64-w64-mingw32.static-
+#echo "Cross compiling for Win64..."
+#SUFFIX=-win64
+#export PATH=/opt/mxe/usr/bin:$PATH
+#/opt/mxe/usr/bin/x86_64-w64-mingw32.static-qmake-qt5 -o makefile-qt
+#make CROSS=x86_64-w64-mingw32.static-
 
 #rel=`svn info | grep Revision | cut -f 2 -d ' '`
 rel=`git log -1 --pretty=format:%ci | cut -d ' ' -f 1 | tr -d -`
-cd release && upx -9v virtualjaguar.exe && zip -9v vj-$rel.zip virtualjaguar.exe
+cd release && upx -9v virtualjaguar.exe && zip -9v vj-$rel-${SUFFIX}.zip virtualjaguar.exe