X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cross-compile;h=afbca738bec04d41686a5f670a08269f02bb9b95;hb=refs%2Fheads%2Fmaster;hp=4a8c4438499a0fc319c62dc5086eb8c908e4ce2c;hpb=62587015fb12ec54b1702bfa17077e4b8af44b19;p=virtualjaguar

diff --git a/cross-compile b/cross-compile
index 4a8c443..afbca73 100755
--- a/cross-compile
+++ b/cross-compile
@@ -5,14 +5,22 @@
 # by James Hammons
 # (C) 2012 Underground Software
 #
-#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
-#make CROSS=i686-pc-mingw32.static-
-make CROSS=x86_64-w64-mingw32.static-
+#NOPE, doesn't work: PREFIX=i686-pc-mingw32.static
+#rm makefile-qt
+
+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-
+
+#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