Update lyx-build script and add header file for Windows.

diff --git a/development/tools/lyx-build b/development/tools/lyx-build
index ce615f82f08dd206ce845d249697e52912bc4c33..5fd4e30d327feeab08b1ced71dc8f59d32a762d5 100755 (executable)
--- a/development/tools/lyx-build
+++ b/development/tools/lyx-build
@@ -22,12 +22,20 @@ COMPILE="YES";
 # Make patch file?
 PATCH="YES";
 
-while getopts ":Cm:P" opt; do
+function usage() {
+echo "lyx-build [-C] [-m MAKEARGS[ [-P]";
+echo " -C: Do not test compilation";
+echo " -m MAKEARGS: Arguments for make";
+echo " -P: Do not build patch files";
+}
+
+while getopts ":Cm:Ph" opt; do
   case $opt in
     C )   COMPILE="";; # don't test compilation
     m )   MAKEOPTS="$OPTARG";;
     P )   PATCH="";; # don't build patch files
-    \? )  echo "Unknown option $opt"; exit 1;;
+    h )   usage; exit 0;;
+    \? )  echo "Unknown option $opt"; usage; exit 1;;
   esac
 done
 shift $(($OPTIND - 1));

diff --git a/src/support/os_win32.cpp b/src/support/os_win32.cpp
index 6e5d6d8ca135e64e226e841276eed1d296eebc26..9e90fd1b37bb8630676a3f7cdd5bc860ecd8d4ed 100644 (file)
--- a/src/support/os_win32.cpp
+++ b/src/support/os_win32.cpp
@@ -32,6 +32,7 @@
 #include "support/lassert.h"
 
 #include <cstdlib>
+#include <iostream>
 #include <vector>
 
 #include <QString>