Comment

[lyx.git] / development / cmake / scripts / xmingw

diff --git a/development/cmake/scripts/xmingw b/development/cmake/scripts/xmingw
index 517291d159c28aca825dbc8743935a45d1cbf03c..ec287da7c94f16ebbc922f42e0e280016c9b2ca1 100755 (executable)
--- a/development/cmake/scripts/xmingw
+++ b/development/cmake/scripts/xmingw
@@ -2,7 +2,10 @@
 #!/bin/sh
 #
 # Installed MinGW needed.
-# Ubuntu : sudo apt-get install g++-mingw-w64-i686
+# Ubuntu :
+#   sudo apt-get install g++-mingw-w64-i686
+#   sudo update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix
+#   sudo update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix
 
 
 
@@ -19,7 +22,7 @@ builddir=$PWD
 # ---------------------------------------------------------
 # set 'versionname' to overwrite generated one based on 'ver'
 #
-ver=2.2
+ver=2.3
 date=`date --utc '+%Y.%m.%d-%H.%M'`
 if [ -z $versionname ]; then
     versionname=LyX$ver-$date
@@ -95,7 +98,7 @@ checkExitCode
 # build LyX
 #
 
-mergefile=-DLYX_MERGE_FILES=1
+mergefile=-DLYX_MERGE_FILES=0
 #pch=-DLYX_PCH=1
 
 cmake $lyxsrcdir \
@@ -106,7 +109,6 @@ cmake $lyxsrcdir \
     -DLYX_XMINGW=$compiler \
     -DLYX_USE_QT=QT5 \
     -DLYX_QUIET=1 \
-    -DLYX_ENABLE_CXX11=1 \
     -DLYX_HUNSPELL=1 \
     -DLYX_3RDPARTY_BUILD=1 \
     $pch $mergefile
@@ -125,8 +127,9 @@ lyxmake translations
 lyxmake doc
 lyxmake LyX 
 lyxmake tex2lyx
-lyxmake all
 
+make install
+checkExitCode
 
 
 # ---------------------------------------------------------