Further cmake changes

- made static build option for all windows targets
- made wizard flex interactive
- add 64bit support for libiconv on windows build
- updated test mechanism

2 files changed, 4 insertions, 2 deletions

diff --git a/src/xmlcode.l b/src/xmlcode.l
index 772f919..15b5d7e 100644
--- a/src/xmlcode.l
+++ b/src/xmlcode.l
@@ -17,6 +17,7 @@
  * written by Weston Thayer
  ******************************************************************************/
 
+%option never-interactive
 %{
 
 #include <stdio.h>
@@ -35,6 +36,7 @@
 
 #define YY_NEVER_INTERACTIVE 1
 #define YY_NO_INPUT 1
+#define YY_NO_UNISTD_H 1
 
 static CodeOutputInterface * g_code;
 static QCString      g_curClassName;
diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
index bdb0d0e..467ebe4 100644
--- a/src/xmlgen.cpp
+++ b/src/xmlgen.cpp
@@ -986,7 +986,7 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De
       FileDef *bodyDef = md->getBodyDef();
       if (bodyDef)
       {
-        t << " bodyfile=\"" << bodyDef->absFilePath() << "\"";
+        t << " bodyfile=\"" << stripFromPath(bodyDef->absFilePath()) << "\"";
       }
       t << " bodystart=\"" << md->getStartBodyLine() << "\" bodyend=\"" 
         << md->getEndBodyLine() << "\"";
@@ -1412,7 +1412,7 @@ static void generateXMLForClass(ClassDef *cd,FTextStream &ti)
       FileDef *bodyDef = cd->getBodyDef();
       if (bodyDef)
       {
-        t << " bodyfile=\"" << bodyDef->absFilePath() << "\"";
+        t << " bodyfile=\"" << stripFromPath(bodyDef->absFilePath()) << "\"";
       }
       t << " bodystart=\"" << cd->getStartBodyLine() << "\" bodyend=\"" 
         << cd->getEndBodyLine() << "\"";