Comment

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

diff --git a/development/cmake/scripts/xmingw b/development/cmake/scripts/xmingw
index ec8fcd013d53864936d5072da116650fc049aaa0..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
 
 
 
@@ -95,7 +98,7 @@ checkExitCode
 # build LyX
 #
 
-mergefile=-DLYX_MERGE_FILES=1
+mergefile=-DLYX_MERGE_FILES=0
 #pch=-DLYX_PCH=1
 
 cmake $lyxsrcdir \