Spitting generated files better from source files

This patch is a patch for the build system so that less (no) generated files are in the source directories and also that the different build (on windows are independent of each others). Also the different sub-projects (e.g. doxygen , doxywizard) don't share any files anymore. - ./.gitignore A number of files are not in the src directory anymore. generated directories are included. rtf and xml directories are there for possible future use. - ./Doxyfile The generated files are not anymore in the src directory so they don't have to be excluded anymore - ./configure Adjustmenst so the generated files are in the different subdirectories - ./Makefile.in - addon/doxmlparser/examples/metrics/metrics.pro.in - addon/doxmlparser/src/doxmlparser.pro.in - addon/doxmlparser/test/xmlparse.pro.in - addon/doxyapp/doxyapp.pro.in - addon/doxysearch/doxyindexer.pro.in - addon/doxysearch/doxysearch.pro.in - addon/doxywizard/Makefile.in - addon/doxywizard/doxywizard.pro.in - libmd5/libmd5.pro.in - qtools/qtools.pro.in - src/Makefile.in - src/doxygen.pro.in - src/libdoxycfg.pro.in - src/libdoxycfg.t.in - src/libdoxygen.pro.in - src/libdoxygen.t.in Adjustment to the new directory structure - addon/doxywizard/expert.cpp include file is generated in the generated_src/doxywizard directory, referenced through -I on compile line - src/lang_cfg.h File is now automatically generated - src/languages.py Correction of used path for new structure - src/settings.py - src/version.py Place for resulting file handled through an argument, so it is possible to have a separate file for each sub-project - tmake/lib/win32-g++/generic.t - tmake/lib/win32-mingw/generic.t The destination path was added twice, in case of a depth of more than 1 level (doxmlparser) this lead to problems - winbuild/Config.rules - winbuild/Gen_head.rules - winbuild/Languages.rules - winbuild/Lex.rules - winbuild/Settings.rules - winbuild/Version.rules correcting some path of generated files - winbuild/Doxygen.sln Build order dependency could be dropped as the version.cpp file is now a generated file for doxygen and doxywizard - winbuild/Doxygen.vcproj - winbuild/Doxywizard.vcproj Corrected paths to the new structure. Added unistd as an external generated file - winbuild/unistd.h File is now generated - winbuild/Unistd.rules - winbuild/unistd.py Generated unistd for doxygen and doxywizard in a consistent way. - winbuild/doxyindexer.vcproj - winbuild/doxysearch.vcproj - winbuild/qtools.vcproj Corrected paths to the new structure. - winbuild/runbison.bat - winbuild/version.bat Not used anymore everything handled through rules.

Spitting generated files better from source files
This patch is a patch for the build system so that less (no) generated files are in the source directories and also that the different build (on windows are independent of each others). Also the different sub-projects (e.g. doxygen , doxywizard) don't share any files anymore. - ./.gitignore A number of files are not in the src directory anymore. generated directories are included. rtf and xml directories are there for possible future use. - ./Doxyfile The generated files are not anymore in the src directory so they don't have to be excluded anymore - ./configure Adjustmenst so the generated files are in the different subdirectories - ./Makefile.in - addon/doxmlparser/examples/metrics/metrics.pro.in - addon/doxmlparser/src/doxmlparser.pro.in - addon/doxmlparser/test/xmlparse.pro.in - addon/doxyapp/doxyapp.pro.in - addon/doxysearch/doxyindexer.pro.in - addon/doxysearch/doxysearch.pro.in - addon/doxywizard/Makefile.in - addon/doxywizard/doxywizard.pro.in - libmd5/libmd5.pro.in - qtools/qtools.pro.in - src/Makefile.in - src/doxygen.pro.in - src/libdoxycfg.pro.in - src/libdoxycfg.t.in - src/libdoxygen.pro.in - src/libdoxygen.t.in Adjustment to the new directory structure - addon/doxywizard/expert.cpp include file is generated in the generated_src/doxywizard directory, referenced through -I on compile line - src/lang_cfg.h File is now automatically generated - src/languages.py Correction of used path for new structure - src/settings.py - src/version.py Place for resulting file handled through an argument, so it is possible to have a separate file for each sub-project - tmake/lib/win32-g++/generic.t - tmake/lib/win32-mingw/generic.t The destination path was added twice, in case of a depth of more than 1 level (doxmlparser) this lead to problems - winbuild/Config.rules - winbuild/Gen_head.rules - winbuild/Languages.rules - winbuild/Lex.rules - winbuild/Settings.rules - winbuild/Version.rules correcting some path of generated files - winbuild/Doxygen.sln Build order dependency could be dropped as the version.cpp file is now a generated file for doxygen and doxywizard - winbuild/Doxygen.vcproj - winbuild/Doxywizard.vcproj Corrected paths to the new structure. Added unistd as an external generated file - winbuild/unistd.h File is now generated - winbuild/Unistd.rules - winbuild/unistd.py Generated unistd for doxygen and doxywizard in a consistent way. - winbuild/doxyindexer.vcproj - winbuild/doxysearch.vcproj - winbuild/qtools.vcproj Corrected paths to the new structure. - winbuild/runbison.bat - winbuild/version.bat Not used anymore everything handled through rules.
8885016b · albert-github · Dimitri van Heesch · 5ea2f2a1 · 8885016b · 8885016b
Commit 8885016b authored Jan 06, 2014 by albert-github Committed by Dimitri van Heesch Jan 21, 2014
44 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -32,21 +32,12 @@
 /addon/doxyapp/Makefile.doxyapp
 /addon/doxywizard/Makefile
 /addon/doxywizard/Makefile.doxywizard
-/addon/doxywizard/config_doxyw.cpp
-/addon/doxywizard/configdoc.cpp
-/addon/doxywizard/moc
-/addon/doxywizard/obj
-/addon/doxywizard/rcc
 /addon/doxmlparser/objects
 /addon/doxmlparser/lib
 /addon/doxmlparser/test/Makefile.xmlparse
 /addon/doxmlparser/test/xmlparse.exe
 /addon/doxmlparser/examples/metrics/obj
 /addon/doxmlparser/examples/metrics/metrics.exe
-/winbuild/config_lex.cpp
-/winbuild/moc
-/winbuild/obj
-/winbuild/rcc
 *.idb
 *.pdb
 /examples/Makefile
@@ -54,59 +45,12 @@

 /bin
 /lib
+/generated_src
 /objects
-/src/ce_lex.cpp
-/src/ce_parse.cpp
-/src/ce_parse.h
-/src/code.cpp
-/src/commentcnv.cpp
-/src/commentscan.cpp
-/src/config.cpp
-/src/declinfo.cpp
-/src/defargs.cpp
-/src/doctokenizer.cpp
-/src/fortrancode.cpp
-/src/fortranscanner.cpp
-/src/pre.cpp
-/src/pycode.cpp
-/src/pyscanner.cpp
-/src/scanner.cpp
-/src/tclscanner.cpp
-/src/version.cpp
-/src/vhdlcode.cpp
-/src/vhdlparser.cpp
-/src/vhdlparser.h
-/src/vhdlscanner.cpp
-/src/configoptions.cpp
-/src/Makefile
-/src/bib2xhtml.pl.h
-/src/compound.xsd.h
-/src/constexp.cpp
-/src/doxygen.bst.h
-/src/doxygen.css.h
-/src/doxygen.sty.h
-/src/dynsections.js.h
-/src/extsearch.js.h
-/src/footer.html.h
-/src/header.html.h
-/src/index.xsd.h
-/src/jquery_fx.js.h
-/src/jquery_p1.js.h
-/src/jquery_p2.js.h
-/src/jquery_p3.js.h
-/src/jquery_pt.js.h
-/src/jquery_ui.js.h
-/src/layout_default.xml.h
-/src/navtree.css.h
-/src/navtree.js.h
-/src/resize.js.h
-/src/search.css.h
-/src/search.js.h
-/src/search_functions.php.h
-/src/search_opensearch.php.h
-/src/svgpan.js.h
-/src/settings.h
+/moc
+/rcc

+/src/Makefile

 /doc/Makefile
 /doc/translator_report.txt
@@ -118,3 +62,5 @@
 /examples/*/html
 /html
 /latex
+/rtf
+/xml
--- a/Doxyfile
+++ b/Doxyfile
@@ -102,55 +102,8 @@ FILE_PATTERNS          = *.h \
                         *.cpp \
                         *.md
 RECURSIVE              = NO
-EXCLUDE                = src/code.cpp \
-                         src/ce_lex.cpp \
-                         src/ce_parse.cpp \
-                         src/declinfo.cpp \
-                         src/defargs.cpp \
-                         src/doxytag.cpp \
-                         src/pre.cpp \
-                         src/scanner.cpp \
-                         src/tag.cpp \
-                         src/doctokenizer.cpp \
-                         src/logos.cpp \
-                         src/suffixtree.cpp \
-                         src/suffixtree.h \
-                         src/commentcnv.cpp \
-                         src/commentscan.cpp \
-                         src/pycode.cpp \
-                         src/config.cpp \
-                         src/pyscanner.cpp \
-                         src/fortranscanner.cpp \
-                         src/fortrancode.cpp \
-                         src/vhdlscanner.cpp \
-                         src/vhdlparser.cpp \
-                         src/vhdlcode.cpp \
-                         src/tclscanner.cpp \
-                         src/lodepng.cpp \
-                         src/doxygen.css.h \
-                         src/doxygen.js.h \
-                         src/doxygen.php.h \
-                         src/compound.xsd.h \
-                         src/layout_default.xml.h \
-                         src/bib2xhtml.pl.h \
-                         src/doxygen.bst.h \
-                         src/header.html.h \
-                         src/index.xsd.h \
-                         src/jquery.js.h \
-                         src/jquery_fx.js.h \
-                         src/jquery_ui.js.h \
-                         src/navtree.css.h \
-                         src/navtree.hs.h \
-                         src/search.css.h \
-                         src/search_functions.php.h \
-                         src/search_opensearch.php.h \
-                         src/search.js.h \
-                         src/navtree.js.h \
-                         src/resize.js.h \
-                         src/svgpan.js.h \
-                         src/dynsections.js.h \
-                         src/extsearch.js.h \
-                         src/footer.html.h
+EXCLUE                 = src/logos.cpp \
+                         src/lodepng.cpp
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_SYMBOLS        =
 EXAMPLE_PATH           =

--- a/Makefile.in
+++ b/Makefile.in
-#all: src/version.cpp doxywizard 
-#	cd qtools ; $(MAKE)
-#	cd src ; $(MAKE)

 DESTDIR = 

@@ -31,7 +28,7 @@ clean: FORCE
 	-cd addon/doxmlparser/test ; $(MAKE) clean
 	-cd addon/doxmlparser/examples/metrics ; $(MAKE) clean
 	-rm -f bin/doxy*
-	-rm -f objects/*.o
+	-rm -f objects/*/*.o

 distclean: clean
 	-cd src ; $(MAKE) distclean
@@ -46,13 +43,13 @@ distclean: clean
 	-rm -f bin/doxy*
 	-rm -f html
 	-rm -f latex
-	-rm -f objects/*.o
+	-rm -f objects/*/*.o
 	-rm -f src/Makefile.doxygen src/Makefile.libdoxygen 
 	-rm -f src/Makefile.libdoxycfg src/libdoxycfg.t src/libdoxygen.t
 	-rm -f libmd5/Makefile.libmd5
 	-rm -f .makeconfig .tmakeconfig
 	-rm -f src/doxygen.pro src/libdoxygen.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro
-	-rm -f src/version.cpp 
+	-rm -f generated_src/doxygen/version.cpp 
 	-rm -f addon/doxywizard/doxywizard.pro
 	-rm -f VERSION
 	-rm -f packages/rpm/doxygen.spec
@@ -122,12 +119,6 @@ dist: clean
 	tar zcvf $(DISTDIR).src.tar.gz $(DISTDIR)
 	rm -rf $(DISTDIR)

-src/version.cpp: Makefile
-	echo "char versionString[]=\"$(VERSION)\";" > src/version.cpp
-
-addon/doxywizard/version.cpp: Makefile
-	echo "char versionString[]=\"$(VERSION)\";" > addon/doxywizard/version.cpp
-
 DISTDIR = doxygen-`echo $(VERSION) | tr - _`
 rpm: dist
 	gzip -df $(DISTDIR).src.tar.gz

--- a/addon/doxmlparser/examples/metrics/metrics.pro.in
+++ b/addon/doxmlparser/examples/metrics/metrics.pro.in
@@ -2,19 +2,19 @@ TEMPLATE     =	app.t
 CONFIG       =	console warn_on $extraopts
 HEADERS      =	
 SOURCES      =	main.cpp
-unix:LIBS                   += -L../../../../lib -L../../lib -ldoxmlparser -lqtools
+unix:LIBS                   += -L../../../../lib -ldoxmlparser -lqtools
 win32:INCLUDEPATH           += .
-win32-mingw:LIBS            += -L../../../../lib -L../../lib -ldoxmlparser -lqtools
+win32-mingw:LIBS            += -L../../../../lib -ldoxmlparser -lqtools
 win32-msvc:LIBS             += doxmlparser.lib qtools.lib shell32.lib 
-win32-msvc:TMAKE_LFLAGS     += /LIBPATH:..\..\..\..\lib;..\..\lib
+win32-msvc:TMAKE_LFLAGS     += /LIBPATH:..\..\..\..\lib;
 win32-borland:LIBS          += doxmlparser.lib qtools.lib shell32.lib
-win32-borland:TMAKE_LFLAGS  += -L..\..\..\..\lib -L..\..\lib
+win32-borland:TMAKE_LFLAGS  += -L..\..\..\..\lib
 win32:TMAKE_CXXFLAGS        += -DQT_NODLL
-DESTDIR                     = 
-OBJECTS_DIR                 = obj
+DESTDIR                     = ../../../../bin
+OBJECTS_DIR                 = ../../../../objects/doxmlparer/metrics
 TARGET                      = metrics
 DEPENDPATH                  = ../../include
 INCLUDEPATH                += ../../../../qtools ../../include
-unix:TARGETDEPS             = ../../lib/libdoxmlparser.a
-win32:TARGETDEPS            = ..\..\lib\doxmlparser.lib
+unix:TARGETDEPS             = ../../../../lib/libdoxmlparser.a
+win32:TARGETDEPS            = ..\..\..\..\lib\doxmlparser.lib

--- a/addon/doxmlparser/src/doxmlparser.pro.in
+++ b/addon/doxmlparser/src/doxmlparser.pro.in
@@ -20,8 +20,8 @@ win32-msvc:TMAKE_LFLAGS    += /LIBPATH:....\\..\lib
 win32-borland:LIBS         += qtools.lib doxycfg.lib shell32.lib
 win32-borland:TMAKE_LFLAGS += -L..\..\..\lib
 win32:TMAKE_CXXFLAGS       += -DQT_NODLL
-DESTDIR                     = ../lib
-OBJECTS_DIR                =  ../objects
+DESTDIR                     = ../../../lib
+OBJECTS_DIR                 = ../../../objects/doxmlparser
 TARGET                      = doxmlparser
 INCLUDEPATH                += ../../../qtools ../include

--- a/addon/doxmlparser/test/xmlparse.pro.in
+++ b/addon/doxmlparser/test/xmlparse.pro.in
@@ -2,19 +2,19 @@ TEMPLATE     =	app.t
 CONFIG       =	console warn_on $extraopts
 HEADERS      =	
 SOURCES      =	main.cpp
-unix:LIBS                   += -L../../../lib -L../lib -ldoxmlparser -lqtools
+unix:LIBS                   += -L../../../lib -ldoxmlparser -lqtools
 win32:INCLUDEPATH           += .
-win32-mingw:LIBS            += -L../../../lib -L../lib -ldoxmlparser -lqtools
+win32-mingw:LIBS            += -L../../../lib -ldoxmlparser -lqtools
 win32-msvc:LIBS             += doxmlparser.lib qtools.lib shell32.lib 
 win32-msvc:TMAKE_LFLAGS     += /LIBPATH:..\..\..\lib;..\lib
 win32-borland:LIBS          += doxmlparser.lib qtools.lib shell32.lib
-win32-borland:TMAKE_LFLAGS  += -L..\..\..\lib -L..\lib
+win32-borland:TMAKE_LFLAGS  += -L..\..\..\lib
 win32:TMAKE_CXXFLAGS        += -DQT_NODLL
-DESTDIR                     = 
-OBJECTS_DIR                 = ../objects
+DESTDIR                     = ../../../bin
+OBJECTS_DIR                 = ../../../objects/doxmlparser/test
 TARGET                      = xmlparse
 INCLUDEPATH                += ../../../qtools ../include
 DEPENDPATH                 += ../include
-unix:TARGETDEPS             = ../lib/libdoxmlparser.a
-win32:TARGETDEPS            = ..\lib\doxmlparser.lib
+unix:TARGETDEPS             = ../../../lib/libdoxmlparser.a
+win32:TARGETDEPS            = ..\..\..\lib\doxmlparser.lib

--- a/addon/doxyapp/doxyapp.pro.in
+++ b/addon/doxyapp/doxyapp.pro.in
@@ -4,7 +4,7 @@ HEADERS      =
 SOURCES      =	doxyapp.cpp
 LIBS          += -L../../lib -ldoxygen -lqtools -lmd5 -ldoxycfg -lpthread -liconv
 DESTDIR        = 
-OBJECTS_DIR    = ../../objects
+OBJECTS_DIR    = ../../objects/doxyapp
 TARGET         = ../../bin/doxyapp
 INCLUDEPATH   += ../../qtools ../../src
 DEPENDPATH    += ../../src

--- a/addon/doxysearch/doxyindexer.pro.in
+++ b/addon/doxysearch/doxyindexer.pro.in
@@ -4,7 +4,7 @@ HEADERS      =
 SOURCES      =	doxyindexer.cpp
 LIBS        += -L../../lib -lxapian -lqtools
 DESTDIR      = 
-OBJECTS_DIR  = ../../objects
+OBJECTS_DIR  = ../../objects/doxyindexer
 TARGET       = ../../bin/doxyindexer
 INCLUDEPATH += ../../qtools
 DEPENDPATH  += 

--- a/addon/doxysearch/doxysearch.pro.in
+++ b/addon/doxysearch/doxysearch.pro.in
@@ -4,7 +4,7 @@ HEADERS      =
 SOURCES      =	doxysearch.cpp
 LIBS        += -lxapian
 DESTDIR      = 
-OBJECTS_DIR  = ../../objects
+OBJECTS_DIR  = ../../objects/doxysearch
 TARGET       = ../../bin/doxysearch.cgi
 INCLUDEPATH += 
 DEPENDPATH  += 

--- a/addon/doxywizard/Makefile.in
+++ b/addon/doxywizard/Makefile.in
@@ -30,8 +30,8 @@ distclean: Makefile.doxywizard
 	$(RM) Makefile.doxywizard

 realclean: Makefile.doxywizard
-	$(RM) configdoc.cpp
-	$(RM) config_doxyw.cpp
+	$(RM) ../../generated_src/doxywizard/configdoc.cpp
+	$(RM) ../../generated_src/doxywizard/config_doxyw.cpp
 	$(MAKE) distclean
 	
 install:

--- a/addon/doxywizard/doxywizard.pro.in
+++ b/addon/doxywizard/doxywizard.pro.in
@@ -6,12 +6,12 @@ TEMPLATE     = app
 DESTDIR      = ../../bin
 TARGET       = 
 DEPENDPATH  += .
-INCLUDEPATH += .
+INCLUDEPATH += . ../../generated_src/doxywizard
 QT          += xml
 CONFIG      += $extraopts
-OBJECTS_DIR  = obj
-MOC_DIR      = moc
-RCC_DIR      = rcc
+OBJECTS_DIR  = ../../objects/doxywizard
+MOC_DIR      = ../../moc/doxywizard
+RCC_DIR      = ../../rcc/doxywizard
 DEFINES     += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII

 macx-g++ {
@@ -27,13 +27,13 @@ RESOURCES   += doxywizard.qrc
 INCBUFSIZE=$(PYTHON)  ../../src/increasebuffer.py
 win32:RC_FILE += doxywizard.rc

-config.target = config_doxyw.cpp
-config.commands = $(LEX) -P$*YY -t $*.l | $(INCBUFSIZE) >$*.cpp
-config.depends = config_doxyw.l  ../../src/increasebuffer.py
-configdoc.target = configdoc.cpp
-configdoc.commands = $(PYTHON) ../../src/configgen.py -wiz ../../src/config.xml > configdoc.cpp
+config.target = ../../generated_src/doxywizard/config_doxyw.cpp
+config.commands = $(LEX) -Pconfig_doxywYY -t ../../addon/doxywizard/config_doxyw.l | $(INCBUFSIZE) >../../generated_src/doxywizard/$*.cpp
+config.depends = ../../addon/doxywizard/config_doxyw.l  ../../src/increasebuffer.py
+configdoc.target = ../../generated_src/doxywizard/configdoc.cpp
+configdoc.commands = $(PYTHON) ../../src/configgen.py -wiz ../../src/config.xml > ../../generated_src/doxywizard/configdoc.cpp
 configdoc.depends = ../../src/config.xml ../../src/configgen.py
-version.target = ../../src/version.cpp
+version.target = ../../generated_src/doxywizard/version.cpp
 version.commands = cd ../../src;$(PYTHON) version.py
 version.depends = ../../configure
 QMAKE_EXTRA_TARGETS += configdoc config version

--- a/addon/doxywizard/expert.cpp
+++ b/addon/doxywizard/expert.cpp
@@ -9,7 +9,7 @@
 #include "config.h"
 #include "version.h"
 #include "configdoc.h"
-#include "../../src/settings.h"
+#include "settings.h"

 #define SA(x) QString::fromAscii(x)


--- a/configure
+++ b/configure
@@ -672,15 +672,32 @@ fi

 # -----------------------------------------------------------------------------

+if ! test -d "generated_src/doxygen"; then
+  mkdir -p generated_src/doxygen
+fi
+if test "$f_wizard" = YES; then
+  if ! test -d "generated_src/doxywizard"; then
+    mkdir -p generated_src/doxywizard
+  fi
+fi
+
 #
 # Make VERSION file
 #
-echo "  Creating VERSION file."
-# Output should be something like 1.4.5-20051010
-if test "x$doxygen_version_mmn" = "xNO"; then
-  echo "$doxygen_version_major.$doxygen_version_minor.$doxygen_version_revision" > VERSION
-else
-  echo "$doxygen_version_major.$doxygen_version_minor.$doxygen_version_revision-$doxygen_version_mmn" > VERSION
+test -f "VERSION" && chmod u+w VERSION
+test -f "generated_src/doxygen/version.cpp" && chmod u+w generated_src/doxygen/version.cpp
+echo "  Generating generated_src/doxygen/version.cpp and VERSION..."
+cd src
+$f_python version.py ../generated_src/doxygen
+cd ..
+if test "$f_wizard" = YES; then
+  test -f "VERSION" && chmod u+w VERSION
+  test -f "generated_src/doxywizard/version.cpp" && chmod u+w generated_src/doxywizard/version.cpp
+  echo "  Generating generated_src/doxywizard/version.cpp and VERSION..."
+  cd src
+  $f_python version.py ../generated_src/doxywizard
+  cd ..
+
 fi

 test -f .makeconfig && rm .makeconfig
@@ -828,7 +845,7 @@ EOF
 #       if test $f_search = YES; then
 #         EXTRADEPS="$EXTRADEPS doxysearch"
 #       fi
-       echo "all: src/version.cpp $EXTRADEPS" >> $DST
+       echo "all: generated_src/doxygen/version.cpp $EXTRADEPS" >> $DST
       echo "	\$(MAKE) -C qtools" >> $DST
       echo "	\$(MAKE) -C libmd5" >> $DST
       echo "	\$(MAKE) -C src" >> $DST
@@ -892,28 +909,33 @@ EOF
     echo "  Created $DST from $SRC..."
 done

-# - generating src/lang_cfg.h 
+# - generating generated_src/doxygen/doxygen/lang_cfg.h 
 # use consistent method on Linux and Windows

-if test -f "src/lang_cfg.h"; then
-    chmod u+w src/lang_cfg.h   # make sure file can be overwritten
+if test -f "generated_src/doxygen/lang_cfg.h"; then
+    chmod u+w generated_src/doxygen/lang_cfg.h   # make sure file can be overwritten
 fi
-echo "  Generating src/lang_cfg.h..."
+echo "  Generating generated_src/doxygen/lang_cfg.h..."
 if test "$f_english" = YES; then
-   $f_python src/lang_cfg.py ENONLY > src/lang_cfg.h
+   $f_python src/lang_cfg.py ENONLY > generated_src/doxygen/lang_cfg.h
 else
   f_ulangs=`echo $f_langs | tr '[a-z,]' '[A-Z ]'`
-   $f_python src/lang_cfg.py $f_ulangs > src/lang_cfg.h
+   $f_python src/lang_cfg.py $f_ulangs > generated_src/doxygen/lang_cfg.h
 fi

-if test -f "src/config.h"; then
-    chmod u+w src/config.h
+if test -f "generated_src/doxygen/settings.h"; then
+    chmod u+w generated_src/doxygen/settings.h
 fi
-if test -f "src/settings.h"; then
-    chmod u+w src/settings.h
+echo "  Generating generated_src/doxygen/settings.h..."
+$f_python src/settings.py $f_sqlite3 $f_libclang generated_src/doxygen
+
+if test "$f_wizard" = YES; then
+  if test -f "generated_src/doxywizard/settings.h"; then
+      chmod u+w generated_src/doxywizard/settings.h
+  fi
+  echo "  Generating generated_src/doxywizard/settings.h..."
+  $f_python src/settings.py $f_sqlite3 $f_libclang generated_src/doxywizard
 fi
-echo "  Generating src/settings.h..."
-cd src
-$f_python settings.py $f_sqlite3 $f_libclang
+
 cd ..
 echo "  Finished"
--- a/libmd5/libmd5.pro.in
+++ b/libmd5/libmd5.pro.in
@@ -6,5 +6,5 @@ win32:INCLUDEPATH          += .
 win32-g++:TMAKE_CFLAGS     += -D__CYGWIN__ -DALL_STATIC
 DESTDIR                    =  ../lib
 TARGET                     =  md5
-OBJECTS_DIR                =  ../objects
+OBJECTS_DIR                =  ../objects/md5

--- a/qtools/qtools.pro.in
+++ b/qtools/qtools.pro.in
@@ -98,5 +98,5 @@ INCLUDEPATH = .
 TMAKE_CXXFLAGS += -DQT_LITE_UNICODE
 win32:TMAKE_CXXFLAGS += -DQT_NODLL
 win32-g++:TMAKE_CXXFLAGS += -D__CYGWIN__ -DALL_STATIC
-OBJECTS_DIR = ../objects
+OBJECTS_DIR = ../objects/qtools
 DESTDIR = ../lib
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -14,6 +14,8 @@
 # input used in their production; they are not affected by this license.
 #

+GENERATED_SRC = ../generated_src/doxygen
+
 all: Makefile.libdoxygen Makefile.libdoxycfg Makefile.doxygen Makefile
 	$(MAKE) -f Makefile.libdoxycfg $@
 	$(MAKE) -f Makefile.libdoxygen $@
@@ -42,7 +44,7 @@ clean: Makefile.libdoxygen Makefile.libdoxycfg Makefile.doxygen

 # also clean flex/bison generated files
 distclean: clean
-	-$(RM) scanner.cpp code.cpp config.cpp pre.cpp constexp.cpp \
+	-cd $(GENERATED_SRC) && $(RM) scanner.cpp code.cpp config.cpp pre.cpp constexp.cpp \
 	       ce_parse.cpp ce_parse.h tag.cpp commentscan.cpp \
 	       declinfo.cpp defargs.cpp commentcnv.cpp doctokenizer.cpp \
 	       pycode.cpp pyscanner.cpp fortrancode.cpp fortranscanner.cpp \
@@ -51,11 +53,11 @@ distclean: clean

 # clean also the generated files which are in SVN
 realclean: distclean
-	-$(RM) index.xsd.h compound.xsd.h layout_default.xml.h \
+	-cd $(GENERATED_SRC) && $(RM) index.xsd.h compound.xsd.h layout_default.xml.h \
 	       header.html.h footer.html.h search_functions.php.h search_opensearch.php.h \
 	       search.js.h search.css.h doxygen.css.h navtree.js.h resize.js.h \
 	       doxygen.sty.h jquery_fx.js.h jquery_p1.js.h jquery_p2.js.h \
 	       jquery_p3.js.h jquery_ui.js.h navtree.css.h svgpan.js.h dynsections.js.h \
-	       doxygen.bst.h bib2xhtml.pl.h configoptions.cpp jquery_pt.js.h extsearch.js.h
+	       doxygen.bst.h bib2xhtml.pl.h ../generated_src/doxygen/configoptions.cpp jquery_pt.js.h extsearch.js.h

 FORCE:
--- a/src/doxygen.pro.in
+++ b/src/doxygen.pro.in
@@ -35,5 +35,5 @@ unix:TARGETDEPS            =  ../lib/libdoxygen.a ../lib/libdoxycfg.a
 win32:TARGETDEPS           =  ..\lib\doxygen.lib ..\lib\doxycfg.lib
 win32-g++:TARGETDEPS       =  ../lib/libdoxygen.a ../lib/libdoxycfg.a
 win32-mingw:TARGETDEPS     =  ../lib/libdoxygen.a ../lib/libdoxycfg.a
-OBJECTS_DIR                =  ../objects
+OBJECTS_DIR                =  ../objects/doxygen

--- a/src/lang_cfg.h
+++ b/src/lang_cfg.h
-#define LANG_AM
-#define LANG_AR
-#define LANG_BR
-#define LANG_CA
-#define LANG_CN
-#define LANG_CZ
-#define LANG_DE
-#define LANG_DK
-#define LANG_EN
-#define LANG_EO
-#define LANG_ES
-#define LANG_FA
-#define LANG_FI
-#define LANG_FR
-#define LANG_GR
-#define LANG_HR
-#define LANG_HU
-#define LANG_ID
-#define LANG_IT
-#define LANG_JE
-#define LANG_JP
-#define LANG_KE
-#define LANG_KR
-#define LANG_LT
-#define LANG_LV
-#define LANG_MK
-#define LANG_NL
-#define LANG_NO
-#define LANG_PL
-#define LANG_PT
-#define LANG_RO
-#define LANG_RU
-#define LANG_SC
-#define LANG_SI
-#define LANG_SK
-#define LANG_SR
-#define LANG_SV
-#define LANG_TR
-#define LANG_TW
-#define LANG_UA
-#define LANG_VI
-#define LANG_ZA
--- a/src/languages.py
+++ b/src/languages.py
@@ -25,8 +25,8 @@ print """\
                <CustomBuildRule
                        Name="Languages"
                        DisplayName="Settings"
-                        CommandLine="python $(InputPath) [AllOptions] [AdditionalOptions] &gt; $(InputDir)../src/$(InputName).h"
-                        Outputs="$(InputDir)../src/$(InputName).h"
+                        CommandLine="python $(InputPath) [AllOptions] [AdditionalOptions] &gt; $(InpDir)/$(InputName).h"
+                        Outputs="$(IntDir)/$(InputName).h"
                        FileExtensions="*.py"
                        AdditionalDependencies=""
                        ExecutionDescription="Executing languages ..."

--- a/src/libdoxycfg.pro.in
+++ b/src/libdoxycfg.pro.in
@@ -17,11 +17,11 @@
 TEMPLATE     =	libdoxycfg.t
 CONFIG       =	console warn_on staticlib $extraopts
 HEADERS      =  config.h configoptions.h portable.h
-SOURCES      =	config.cpp configoptions.cpp portable.cpp portable_c.c
+SOURCES      =	../generated_src/doxygen/config.cpp ../generated_src/doxygen/configoptions.cpp portable.cpp portable_c.c
 win32:TMAKE_CXXFLAGS       += -DQT_NODLL
 win32-g++:TMAKE_CXXFLAGS   += -fno-exceptions -fno-rtti
-INCLUDEPATH                += ../qtools
+INCLUDEPATH                += . ../qtools
 win32:INCLUDEPATH          += .
 DESTDIR                    =  ../lib
 TARGET                     =  doxycfg
-OBJECTS_DIR                =  ../objects
+OBJECTS_DIR                =  ../objects/doxygen
--- a/src/libdoxycfg.t.in
+++ b/src/libdoxycfg.t.in
@@ -45,9 +45,9 @@ sub GenerateDep {

 ####################

-#$ GenerateDep("config.cpp","config.l");
-	$(LEX) -PconfigYY -t config.l >config.cpp 
+#$ GenerateDep("../generated_src/doxygen/config.cpp","config.l");
+	$(LEX) -PconfigYY -t config.l >../generated_src/doxygen/config.cpp 

-configoptions.cpp: config.xml configgen.py
-	$(PYTHON) configgen.py -cpp config.xml >configoptions.cpp
+../generated_src/doxygen/configoptions.cpp: config.xml configgen.py
+	$(PYTHON) configgen.py -cpp config.xml >../generated_src/doxygen/configoptions.cpp

--- a/src/libdoxygen.pro.in
+++ b/src/libdoxygen.pro.in
@@ -17,7 +17,7 @@
 TEMPLATE     =	libdoxygen.t
 CONFIG       =	console warn_on staticlib $extraopts
 HEADERS      =	arguments.h \
-                bib2xhtml.pl.h \
+                ../generated_src/doxygen/bib2xhtml.pl.h \
                bufstr.h \
 		cite.h \
 		clangparser.h \
@@ -27,7 +27,7 @@ HEADERS      =	arguments.h \
                code.h \
 		commentcnv.h \
 		commentscan.h \
-                compound.xsd.h \
+                ../generated_src/doxygen/compound.xsd.h \
 		condparser.h \
                config.h \
 		context.h \
@@ -47,20 +47,20 @@ HEADERS      =	arguments.h \
                docvisitor.h \
 		dot.h \
 		doxygen.h \
-		doxygen.bst.h \
-		doxygen.css.h \
-		doxygen.sty.h \
+		../generated_src/doxygen/doxygen.bst.h \
+		../generated_src/doxygen/doxygen.css.h \
+		../generated_src/doxygen/doxygen.sty.h \
 		eclipsehelp.h \
 		entry.h \
 		example.h \
 		filedef.h \
 		filename.h \
-		footer.html.h \
+		../generated_src/doxygen/footer.html.h \
 		formula.h \
 		ftextstream.h \
 		ftvhelp.h \
 		groupdef.h \
-		header.html.h \
+		../generated_src/doxygen/header.html.h \
 		htags.h \
 		htmlattrib.h \
                htmldocvisitor.h \
@@ -68,20 +68,20 @@ HEADERS      =	arguments.h \
 		htmlhelp.h \
 		image.h \
 		index.h \
-                index.xsd.h \
-		jquery_p1.js.h \
-		jquery_p2.js.h \
-		jquery_p3.js.h \
-		jquery_ui.js.h \
-		jquery_fx.js.h \
-		jquery_pt.js.h \
-		svgpan.js.h \
-		dynsections.js.h \
+                ../generated_src/doxygen/index.xsd.h \
+		../generated_src/doxygen/jquery_p1.js.h \
+		../generated_src/doxygen/jquery_p2.js.h \
+		../generated_src/doxygen/jquery_p3.js.h \
+		../generated_src/doxygen/jquery_ui.js.h \
+		../generated_src/doxygen/jquery_fx.js.h \
+		../generated_src/doxygen/jquery_pt.js.h \
+		../generated_src/doxygen/svgpan.js.h \
+		../generated_src/doxygen/dynsections.js.h \
 		language.h \
                latexdocvisitor.h \
 		latexgen.h \
                layout.h \
-                layout_default.xml.h \
+                ../generated_src/doxygen/layout_default.xml.h \
 		logos.h \
 		mandocvisitor.h \
 		mangen.h \
@@ -96,8 +96,8 @@ HEADERS      =	arguments.h \
                msc.h \
                dia.h \
 		namespacedef.h \
-		navtree.css.h \
-		navtree.js.h \
+		../generated_src/doxygen/navtree.css.h \
+		../generated_src/doxygen/navtree.js.h \
                objcache.h \
 		outputgen.h \
 		outputlist.h \
@@ -114,17 +114,17 @@ HEADERS      =	arguments.h \
 		qhp.h \
 		qhpxmlwriter.h \
 		reflist.h \
-		resize.js.h \
+		../generated_src/doxygen/resize.js.h \
                rtfdocvisitor.h \
 		rtfgen.h \
 		rtfstyle.h \
 		scanner.h \
 		searchindex.h \
-		search.css.h \
-		search.js.h \
-		extsearch.js.h \
-		search_functions.php.h \
-		search_opensearch.php.h \
+		../generated_src/doxygen/search.css.h \
+		../generated_src/doxygen/search.js.h \
+		../generated_src/doxygen/extsearch.js.h \
+		../generated_src/doxygen/search_functions.php.h \
+		../generated_src/doxygen/search_opensearch.php.h \
 		section.h \
 		sortdict.h \
                store.h \
@@ -146,31 +146,25 @@ HEADERS      =	arguments.h \
                docbookgen.h

 SOURCES      =	arguments.cpp \
-                constexp.cpp \
-                ce_parse.cpp \
+                ../generated_src/doxygen/ce_parse.cpp \
+                ../generated_src/doxygen/constexp.cpp \
 		cite.cpp \
 		clangparser.cpp \
 		classdef.cpp \
 		classlist.cpp \
                cmdmapper.cpp \
-		code.cpp \
-		commentcnv.cpp \
-		commentscan.cpp \
 		condparser.cpp \
 		context.cpp \
 		cppvalue.cpp \
                dbusxmlscanner.cpp \
 		debug.cpp \
                defgen.cpp \
-		declinfo.cpp \
-		defargs.cpp \
 		define.cpp \
 		definition.cpp \
 		diagram.cpp \
                dirdef.cpp \
                docparser.cpp \
 		docsets.cpp \
-                doctokenizer.cpp \
 		dot.cpp \
 		doxygen.cpp \
 		eclipsehelp.cpp \
@@ -180,8 +174,6 @@ SOURCES      =	arguments.cpp \
 		formula.cpp \
 		ftextstream.cpp \
 		ftvhelp.cpp \
-		fortrancode.cpp \
-		fortranscanner.cpp \    
 		groupdef.cpp \
 		htags.cpp \
                htmldocvisitor.cpp \
@@ -213,46 +205,56 @@ SOURCES      =	arguments.cpp \
 		outputlist.cpp \
 		pagedef.cpp \
 		perlmodgen.cpp \
-		pre.cpp \
-		pycode.cpp \
-		pyscanner.cpp \    
 		qhp.cpp \
 		qhpxmlwriter.cpp \
 		reflist.cpp \
                rtfdocvisitor.cpp \
 		rtfgen.cpp \
 		rtfstyle.cpp \
-		scanner.cpp \
 		searchindex.cpp \
                store.cpp \
 		tagreader.cpp \
-                tclscanner.cpp \
 		template.cpp \
                textdocvisitor.cpp \
                tooltip.cpp \
 		util.cpp \
-		version.cpp \
-		vhdlcode.cpp \
+		../generated_src/doxygen/vhdlcode.cpp \
 		vhdldocgen.cpp \
-		vhdlparser.cpp \
-		vhdlscanner.cpp \
+		../generated_src/doxygen/vhdlparser.cpp \
+		../generated_src/doxygen/vhdlscanner.cpp \
 		xmldocvisitor.cpp \
                xmlgen.cpp \
                docbookvisitor.cpp \
-                docbookgen.cpp
+                docbookgen.cpp \
+		../generated_src/doxygen/code.cpp \
+		../generated_src/doxygen/commentcnv.cpp \
+		../generated_src/doxygen/commentscan.cpp \
+		../generated_src/doxygen/declinfo.cpp \
+		../generated_src/doxygen/defargs.cpp \
+                ../generated_src/doxygen/doctokenizer.cpp \
+		../generated_src/doxygen/pre.cpp \
+		../generated_src/doxygen/pycode.cpp \
+		../generated_src/doxygen/pyscanner.cpp \    
+		../generated_src/doxygen/scanner.cpp \
+                ../generated_src/doxygen/tclscanner.cpp \
+		../generated_src/doxygen/fortrancode.cpp \
+		../generated_src/doxygen/fortranscanner.cpp \    
+		../generated_src/doxygen/version.cpp

 win32:TMAKE_CXXFLAGS       += -DQT_NODLL 
 win32-msvc:TMAKE_CXXFLAGS  += -Zm200
 win32-g++:TMAKE_CXXFLAGS   += -fno-exceptions
 linux-g++:TMAKE_CXXFLAGS    += -fno-exceptions
+INCLUDEPATH                += ../generated_src/doxygen 
+INCLUDEPATH                += ../src 
 INCLUDEPATH                += ../qtools
 #INCLUDEPATH                += ../libpng
 INCLUDEPATH                += ../libmd5
 INCLUDEPATH                += %%SQLITE3_INC%%
 win32:INCLUDEPATH          += .
 #win32-g++:INCLUDEPATH      = ../qtools /usr/include/libpng12 ../libmd5
-win32-g++:INCLUDEPATH      = ../qtools ../libmd5
+win32-g++:INCLUDEPATH      = ../generated_src/doxygen ../src ../qtools ../libmd5
 DESTDIR                    =  ../lib
 TARGET                     =  doxygen
-OBJECTS_DIR                =  ../objects
+OBJECTS_DIR                =  ../objects/doxygen

--- a/src/libdoxygen.t.in
+++ b/src/libdoxygen.t.in
@@ -21,6 +21,7 @@ YACC       = %%BISON%%
 PYTHON     = %%PYTHON%%
 PERL       = %%PERL%%
 INCBUFSIZE = $(PYTHON) increasebuffer.py
+GENERATED_SRC = ../generated_src/doxygen

 #${
 sub GenerateDep {
@@ -49,170 +50,169 @@ sub GenerateLex {
    if ($caseOpt) {
        $text .= "-i ";
    }
-    $text .= "-P".$name."YY -t ".$name.".l | \$(INCBUFSIZE) >".$name.".cpp";
+    $text .= "-P".$name."YY -t ".$name.".l | \$(INCBUFSIZE) > \$(GENERATED_SRC)/".$name.".cpp";
 }
 #$} 

 ####################

-#$ GenerateDep("scanner.cpp","scanner.l");
+#$ GenerateDep("\$(GENERATED_SRC)/scanner.cpp","scanner.l");
 #$ GenerateLex("scanner",0);

-#$ GenerateDep("code.cpp","code.l");
+#$ GenerateDep("\$(GENERATED_SRC)/code.cpp","code.l");
 #$ GenerateLex("code",0);

-#$ GenerateDep("pyscanner.cpp","pyscanner.l");
+#$ GenerateDep("\$(GENERATED_SRC)/pyscanner.cpp","pyscanner.l");
 #$ GenerateLex("pyscanner",0);

-#$ GenerateDep("pycode.cpp","pycode.l");
+#$ GenerateDep("\$(GENERATED_SRC)/pycode.cpp","pycode.l");
 #$ GenerateLex("pycode",0);

-#$ GenerateDep("fortranscanner.cpp","fortranscanner.l");
+#$ GenerateDep("\$(GENERATED_SRC)/fortranscanner.cpp","fortranscanner.l");
 #$ GenerateLex("fortranscanner",1);

-#$ GenerateDep("fortrancode.cpp","fortrancode.l");
+#$ GenerateDep("\$(GENERATED_SRC)/fortrancode.cpp","fortrancode.l");
 #$ GenerateLex("fortrancode",1);

-#$ GenerateDep("vhdlcode.cpp","vhdlcode.l");
+#$ GenerateDep("\$(GENERATED_SRC)/vhdlcode.cpp","vhdlcode.l");
 #$ GenerateLex("vhdlcode",1);

-#$ GenerateDep("tclscanner.cpp","tclscanner.l");
+#$ GenerateDep("\$(GENERATED_SRC)/tclscanner.cpp","tclscanner.l");
 #$ GenerateLex("tclscanner",1);

-#$ GenerateDep("pre.cpp","pre.l");
+#$ GenerateDep("\$(GENERATED_SRC)/pre.cpp","pre.l");
 #$ GenerateLex("pre",0);

-#$ GenerateDep("declinfo.cpp","declinfo.l");
+#$ GenerateDep("\$(GENERATED_SRC)/declinfo.cpp","declinfo.l");
 #$ GenerateLex("declinfo",0);

-#$ GenerateDep("defargs.cpp","defargs.l");
+#$ GenerateDep("\$(GENERATED_SRC)/defargs.cpp","defargs.l");
 #$ GenerateLex("defargs",0);

-#$ GenerateDep("doctokenizer.cpp","doctokenizer.l");
+#$ GenerateDep("\$(GENERATED_SRC)/doctokenizer.cpp","doctokenizer.l");
 #$ GenerateLex("doctokenizer",0);

-#$ GenerateDep("commentcnv.cpp","commentcnv.l");
+#$ GenerateDep("\$(GENERATED_SRC)/commentcnv.cpp","commentcnv.l");
 #$ GenerateLex("commentcnv",0);

-#$ GenerateDep("commentscan.cpp","commentscan.l");
+#$ GenerateDep("\$(GENERATED_SRC)/commentscan.cpp","commentscan.l");
 #$ GenerateLex("commentscan",0);

-#$ GenerateDep("constexp.cpp","constexp.l","ce_parse.h");
+#$ GenerateDep("../generated_src/doxygen/constexp.cpp","constexp.l","../generated_src/doxygen/ce_parse.h");
 #$ GenerateLex("constexp",0);

-#$ GenerateDep("ce_parse.cpp","constexp.y");
-	$(YACC) -l -p constexpYY constexp.y -o ce_parse.cpp 
+#$ GenerateDep("../generated_src/doxygen/ce_parse.cpp","constexp.y");
+	$(YACC) -l -p constexpYY constexp.y -o ../generated_src/doxygen/ce_parse.cpp 

-#$ GenerateDep("ce_parse.h","constexp.y");
-	$(YACC) -l -d -p ce_parsexpYY constexp.y -o ce_parse.c 
-	-rm ce_parse.c
+#$ GenerateDep("../generated_src/doxygen/ce_parse.h","constexp.y");
+	$(YACC) -l -d -p ce_parsexpYY constexp.y -o ../generated_src/doxygen/ce_parse.c 
+	-rm ../generated_src/doxygen/ce_parse.c

-#$ GenerateDep("vhdlscanner.cpp","vhdlscanner.l","vhdlparser.h");
+#$ GenerateDep("\$(GENERATED_SRC)/vhdlscanner.cpp","vhdlscanner.l","../generated_src/doxygen/vhdlparser.h");
 #$ GenerateLex("vhdlscanner",1);

-#$ GenerateDep("vhdlparser.cpp","vhdlparser.y");
-	$(YACC) -l -p vhdlscannerYY vhdlparser.y -o vhdlparser.cpp 	
+#$ GenerateDep("../generated_src/doxygen/vhdlparser.cpp","vhdlparser.y");
+	$(YACC) -l -p vhdlscannerYY vhdlparser.y -o ../generated_src/doxygen/vhdlparser.cpp 	

-#$ GenerateDep("vhdlparser.h","vhdlparser.y");
-	$(YACC) -l -d -p vhdlscannerYY vhdlparser.y -o vhdlparser.c 
-	-rm vhdlparser.c	
+#$ GenerateDep("../generated_src/doxygen/vhdlparser.h","vhdlparser.y");
+	$(YACC) -l -d -p vhdlscannerYY vhdlparser.y -o ../generated_src/doxygen/vhdlparser.c 
+	-rm ../generated_src/doxygen/vhdlparser.c	
 	
-#$ GenerateDep("layout.cpp","layout_default.xml.h");
-
 TO_C_CMD=$(PYTHON) to_c_cmd.py < $< > $@

-cite.cpp: doxygen.bst.h bib2xhtml.pl.h
+layout.cpp: $(GENERATED_SRC)/layout_default.xml.h

-ftvhelp.cpp: navtree.js.h resize.js.h navtree.css.h
+cite.cpp: $(GENERATED_SRC)/doxygen.bst.h $(GENERATED_SRC)/bib2xhtml.pl.h

-htmlgen.cpp: header.html.h footer.html.h doxygen.css.h search_functions.php.h \
-             search_opensearch.php.h search.css.h jquery_p1.js.h jquery_p2.js.h \
-	     jquery_p3.js.h jquery_ui.js.h jquery_fx.js.h jquery_pt.js.h \
-	     svgpan.js.h dynsections.js.h extsearch.js.h
+ftvhelp.cpp: $(GENERATED_SRC)/navtree.js.h $(GENERATED_SRC)/resize.js.h $(GENERATED_SRC)/navtree.css.h

-layout.cpp: layout_default.xml.h
+htmlgen.cpp: $(GENERATED_SRC)/header.html.h $(GENERATED_SRC)/footer.html.h $(GENERATED_SRC)/doxygen.css.h $(GENERATED_SRC)/search_functions.php.h \
+             $(GENERATED_SRC)/search_opensearch.php.h $(GENERATED_SRC)/search.css.h $(GENERATED_SRC)/jquery_p1.js.h $(GENERATED_SRC)/jquery_p2.js.h \
+	     $(GENERATED_SRC)/jquery_p3.js.h $(GENERATED_SRC)/jquery_ui.js.h $(GENERATED_SRC)/jquery_fx.js.h $(GENERATED_SRC)/jquery_pt.js.h \
+	     $(GENERATED_SRC)/svgpan.js.h $(GENERATED_SRC)/dynsections.js.h $(GENERATED_SRC)/extsearch.js.h

-xmlgen.cpp: index.xsd.h compound.xsd.h
+layout.cpp: $(GENERATED_SRC)/layout_default.xml.h

-latexgen.cpp: doxygen.sty.h
+xmlgen.cpp: $(GENERATED_SRC)/index.xsd.h $(GENERATED_SRC)/compound.xsd.h

-searchindex.cpp: search.js.h
+latexgen.cpp: $(GENERATED_SRC)/doxygen.sty.h

-index.xsd.h: index.xsd
-	$(TO_C_CMD)
+searchindex.cpp: $(GENERATED_SRC)/search.js.h

-compound.xsd.h: compound.xsd
+$(GENERATED_SRC)/index.xsd.h: index.xsd
 	$(TO_C_CMD)

-layout_default.xml.h: layout_default.xml
+$(GENERATED_SRC)/compound.xsd.h: compound.xsd
 	$(TO_C_CMD)

-header.html.h: header.html
+$(GENERATED_SRC)/layout_default.xml.h: layout_default.xml
 	$(TO_C_CMD)

-footer.html.h: footer.html
+$(GENERATED_SRC)/header.html.h: header.html
 	$(TO_C_CMD)

-search_functions.php.h: search_functions.php
+$(GENERATED_SRC)/footer.html.h: footer.html
 	$(TO_C_CMD)

-search_opensearch.php.h: search_opensearch.php
+$(GENERATED_SRC)/search_functions.php.h: search_functions.php
 	$(TO_C_CMD)

-search.js.h: search.js
+$(GENERATED_SRC)/search_opensearch.php.h: search_opensearch.php
 	$(TO_C_CMD)

-search.css.h: search.css
+$(GENERATED_SRC)/search.js.h: search.js
 	$(TO_C_CMD)

-extsearch.js.h: extsearch.js
+$(GENERATED_SRC)/search.css.h: search.css
 	$(TO_C_CMD)

-doxygen.css.h: doxygen.css
+$(GENERATED_SRC)/extsearch.js.h: extsearch.js
 	$(TO_C_CMD)

-doxygen.sty.h: doxygen.sty
+$(GENERATED_SRC)/doxygen.css.h: doxygen.css
 	$(TO_C_CMD)

+$(GENERATED_SRC)/doxygen.sty.h: doxygen.sty
+	$(TO_C_CMD)

-navtree.js.h: navtree.js
+$(GENERATED_SRC)/navtree.js.h: navtree.js
 	$(TO_C_CMD)

-resize.js.h: resize.js
+$(GENERATED_SRC)/resize.js.h: resize.js
 	$(TO_C_CMD)

-jquery_p1.js.h: jquery_p1.js
+$(GENERATED_SRC)/jquery_p1.js.h: jquery_p1.js
 	$(TO_C_CMD)

-jquery_p2.js.h: jquery_p2.js
+$(GENERATED_SRC)/jquery_p2.js.h: jquery_p2.js
 	$(TO_C_CMD)

-jquery_p3.js.h: jquery_p3.js
+$(GENERATED_SRC)/jquery_p3.js.h: jquery_p3.js
 	$(TO_C_CMD)

-jquery_ui.js.h: jquery_ui.js
+$(GENERATED_SRC)/jquery_ui.js.h: jquery_ui.js
 	$(TO_C_CMD)

-jquery_fx.js.h: jquery_fx.js
+$(GENERATED_SRC)/jquery_fx.js.h: jquery_fx.js
 	$(TO_C_CMD)

-jquery_pt.js.h: jquery_pt.js
+$(GENERATED_SRC)/jquery_pt.js.h: jquery_pt.js
 	$(TO_C_CMD)

-navtree.css.h: navtree.css
+$(GENERATED_SRC)/navtree.css.h: navtree.css
 	$(TO_C_CMD)

-svgpan.js.h: svgpan.js
+$(GENERATED_SRC)/svgpan.js.h: svgpan.js
 	$(TO_C_CMD)

-dynsections.js.h: dynsections.js
+$(GENERATED_SRC)/dynsections.js.h: dynsections.js
 	$(TO_C_CMD)

-doxygen.bst.h: doxygen.bst
+$(GENERATED_SRC)/doxygen.bst.h: doxygen.bst
 	$(TO_C_CMD)

-bib2xhtml.pl.h: bib2xhtml.pl
+$(GENERATED_SRC)/bib2xhtml.pl.h: bib2xhtml.pl
 	$(TO_C_CMD)

-version.cpp: ../configure
-	$(PYTHON) version.py
+$(GENERATED_SRC)/version.cpp: ../configure
+	$(PYTHON) version.py $(GENERATED_SRC)
--- a/src/settings.py
+++ b/src/settings.py
 # 

 import sys
+import os

 f_sqlite3 = sys.argv[1]
 f_libclang = sys.argv[2]

-f1 = open('../src/settings.h','w')
+f1 = open(os.path.join(sys.argv[3],'settings.h'),'w')
 f1.write("#ifndef SETTINGS_H\n")
 f1.write("#define SETTINGS_H\n")
 f1.write("\n")

--- a/src/version.py
+++ b/src/version.py
@@ -9,6 +9,7 @@
 # the collected information is written to: `../VERSION` and `../src/version.cpp`
 #
 import sys
+import os
 #
 # set 'default' values
 #
@@ -46,7 +47,7 @@ mnt = mnt.replace('\n','')
 # close files
 #
 f1 = open('../VERSION','w')
-f2 = open('../src/version.cpp','w')
+f2 = open(os.path.join(sys.argv[1],'version.cpp'),'w')
 if (mnt == 'NO'):
    f1.write(major + '.' + minor + '.' + revision)
    f2.write('char versionString[]="' + major + '.' + minor + '.' + revision + '";')

--- a/tmake/lib/win32-g++/generic.t
+++ b/tmake/lib/win32-g++/generic.t
@@ -145,9 +145,7 @@
 	$project{"VER_MIN"} =~ s/^\d+\.//;
    }    
    if ( Config("staticlib") ) {
-	$project{"TARGET"} = $project{"DESTDIR"} . "lib" . $project{"TARGET"}
-    } else {
-	$project{"TARGET"} = $project{"DESTDIR"} . $project{"TARGET"}
+	$project{"TARGET"} = "lib" . $project{"TARGET"}
    }
 #$}
 #!

--- a/tmake/lib/win32-mingw/generic.t
+++ b/tmake/lib/win32-mingw/generic.t
@@ -141,9 +141,7 @@
 	$project{"VER_MIN"} =~ s/^\d+\.//;
    }    
    if ( Config("staticlib") ) {
-	$project{"TARGET"} = $project{"DESTDIR"} . "lib" . $project{"TARGET"};
-    } else {
-	$project{"TARGET"} = $project{"DESTDIR"} . $project{"TARGET"};
+	$project{"TARGET"} = "lib" . $project{"TARGET"};
    }
 #$}
 #!

--- a/winbuild/Config.rules
+++ b/winbuild/Config.rules
@@ -7,8 +7,8 @@
 		<CustomBuildRule
 			Name="Config"
 			DisplayName="Config"
-			CommandLine="python $(ProjectDir)..\src\configgen.py -cpp [AllOptions] [AdditionalOptions] [inputs] &gt; $(InputDir)../src/$(InputName)options.cpp"
-			Outputs="$(InputDir)../src/$(InputName)options.cpp"
+			CommandLine="python $(ProjectDir)..\src\configgen.py -cpp [AllOptions] [AdditionalOptions] [inputs] &gt; $(IntDir)/$(InputName)options.cpp"
+			Outputs="$(IntDir)/$(InputName)options.cpp"
 			FileExtensions="*.xml"
 			AdditionalDependencies="$(ProjectDir)..\src\configgen.py"
 			ExecutionDescription="Executing configgen for doxygen..."
@@ -18,8 +18,8 @@
 		<CustomBuildRule
 			Name="Config_dw"
 			DisplayName="Config"
-			CommandLine="python $(ProjectDir)..\src\configgen.py -wiz [AllOptions] [AdditionalOptions] [inputs]  &gt; $(InputDir)../addon/doxywizard/$(InputName)doc.cpp"
-			Outputs="$(InputDir)../addon/doxywizard/$(InputName)doc.cpp"
+			CommandLine="python $(ProjectDir)..\src\configgen.py -wiz [AllOptions] [AdditionalOptions] [inputs]  &gt; $(IntDir)/$(InputName)doc.cpp"
+			Outputs="$(IntDir)/$(InputName)doc.cpp"
 			FileExtensions="*.xml"
 			AdditionalDependencies="$(ProjectDir)..\src\configgen.py"
 			ExecutionDescription="Executing configgen for doxywizard ..."

--- a/winbuild/Doxygen.sln
+++ b/winbuild/Doxygen.sln
@@ -9,9 +9,6 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qtools", "qtools.vcproj", "{B6BB4771-8A4E-4656-AC08-1EF8AC182F64}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doxywizard", "Doxywizard.vcproj", "{77C9C2D3-EA3F-3D59-8B4C-0ED852890172}"
-	ProjectSection(ProjectDependencies) = postProject
-		{309C9A4A-94D2-4837-9A11-45B0A6CF35C3} = {309C9A4A-94D2-4837-9A11-45B0A6CF35C3}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "doxysearch", "doxysearch.vcproj", "{F3F3408F-F6F7-46C7-BF1E-1FA056E0AE20}"
 EndProject

--- a/winbuild/Doxygen.vcproj
+++ b/winbuild/Doxygen.vcproj
@@ -22,6 +22,9 @@
 		<ToolFile
 			RelativePath=".\Settings.rules"
 		/>
+		<ToolFile
+			RelativePath=".\Unistd.rules"
+		/>
 		<ToolFile
 			RelativePath=".\Version.rules"
 		/>
@@ -39,7 +42,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\bin\Debug"
-			IntermediateDirectory=".\Debug"
+			IntermediateDirectory=".\Debug\doxygen"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -65,6 +68,9 @@
 			<Tool
 				Name="Settings"
 			/>
+			<Tool
+				Name="Unistd"
+			/>
 			<Tool
 				Name="Gen_head"
 			/>
@@ -82,22 +88,22 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug\Doxygen.tlb"
+				TypeLibraryName=".\Debug\doxygen\Doxygen.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm200 "
 				Optimization="0"
-				AdditionalIncludeDirectories="..\src,..\qtools,..\libpng,..\libmd5,."
+				AdditionalIncludeDirectories="$(IntDir),..\src,..\qtools,..\libpng,..\libmd5,."
 				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG; _CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;LIBICONV_STATIC;CHARSET_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug/Doxygen.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug\$(TargetName).pdb"
+				PrecompiledHeaderFile=".\Debug\doxygen/Doxygen.pch"
+				AssemblerListingLocation=".\Debug\doxygen/"
+				ObjectFile=".\Debug\doxygen/"
+				ProgramDataBaseFileName=".\Debug\doxygen\$(TargetName).pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -123,7 +129,7 @@
 				GenerateManifest="false"
 				IgnoreDefaultLibraryNames="libcmtd.lib"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug\$(TargetName).pdb"
+				ProgramDatabaseFile=".\Debug\doxygen\$(TargetName).pdb"
 				SubSystem="1"
 				LargeAddressAware="2"
 				RandomizedBaseAddress="1"
@@ -142,7 +148,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile=".\Debug/Doxygen.bsc"
+				OutputFile=".\Debug\doxygen/Doxygen.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -157,7 +163,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\bin\Debug64"
-			IntermediateDirectory=".\Debug64"
+			IntermediateDirectory=".\Debug64\doxygen"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -183,6 +189,9 @@
 			<Tool
 				Name="Settings"
 			/>
+			<Tool
+				Name="Unistd"
+			/>
 			<Tool
 				Name="Gen_head"
 			/>
@@ -201,22 +210,22 @@
 			<Tool
 				Name="VCMIDLTool"
 				TargetEnvironment="3"
-				TypeLibraryName=".\Debug64\Doxygen.tlb"
+				TypeLibraryName=".\Debug64\doxygen\Doxygen.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm200 /bigobj"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\src,..\qtools,..\libpng,..\libmd5,."
+				AdditionalIncludeDirectories="$(IntDir),..\src,..\qtools,..\libpng,..\libmd5,."
 				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG; _CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;LIBICONV_STATIC;CHARSET_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug64/Doxygen.pch"
-				AssemblerListingLocation=".\Debug64/"
-				ObjectFile=".\Debug64/"
-				ProgramDataBaseFileName=".\Debug64\$(TargetName).pdb"
+				PrecompiledHeaderFile=".\Debug64\doxygen/Doxygen.pch"
+				AssemblerListingLocation=".\Debug64\doxygen/"
+				ObjectFile=".\Debug64\doxygen/"
+				ProgramDataBaseFileName=".\Debug64\doxygen\$(TargetName).pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -241,7 +250,7 @@
 				AdditionalLibraryDirectories="Debug64"
 				GenerateManifest="false"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug64\$(TargetName).pdb"
+				ProgramDatabaseFile=".\Debug64\doxygen\$(TargetName).pdb"
 				SubSystem="1"
 				LargeAddressAware="2"
 				RandomizedBaseAddress="1"
@@ -260,7 +269,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile=".\Debug64/Doxygen.bsc"
+				OutputFile=".\Debug64\doxygen/Doxygen.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -275,7 +284,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="..\bin\Release"
-			IntermediateDirectory=".\Release"
+			IntermediateDirectory=".\Release\doxygen"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -301,6 +310,9 @@
 			<Tool
 				Name="Settings"
 			/>
+			<Tool
+				Name="Unistd"
+			/>
 			<Tool
 				Name="Gen_head"
 			/>
@@ -318,7 +330,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\Release\Doxygen.tlb"
+				TypeLibraryName=".\Release\doxygen\Doxygen.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -328,15 +340,15 @@
 				InlineFunctionExpansion="2"
 				OmitFramePointers="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\src,..\qtools,..\libpng,..\libmd5,."
+				AdditionalIncludeDirectories="$(IntDir),..\src,..\qtools,..\libpng,..\libmd5,."
 				PreprocessorDefinitions="WIN32;_CINDEX_LIB_;_CINDEX_LIB_;NDEBUG;_CONSOLE; _CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;LIBICONV_STATIC;CHARSET_STATIC"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release/Doxygen.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release\$(TargetName).pdb"
+				PrecompiledHeaderFile=".\Release\doxygen/Doxygen.pch"
+				AssemblerListingLocation=".\Release\doxygen/"
+				ObjectFile=".\Release\doxygen/"
+				ProgramDataBaseFileName=".\Release\doxygen\$(TargetName).pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -360,7 +372,7 @@
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="Release"
-				ProgramDatabaseFile=".\Release\$(TargetName).pdb"
+				ProgramDatabaseFile=".\Release\doxygen\$(TargetName).pdb"
 				SubSystem="1"
 				LargeAddressAware="2"
 				RandomizedBaseAddress="1"
@@ -379,7 +391,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile=".\Release/Doxygen.bsc"
+				OutputFile=".\Release\doxygen/Doxygen.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -394,7 +406,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\bin\Release64"
-			IntermediateDirectory=".\Release64"
+			IntermediateDirectory=".\Release64\doxygen"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -420,6 +432,9 @@
 			<Tool
 				Name="Settings"
 			/>
+			<Tool
+				Name="Unistd"
+			/>
 			<Tool
 				Name="Gen_head"
 			/>
@@ -438,7 +453,7 @@
 			<Tool
 				Name="VCMIDLTool"
 				TargetEnvironment="3"
-				TypeLibraryName=".\Release64\Doxygen.tlb"
+				TypeLibraryName=".\Release64\doxygen\Doxygen.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
@@ -448,15 +463,15 @@
 				InlineFunctionExpansion="2"
 				OmitFramePointers="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="..\src,..\qtools,..\libpng,..\libmd5,."
+				AdditionalIncludeDirectories="$(IntDir),..\src,..\qtools,..\libpng,..\libmd5,."
 				PreprocessorDefinitions="WIN32;_CINDEX_LIB_;_CINDEX_LIB_;NDEBUG;_CONSOLE; _CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;LIBICONV_STATIC;CHARSET_STATIC"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release64/Doxygen.pch"
-				AssemblerListingLocation=".\Release64/"
-				ObjectFile=".\Release64/"
-				ProgramDataBaseFileName=".\Release64\$(TargetName).pdb"
+				PrecompiledHeaderFile=".\Release64\doxygen/Doxygen.pch"
+				AssemblerListingLocation=".\Release64\doxygen/"
+				ObjectFile=".\Release64\doxygen/"
+				ProgramDataBaseFileName=".\Release64\doxygen\$(TargetName).pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -480,7 +495,7 @@
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="Release64"
-				ProgramDatabaseFile=".\Release64\$(TargetName).pdb"
+				ProgramDatabaseFile=".\Release64\doxygen\$(TargetName).pdb"
 				SubSystem="1"
 				LargeAddressAware="2"
 				RandomizedBaseAddress="1"
@@ -499,7 +514,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile=".\Release64/Doxygen.bsc"
+				OutputFile=".\Release64\doxygen/Doxygen.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -524,7 +539,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\ce_parse.cpp"
+				RelativePath="$(IntDir)\ce_parse.cpp"
 				>
 			</File>
 			<File
@@ -548,15 +563,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\code.cpp"
+				RelativePath="$(IntDir)\code.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\src\commentcnv.cpp"
+				RelativePath="$(IntDir)\commentcnv.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\src\commentscan.cpp"
+				RelativePath="$(IntDir)\commentscan.cpp"
 				>
 			</File>
 			<File
@@ -564,15 +579,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\config.cpp"
+				RelativePath="$(IntDir)\config.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\src\configoptions.cpp"
+				RelativePath="$(IntDir)\configoptions.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\src\constexp.cpp"
+				RelativePath="$(IntDir)\constexp.cpp"
 				>
 			</File>
 			<File
@@ -592,11 +607,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\declinfo.cpp"
+				RelativePath="$(IntDir)\declinfo.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\src\defargs.cpp"
+				RelativePath="$(IntDir)\defargs.cpp"
 				>
 			</File>
 			<File
@@ -640,7 +655,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\doctokenizer.cpp"
+				RelativePath="$(IntDir)\doctokenizer.cpp"
 				>
 			</File>
 			<File
@@ -672,11 +687,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\fortrancode.cpp"
+				RelativePath="$(IntDir)\fortrancode.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\src\fortranscanner.cpp"
+				RelativePath="$(IntDir)\fortranscanner.cpp"
 				>
 			</File>
 			<File
@@ -820,15 +835,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\pre.cpp"
+				RelativePath="$(IntDir)\pre.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\src\pycode.cpp"
+				RelativePath="$(IntDir)\pycode.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\src\pyscanner.cpp"
+				RelativePath="$(IntDir)\pyscanner.cpp"
 				>
 			</File>
 			<File
@@ -856,7 +871,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\scanner.cpp"
+				RelativePath="$(IntDir)\scanner.cpp"
 				>
 			</File>
 			<File
@@ -876,7 +891,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\tclscanner.cpp"
+				RelativePath="$(IntDir)\tclscanner.cpp"
 				>
 			</File>
 			<File
@@ -900,7 +915,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\version.cpp"
+				RelativePath="$(IntDir)\version.cpp"
 				>
 			</File>
 			<File
@@ -908,11 +923,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\vhdlparser.cpp"
+				RelativePath="$(IntDir)\vhdlparser.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\src\vhdlparser.hpp"
+				RelativePath="$(IntDir)\vhdlparser.h"
 				>
 			</File>
 			<File
@@ -937,8 +952,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Running bison on constexp.y"
-						CommandLine="bison -l -d -p ce_parseexpYY $(InputPath) -o $(InputDir)\..\src\ce_parse.c&#x0D;&#x0A;bison -l -p constexpYY $(InputPath) -o $(InputDir)..\src\ce_parse.cpp&#x0D;&#x0A;del $(InputDir)..\src\ce_parse.c&#x0D;&#x0A;"
-						Outputs="$(InputDir)\..\src\ce_parse.cpp"
+						CommandLine="bison -l -d -p ce_parseexpYY $(InputPath) -o $(IntDir)\ce_parse.c&#x0D;&#x0A;bison -l -p constexpYY $(InputPath) -o $(IntDir)\ce_parse.cpp&#x0D;&#x0A;del $(IntDir)\ce_parse.c&#x0D;&#x0A;"
+						Outputs="$(IntDir)\ce_parse.cpp"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -947,8 +962,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Running bison on constexp.y"
-						CommandLine="bison -l -d -p ce_parseexpYY $(InputPath) -o $(InputDir)\..\src\ce_parse.c&#x0D;&#x0A;bison -l -p constexpYY $(InputPath) -o $(InputDir)..\src\ce_parse.cpp&#x0D;&#x0A;del $(InputDir)..\src\ce_parse.c&#x0D;&#x0A;"
-						Outputs="$(InputDir)\..\src\ce_parse.cpp"
+						CommandLine="bison -l -d -p ce_parseexpYY $(InputPath) -o $(IntDir)\ce_parse.c&#x0D;&#x0A;bison -l -p constexpYY $(InputPath) -o $(IntDir)\ce_parse.cpp&#x0D;&#x0A;del $(IntDir)\ce_parse.c&#x0D;&#x0A;"
+						Outputs="$(IntDir)\ce_parse.cpp"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -957,8 +972,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Running bison on constexp.y"
-						CommandLine="bison -l -d -p ce_parseexpYY $(InputPath) -o $(InputDir)\..\src\ce_parse.c&#x0D;&#x0A;bison -l -p constexpYY $(InputPath) -o $(InputDir)..\src\ce_parse.cpp&#x0D;&#x0A;del $(InputDir)..\src\ce_parse.c&#x0D;&#x0A;"
-						Outputs="$(InputDir)\..\src\ce_parse.cpp"
+						CommandLine="bison -l -d -p ce_parseexpYY $(InputPath) -o $(IntDir)\ce_parse.c&#x0D;&#x0A;bison -l -p constexpYY $(InputPath) -o $(IntDir)\ce_parse.cpp&#x0D;&#x0A;del $(IntDir)\ce_parse.c&#x0D;&#x0A;"
+						Outputs="$(IntDir)\ce_parse.cpp"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -967,8 +982,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Running bison on constexp.y"
-						CommandLine="bison -l -d -p ce_parseexpYY $(InputPath) -o $(InputDir)\..\src\ce_parse.c&#x0D;&#x0A;bison -l -p constexpYY $(InputPath) -o $(InputDir)..\src\ce_parse.cpp&#x0D;&#x0A;del $(InputDir)..\src\ce_parse.c&#x0D;&#x0A;"
-						Outputs="$(InputDir)\..\src\ce_parse.cpp"
+						CommandLine="bison -l -d -p ce_parseexpYY $(InputPath) -o $(IntDir)\ce_parse.c&#x0D;&#x0A;bison -l -p constexpYY $(InputPath) -o $(IntDir)\ce_parse.cpp&#x0D;&#x0A;del $(IntDir)\ce_parse.c&#x0D;&#x0A;"
+						Outputs="$(IntDir)\ce_parse.cpp"
 					/>
 				</FileConfiguration>
 			</File>
@@ -981,8 +996,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Running bison on vhdlparser.y"
-						CommandLine="bison -l -d -p vhdlscannerYY $(InputPath) -o $(InputDir)\..\src\vhdlparser.c&#x0D;&#x0A;bison -l -p vhdlscannerYY $(InputPath) -o $(InputDir)\..\src\vhdlparser.cpp&#x0D;&#x0A;del $(InputDir)\..\src\vhdlparser.c&#x0D;&#x0A;"
-						Outputs="$(InputDir)$(InputName).cpp"
+						CommandLine="bison -l -d -p vhdlscannerYY $(InputPath) -o $(IntDir)\vhdlparser.c&#x0D;&#x0A;bison -l -p vhdlscannerYY $(InputPath) -o $(IntDir)\vhdlparser.cpp&#x0D;&#x0A;del $(IntDir)\vhdlparser.c&#x0D;&#x0A;"
+						Outputs="$(IntDir)\vhdlparser.cpp"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -991,8 +1006,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Running bison on vhdlparser.y"
-						CommandLine="bison -l -d -p vhdlscannerYY $(InputPath) -o $(InputDir)\..\src\vhdlparser.c&#x0D;&#x0A;bison -l -p vhdlscannerYY $(InputPath) -o $(InputDir)\..\src\vhdlparser.cpp&#x0D;&#x0A;del $(InputDir)\..\src\vhdlparser.c&#x0D;&#x0A;"
-						Outputs="$(InputDir)$(InputName).cpp"
+						CommandLine="bison -l -d -p vhdlscannerYY $(InputPath) -o $(IntDir)\vhdlparser.c&#x0D;&#x0A;bison -l -p vhdlscannerYY $(InputPath) -o $(IntDir)\vhdlparser.cpp&#x0D;&#x0A;del $(IntDir)\vhdlparser.c&#x0D;&#x0A;"
+						Outputs="$(IntDir)\vhdlparser.cpp"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1001,8 +1016,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Running bison on vhdlparser.y"
-						CommandLine="bison -l -d -p vhdlscannerYY $(InputPath) -o $(InputDir)\..\src\vhdlparser.c&#x0D;&#x0A;bison -l -p vhdlscannerYY $(InputPath) -o $(InputDir)\..\src\vhdlparser.cpp&#x0D;&#x0A;del $(InputDir)\..\src\vhdlparser.c&#x0D;&#x0A;"
-						Outputs="$(InputDir)$(InputName).cpp"
+						CommandLine="bison -l -d -p vhdlscannerYY $(InputPath) -o $(IntDir)\vhdlparser.c&#x0D;&#x0A;bison -l -p vhdlscannerYY $(InputPath) -o $(IntDir)\vhdlparser.cpp&#x0D;&#x0A;del $(IntDir)\vhdlparser.c&#x0D;&#x0A;"
+						Outputs="$(IntDir)\vhdlparser.cpp"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1011,8 +1026,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Running bison on vhdlparser.y"
-						CommandLine="bison -l -d -p vhdlscannerYY $(InputPath) -o $(InputDir)\..\src\vhdlparser.c&#x0D;&#x0A;bison -l -p vhdlscannerYY $(InputPath) -o $(InputDir)\..\src\vhdlparser.cpp&#x0D;&#x0A;del $(InputDir)\..\src\vhdlparser.c&#x0D;&#x0A;"
-						Outputs="$(InputDir)$(InputName).cpp"
+						CommandLine="bison -l -d -p vhdlscannerYY $(InputPath) -o $(IntDir)\vhdlparser.c&#x0D;&#x0A;bison -l -p vhdlscannerYY $(InputPath) -o $(IntDir)\vhdlparser.cpp&#x0D;&#x0A;del $(IntDir)\vhdlparser.c&#x0D;&#x0A;"
+						Outputs="$(IntDir)\vhdlparser.cpp"
 					/>
 				</FileConfiguration>
 			</File>
@@ -1317,6 +1332,38 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="unistd.py"
+				>
+				<FileConfiguration
+					Name="Debug|win32"
+					>
+					<Tool
+						Name="Unistd"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|win32"
+					>
+					<Tool
+						Name="Unistd"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="Unistd"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="Unistd"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\src\version.py"
 				>
@@ -2200,7 +2247,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\bib2xhtml.pl.h"
+				RelativePath="$(IntDir)\bib2xhtml.pl.h"
 				>
 			</File>
 			<File
@@ -2244,7 +2291,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\compound_xsd.h"
+				RelativePath="$(IntDir)\compound_xsd.h"
 				>
 			</File>
 			<File
@@ -2340,11 +2387,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\doxygen_bst.h"
+				RelativePath="$(IntDir)\doxygen_bst.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\doxygen_css.h"
+				RelativePath="$(IntDir)\doxygen_css.h"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\doxygen_sty.h"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\dynsections_js.h"
 				>
 			</File>
 			<File
@@ -2359,6 +2414,10 @@
 				RelativePath="..\src\example.h"
 				>
 			</File>
+			<File
+				RelativePath="$(IntDir)\extsearch_js.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\filedef.h"
 				>
@@ -2367,6 +2426,10 @@
 				RelativePath="..\src\filename.h"
 				>
 			</File>
+			<File
+				RelativePath="$(IntDir)\footer_html.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\formula.h"
 				>
@@ -2391,6 +2454,10 @@
 				RelativePath="..\src\groupdef.h"
 				>
 			</File>
+			<File
+				RelativePath="$(IntDir)\header_html.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\htags.h"
 				>
@@ -2424,7 +2491,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\index_xsd.h"
+				RelativePath="$(INtDir)\index_xsd.h"
 				>
 			</File>
 			<File
@@ -2432,7 +2499,31 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\lang_cfg.h"
+				RelativePath="$(IntDir)\jquery_fx_js.h"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\jquery_p1_js.h"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\jquery_p2_js.h"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\jquery_p3_js.h"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\jquery_pt_js.h"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\jquery_ui_js.h"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\lang_cfg.h"
 				>
 			</File>
 			<File
@@ -2451,6 +2542,10 @@
 				RelativePath="..\src\layout.h"
 				>
 			</File>
+			<File
+				RelativePath="$(IntDir)\layout_default_xml.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\lockingptr.h"
 				>
@@ -2516,7 +2611,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\navtree_js.h"
+				RelativePath="$(IntDir)\navtree_js.h"
 				>
 			</File>
 			<File
@@ -2579,6 +2674,10 @@
 				RelativePath="..\src\reflist.h"
 				>
 			</File>
+			<File
+				RelativePath="$(IntDir)\resize_js.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\rtfdocvisitor.h"
 				>
@@ -2596,15 +2695,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\search_css.h"
+				RelativePath="$(IntDir)\search_css.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\search_js.h"
+				RelativePath="$(IntDir)\search_js.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\search_php.h"
+				RelativePath="$(IntDir)\search_functionsjs.h"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\search_opensearch_js.h"
 				>
 			</File>
 			<File
@@ -2616,13 +2719,17 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\settings.h"
+				RelativePath="$(IntDir)\settings.h"
 				>
 			</File>
 			<File
 				RelativePath="..\src\sortdict.h"
 				>
 			</File>
+			<File
+				RelativePath="$(IntDir)\svgpan_js.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\store.h"
 				>
@@ -2820,48 +2927,8 @@
 				>
 			</File>
 			<File
-				RelativePath="..\winbuild\unistd.h"
+				RelativePath="$(IntDir)\unistd.h"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="echo /* this is a dummy file, that is needed for compiling files that are &gt; $(InputPath)&#x0D;&#x0A;echo  * generated with flex under Windows 95/NT. &gt;&gt; $(InputPath)&#x0D;&#x0A;echo  */ &gt;&gt; $(InputPath)&#x0D;&#x0A;echo #if defined(_MSC_VER) &gt;&gt; $(InputPath)&#x0D;&#x0A;echo #include ^&lt;io.h^&gt; &gt;&gt; $(InputPath)&#x0D;&#x0A;echo #endif &gt;&gt; $(InputPath)&#x0D;&#x0A;"
-						AdditionalDependencies="..\src\constexp.cpp;..\src\code.cpp;..\src\commentcnv.cpp;..\src\config.cpp;..\src\declinfo.cpp;..\src\defargs.cpp;..\src\doctokenizer.cpp;..\src\formula.cpp;..\src\pre.cpp;..\src\scanner.cpp;..\src\util.cpp;"
-						Outputs="$(InputPath)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="echo /* this is a dummy file, that is needed for compiling files that are &gt; $(InputPath)&#x0D;&#x0A;echo  * generated with flex under Windows 95/NT. &gt;&gt; $(InputPath)&#x0D;&#x0A;echo  */ &gt;&gt; $(InputPath)&#x0D;&#x0A;echo #if defined(_MSC_VER) &gt;&gt; $(InputPath)&#x0D;&#x0A;echo #include ^&lt;io.h^&gt; &gt;&gt; $(InputPath)&#x0D;&#x0A;echo #endif &gt;&gt; $(InputPath)&#x0D;&#x0A;"
-						AdditionalDependencies="..\src\constexp.cpp;..\src\code.cpp;..\src\commentcnv.cpp;..\src\config.cpp;..\src\declinfo.cpp;..\src\defargs.cpp;..\src\doctokenizer.cpp;..\src\formula.cpp;..\src\pre.cpp;..\src\scanner.cpp;..\src\util.cpp;"
-						Outputs="$(InputPath)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="echo /* this is a dummy file, that is needed for compiling files that are &gt; $(InputPath)&#x0D;&#x0A;echo  * generated with flex under Windows 95/NT. &gt;&gt; $(InputPath)&#x0D;&#x0A;echo  */ &gt;&gt; $(InputPath)&#x0D;&#x0A;echo #if defined(_MSC_VER) &gt;&gt; $(InputPath)&#x0D;&#x0A;echo #include ^&lt;io.h^&gt; &gt;&gt; $(InputPath)&#x0D;&#x0A;echo #endif &gt;&gt; $(InputPath)&#x0D;&#x0A;"
-						AdditionalDependencies="..\src\constexp.cpp;..\src\code.cpp;..\src\commentcnv.cpp;..\src\config.cpp;..\src\declinfo.cpp;..\src\defargs.cpp;..\src\doctokenizer.cpp;..\src\formula.cpp;..\src\pre.cpp;..\src\scanner.cpp;..\src\util.cpp;"
-						Outputs="$(InputPath)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="echo /* this is a dummy file, that is needed for compiling files that are &gt; $(InputPath)&#x0D;&#x0A;echo  * generated with flex under Windows 95/NT. &gt;&gt; $(InputPath)&#x0D;&#x0A;echo  */ &gt;&gt; $(InputPath)&#x0D;&#x0A;echo #if defined(_MSC_VER) &gt;&gt; $(InputPath)&#x0D;&#x0A;echo #include ^&lt;io.h^&gt; &gt;&gt; $(InputPath)&#x0D;&#x0A;echo #endif &gt;&gt; $(InputPath)&#x0D;&#x0A;"
-						AdditionalDependencies="..\src\constexp.cpp;..\src\code.cpp;..\src\commentcnv.cpp;..\src\config.cpp;..\src\declinfo.cpp;..\src\defargs.cpp;..\src\doctokenizer.cpp;..\src\formula.cpp;..\src\pre.cpp;..\src\scanner.cpp;..\src\util.cpp;"
-						Outputs="$(InputPath)"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\util.h"
@@ -2872,7 +2939,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\vhdlcode.cpp"
+				RelativePath="$(IntDir)\vhdlcode.cpp"
 				>
 			</File>
 			<File
@@ -2884,7 +2951,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\vhdlscanner.cpp"
+				RelativePath="$(IntDir)\vhdlscanner.cpp"
 				>
 			</File>
 			<File

--- a/winbuild/Doxywizard.vcproj
+++ b/winbuild/Doxywizard.vcproj
@@ -22,6 +22,9 @@
 		<ToolFile
 			RelativePath=".\Settings.rules"
 		/>
+		<ToolFile
+			RelativePath=".\Unistd.rules"
+		/>
 		<ToolFile
 			RelativePath=".\Config.rules"
 		/>
@@ -30,7 +33,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\bin\Debug"
-			IntermediateDirectory=".\Debug"
+			IntermediateDirectory=".\Debug\doxywizard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -57,6 +60,9 @@
 			<Tool
 				Name="Settings"
 			/>
+			<Tool
+				Name="Unistd"
+			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
@@ -73,7 +79,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-Zm200 -w34100 -w34189 -Zm200 -w34100 -w34189 -w34100 -w34189"
 				Optimization="4"
-				AdditionalIncludeDirectories="&quot;$(QT_DIR)\include\QtCore&quot;,&quot;$(QT_DIR)\include\QtCore&quot;,&quot;$(QT_DIR)\include\QtGui&quot;,&quot;$(QT_DIR)\include\QtGui&quot;,&quot;$(QT_DIR)\include\QtXml&quot;,&quot;$(QT_DIR)\include\QtXml&quot;,&quot;$(QT_DIR)\include&quot;,&quot;..\addon\doxywizard&quot;,&quot;$(QT_DIR)\include\ActiveQt&quot;,&quot;moc&quot;,&quot;..\addon\doxywizard&quot;,&quot;.&quot;,$(QT_DIR)\mkspecs\win32-msvc2008"
+				AdditionalIncludeDirectories="$(IntDir);&quot;$(QT_DIR)\include\QtCore&quot;,&quot;$(QT_DIR)\include\QtCore&quot;,&quot;$(QT_DIR)\include\QtGui&quot;,&quot;$(QT_DIR)\include\QtGui&quot;,&quot;$(QT_DIR)\include\QtXml&quot;,&quot;$(QT_DIR)\include\QtXml&quot;,&quot;$(QT_DIR)\include&quot;,&quot;..\addon\doxywizard&quot;,&quot;$(QT_DIR)\include\ActiveQt&quot;,&quot;moc&quot;,&quot;..\addon\doxywizard&quot;,&quot;.&quot;,$(QT_DIR)\mkspecs\win32-msvc2008"
 				PreprocessorDefinitions="_WINDOWS,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_NO_CAST_FROM_ASCII,QT_NO_CAST_TO_ASCII,QT_XML_LIB,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT"
 				GeneratePreprocessedFile="0"
 				ExceptionHandling="1"
@@ -81,9 +87,9 @@
 				BufferSecurityCheck="false"
 				TreatWChar_tAsBuiltInType="false"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="Debug\"
-				ObjectFile="Debug\"
-				ProgramDataBaseFileName=".\Debug\$(TargetName).pdb"
+				AssemblerListingLocation="Debug\doxywizard\"
+				ObjectFile="Debug\doxywizard\"
+				ProgramDataBaseFileName=".\Debug\doxywizard\$(TargetName).pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -108,7 +114,7 @@
 				AdditionalLibraryDirectories="$(QT_DIR)\lib"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug\$(TargetName).pdb"
+				ProgramDatabaseFile=".\Debug\doxywizard\$(TargetName).pdb"
 				SubSystem="2"
 				LargeAddressAware="2"
 				LinkTimeCodeGeneration="0"
@@ -140,7 +146,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="..\bin\Release"
-			IntermediateDirectory=".\Release"
+			IntermediateDirectory=".\Release\doxywizard"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -167,6 +173,9 @@
 			<Tool
 				Name="Settings"
 			/>
+			<Tool
+				Name="Unistd"
+			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
 			/>
@@ -183,7 +192,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-Zm200 -w34100 -w34189 -Zm200 -w34100 -w34189 -w34100 -w34189"
 				Optimization="2"
-				AdditionalIncludeDirectories="&quot;$(QT_DIR)\include\QtCore&quot;,&quot;$(QT_DIR)\include\QtCore&quot;,&quot;$(QT_DIR)\include\QtGui&quot;,&quot;$(QT_DIR)\include\QtGui&quot;,&quot;$(QT_DIR)\include\QtXml&quot;,&quot;$(QT_DIR)\include\QtXml&quot;,&quot;$(QT_DIR)\include&quot;,&quot;..\addon\doxywizard&quot;,&quot;$(QT_DIR)\include\ActiveQt&quot;,&quot;moc&quot;,&quot;..\addon\doxywizard&quot;,&quot;.&quot;,$(QT_DIR)\mkspecs\win32-msvc2008"
+				AdditionalIncludeDirectories="$(IntDir);&quot;$(QT_DIR)\include\QtCore&quot;,&quot;$(QT_DIR)\include\QtCore&quot;,&quot;$(QT_DIR)\include\QtGui&quot;,&quot;$(QT_DIR)\include\QtGui&quot;,&quot;$(QT_DIR)\include\QtXml&quot;,&quot;$(QT_DIR)\include\QtXml&quot;,&quot;$(QT_DIR)\include&quot;,&quot;..\addon\doxywizard&quot;,&quot;$(QT_DIR)\include\ActiveQt&quot;,&quot;moc&quot;,&quot;..\addon\doxywizard&quot;,&quot;.&quot;,$(QT_DIR)\mkspecs\win32-msvc2008"
 				PreprocessorDefinitions="QT_NO_DEBUG,NDEBUG,_WINDOWS,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,QT_NO_CAST_FROM_ASCII,QT_NO_CAST_TO_ASCII,QT_NO_DEBUG,QT_XML_LIB,QT_GUI_LIB,QT_CORE_LIB,QT_THREAD_SUPPORT,NDEBUG"
 				GeneratePreprocessedFile="0"
 				ExceptionHandling="1"
@@ -191,9 +200,9 @@
 				BufferSecurityCheck="false"
 				TreatWChar_tAsBuiltInType="false"
 				RuntimeTypeInfo="true"
-				AssemblerListingLocation="Release\"
-				ObjectFile="Release\"
-				ProgramDataBaseFileName=".\Release\$(TargetName).pdb"
+				AssemblerListingLocation="Release\doxywizard\"
+				ObjectFile="Release\doxywizard\"
+				ProgramDataBaseFileName=".\Release\doxywizard\$(TargetName).pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="0"
@@ -220,7 +229,7 @@
 				IgnoreAllDefaultLibraries="false"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="false"
-				ProgramDatabaseFile=".\Release\$(TargetName).pdb"
+				ProgramDatabaseFile=".\Release\doxywizard\$(TargetName).pdb"
 				SubSystem="2"
 				LargeAddressAware="2"
 				LinkTimeCodeGeneration="0"
@@ -283,7 +292,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\version.cpp"
+				RelativePath="$(IntDir)\version.cpp"
 				>
 			</File>
 			<File
@@ -309,9 +318,9 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="MOC ..\addon\doxywizard\doxywizard.h"
-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\doxywizard.h -o moc\moc_doxywizard.cpp&#x0D;&#x0A;"
+						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\doxywizard.h -o $(IntDir)\moc\moc_doxywizard.cpp&#x0D;&#x0A;"
 						AdditionalDependencies="..\addon\doxywizard\doxywizard.h;$(QT_DIR)\bin\moc.exe"
-						Outputs="moc\moc_doxywizard.cpp"
+						Outputs="$(IntDir)\moc\moc_doxywizard.cpp"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -320,9 +329,9 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="MOC ..\addon\doxywizard\doxywizard.h"
-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\doxywizard.h -o moc\moc_doxywizard.cpp&#x0D;&#x0A;"
+						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\doxywizard.h -o $(IntDir)\moc\moc_doxywizard.cpp&#x0D;&#x0A;"
 						AdditionalDependencies="..\addon\doxywizard\doxywizard.h;$(QT_DIR)\bin\moc.exe"
-						Outputs="moc\moc_doxywizard.cpp"
+						Outputs="$(IntDir)\moc\moc_doxywizard.cpp"
 					/>
 				</FileConfiguration>
 			</File>
@@ -335,9 +344,9 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="MOC ..\addon\doxywizard\expert.h"
-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\expert.h -o moc\moc_expert.cpp&#x0D;&#x0A;"
+						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\expert.h -o $(IntDir)\moc\moc_expert.cpp&#x0D;&#x0A;"
 						AdditionalDependencies="..\addon\doxywizard\expert.h;$(QT_DIR)\bin\moc.exe"
-						Outputs="moc\moc_expert.cpp"
+						Outputs="$(IntDir)\moc\moc_expert.cpp"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -346,9 +355,9 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="MOC ..\addon\doxywizard\expert.h"
-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\expert.h -o moc\moc_expert.cpp&#x0D;&#x0A;"
+						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\expert.h -o $(IntDir)\moc\moc_expert.cpp&#x0D;&#x0A;"
 						AdditionalDependencies="..\addon\doxywizard\expert.h;$(QT_DIR)\bin\moc.exe"
-						Outputs="moc\moc_expert.cpp"
+						Outputs="$(IntDir)\moc\moc_expert.cpp"
 					/>
 				</FileConfiguration>
 			</File>
@@ -361,9 +370,9 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="MOC ..\addon\doxywizard\helplabel.h"
-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\helplabel.h -o moc\moc_helplabel.cpp&#x0D;&#x0A;"
+						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\helplabel.h -o $(IntDir)\moc\moc_helplabel.cpp&#x0D;&#x0A;"
 						AdditionalDependencies="..\addon\doxywizard\helplabel.h;$(QT_DIR)\bin\moc.exe"
-						Outputs="moc\moc_helplabel.cpp"
+						Outputs="$(IntDir)\moc\moc_helplabel.cpp"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -372,9 +381,9 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="MOC ..\addon\doxywizard\helplabel.h"
-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\helplabel.h -o moc\moc_helplabel.cpp&#x0D;&#x0A;"
+						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\helplabel.h -o $(IntDir)\moc\moc_helplabel.cpp&#x0D;&#x0A;"
 						AdditionalDependencies="..\addon\doxywizard\helplabel.h;$(QT_DIR)\bin\moc.exe"
-						Outputs="moc\moc_helplabel.cpp"
+						Outputs="$(IntDir)\moc\moc_helplabel.cpp"
 					/>
 				</FileConfiguration>
 			</File>
@@ -387,9 +396,9 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="MOC ..\addon\doxywizard\inputbool.h"
-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputbool.h -o moc\moc_inputbool.cpp&#x0D;&#x0A;"
+						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputbool.h -o $(IntDir)\moc\moc_inputbool.cpp&#x0D;&#x0A;"
 						AdditionalDependencies="..\addon\doxywizard\inputbool.h;$(QT_DIR)\bin\moc.exe"
-						Outputs="moc\moc_inputbool.cpp"
+						Outputs="$(IntDir)\moc\moc_inputbool.cpp"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -398,9 +407,9 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="MOC ..\addon\doxywizard\inputbool.h"
-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputbool.h -o moc\moc_inputbool.cpp&#x0D;&#x0A;"
+						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputbool.h -o $(IntDir)\moc\moc_inputbool.cpp&#x0D;&#x0A;"
 						AdditionalDependencies="..\addon\doxywizard\inputbool.h;$(QT_DIR)\bin\moc.exe"
-						Outputs="moc\moc_inputbool.cpp"
+						Outputs="$(IntDir)\moc\moc_inputbool.cpp"
 					/>
 				</FileConfiguration>
 			</File>
@@ -413,9 +422,9 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="MOC ..\addon\doxywizard\inputint.h"
-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputint.h -o moc\moc_inputint.cpp&#x0D;&#x0A;"
+						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputint.h -o $(IntDir)\moc\moc_inputint.cpp&#x0D;&#x0A;"
 						AdditionalDependencies="..\addon\doxywizard\inputint.h;$(QT_DIR)\bin\moc.exe"
-						Outputs="moc\moc_inputint.cpp"
+						Outputs="$(IntDir)\moc\moc_inputint.cpp"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -424,9 +433,9 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="MOC ..\addon\doxywizard\inputint.h"
-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputint.h -o moc\moc_inputint.cpp&#x0D;&#x0A;"
+						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputint.h -o $(IntDir)\moc\moc_inputint.cpp&#x0D;&#x0A;"
 						AdditionalDependencies="..\addon\doxywizard\inputint.h;$(QT_DIR)\bin\moc.exe"
-						Outputs="moc\moc_inputint.cpp"
+						Outputs="$(IntDir)\moc\moc_inputint.cpp"
 					/>
 				</FileConfiguration>
 			</File>
@@ -439,9 +448,9 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="MOC ..\addon\doxywizard\inputstring.h"
-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputstring.h -o moc\moc_inputstring.cpp&#x0D;&#x0A;"
+						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputstring.h -o $(IntDir)\moc\moc_inputstring.cpp&#x0D;&#x0A;"
 						AdditionalDependencies="..\addon\doxywizard\inputstring.h;$(QT_DIR)\bin\moc.exe"
-						Outputs="moc\moc_inputstring.cpp"
+						Outputs="$(IntDir)\moc\moc_inputstring.cpp"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -450,9 +459,9 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="MOC ..\addon\doxywizard\inputstring.h"
-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputstring.h -o moc\moc_inputstring.cpp&#x0D;&#x0A;"
+						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputstring.h -o $(IntDir)\moc\moc_inputstring.cpp&#x0D;&#x0A;"
 						AdditionalDependencies="..\addon\doxywizard\inputstring.h;$(QT_DIR)\bin\moc.exe"
-						Outputs="moc\moc_inputstring.cpp"
+						Outputs="$(IntDir)\moc\moc_inputstring.cpp"
 					/>
 				</FileConfiguration>
 			</File>
@@ -465,9 +474,9 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="MOC ..\addon\doxywizard\inputstrlist.h"
-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputstrlist.h -o moc\moc_inputstrlist.cpp&#x0D;&#x0A;"
+						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputstrlist.h -o $(IntDir)\moc\moc_inputstrlist.cpp&#x0D;&#x0A;"
 						AdditionalDependencies="..\addon\doxywizard\inputstrlist.h;$(QT_DIR)\bin\moc.exe"
-						Outputs="moc\moc_inputstrlist.cpp"
+						Outputs="$(IntDir)\moc\moc_inputstrlist.cpp"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -476,9 +485,9 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="MOC ..\addon\doxywizard\inputstrlist.h"
-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputstrlist.h -o moc\moc_inputstrlist.cpp&#x0D;&#x0A;"
+						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\inputstrlist.h -o $(IntDir)\moc\moc_inputstrlist.cpp&#x0D;&#x0A;"
 						AdditionalDependencies="..\addon\doxywizard\inputstrlist.h;$(QT_DIR)\bin\moc.exe"
-						Outputs="moc\moc_inputstrlist.cpp"
+						Outputs="$(IntDir)\moc\moc_inputstrlist.cpp"
 					/>
 				</FileConfiguration>
 			</File>
@@ -491,9 +500,9 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="MOC ..\addon\doxywizard\wizard.h"
-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\wizard.h -o moc\moc_wizard.cpp&#x0D;&#x0A;"
+						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\wizard.h -o $(IntDir)\moc\moc_wizard.cpp&#x0D;&#x0A;"
 						AdditionalDependencies="..\addon\doxywizard\wizard.h;$(QT_DIR)\bin\moc.exe"
-						Outputs="moc\moc_wizard.cpp"
+						Outputs="$(IntDir)\moc\moc_wizard.cpp"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -502,9 +511,9 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="MOC ..\addon\doxywizard\wizard.h"
-						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\wizard.h -o moc\moc_wizard.cpp&#x0D;&#x0A;"
+						CommandLine="$(QT_DIR)\bin\moc.exe  -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtCore&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtGui&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include\QtXml&quot; -I&quot;$(QT_DIR)\include&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;$(QT_DIR)\include\ActiveQt&quot; -I&quot;moc&quot; -I&quot;..\addon\doxywizard&quot; -I&quot;.&quot; -I$(QT_DIR)\mkspecs\win32-msvc2008 -D_MSC_VER=1400 -DWIN32 ..\addon\doxywizard\wizard.h -o $(IntDir)\moc\moc_wizard.cpp&#x0D;&#x0A;"
 						AdditionalDependencies="..\addon\doxywizard\wizard.h;$(QT_DIR)\bin\moc.exe"
-						Outputs="moc\moc_wizard.cpp"
+						Outputs="$(IntDir)\moc\moc_wizard.cpp"
 					/>
 				</FileConfiguration>
 			</File>
@@ -515,47 +524,47 @@
 			UniqueIdentifier="{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}"
 			>
 			<File
-				RelativePath="..\addon\doxywizard\config_doxyw.cpp"
+				RelativePath="$(IntDir)\config_doxyw.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\addon\doxywizard\configdoc.cpp"
+				RelativePath="$(IntDir)\configdoc.cpp"
 				>
 			</File>
 			<File
-				RelativePath="moc\moc_doxywizard.cpp"
+				RelativePath="$(IntDir)\moc\moc_doxywizard.cpp"
 				>
 			</File>
 			<File
-				RelativePath="moc\moc_expert.cpp"
+				RelativePath="$(IntDir)\moc\moc_expert.cpp"
 				>
 			</File>
 			<File
-				RelativePath="moc\moc_helplabel.cpp"
+				RelativePath="$(IntDir)\moc\moc_helplabel.cpp"
 				>
 			</File>
 			<File
-				RelativePath="moc\moc_inputbool.cpp"
+				RelativePath="$(IntDir)\moc\moc_inputbool.cpp"
 				>
 			</File>
 			<File
-				RelativePath="moc\moc_inputint.cpp"
+				RelativePath="$(IntDir)\moc\moc_inputint.cpp"
 				>
 			</File>
 			<File
-				RelativePath="moc\moc_inputstring.cpp"
+				RelativePath="$(IntDir)\moc\moc_inputstring.cpp"
 				>
 			</File>
 			<File
-				RelativePath="moc\moc_inputstrlist.cpp"
+				RelativePath="$(IntDir)\moc\moc_inputstrlist.cpp"
 				>
 			</File>
 			<File
-				RelativePath="moc\moc_wizard.cpp"
+				RelativePath="$(IntDir)\moc\moc_wizard.cpp"
 				>
 			</File>
 			<File
-				RelativePath="rcc\qrc_doxywizard.cpp"
+				RelativePath="$(IntDir)\rcc\qrc_doxywizard.cpp"
 				>
 			</File>
 		</Filter>
@@ -592,6 +601,24 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="unistd.py"
+				>
+				<FileConfiguration
+					Name="Debug|win32"
+					>
+					<Tool
+						Name="Unistd"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|win32"
+					>
+					<Tool
+						Name="Unistd"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\src\version.py"
 				>
@@ -663,9 +690,9 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="RCC ..\addon\doxywizard\doxywizard.qrc"
-						CommandLine="$(QT_DIR)\bin\rcc.exe -name doxywizard ..\addon\doxywizard\doxywizard.qrc -o rcc\qrc_doxywizard.cpp&#x0D;&#x0A;"
+						CommandLine="$(QT_DIR)\bin\rcc.exe -name doxywizard ..\addon\doxywizard\doxywizard.qrc -o $(IntDir)\rcc\qrc_doxywizard.cpp&#x0D;&#x0A;"
 						AdditionalDependencies="..\addon\doxywizard\doxywizard.qrc;$(QT_DIR)\bin\rcc.exe"
-						Outputs="rcc\qrc_doxywizard.cpp"
+						Outputs="$(IntDir)\rcc\qrc_doxywizard.cpp"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -674,9 +701,9 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="RCC ..\addon\doxywizard\doxywizard.qrc"
-						CommandLine="$(QT_DIR)\bin\rcc.exe -name doxywizard ..\addon\doxywizard\doxywizard.qrc -o rcc\qrc_doxywizard.cpp&#x0D;&#x0A;"
+						CommandLine="$(QT_DIR)\bin\rcc.exe -name doxywizard ..\addon\doxywizard\doxywizard.qrc -o $(IntDir)\rcc\qrc_doxywizard.cpp&#x0D;&#x0A;"
 						AdditionalDependencies="..\addon\doxywizard\doxywizard.qrc;$(QT_DIR)\bin\rcc.exe"
-						Outputs="rcc\qrc_doxywizard.cpp"
+						Outputs="$(IntDir)\rcc\qrc_doxywizard.cpp"
 					/>
 				</FileConfiguration>
 			</File>

--- a/winbuild/Gen_head.rules
+++ b/winbuild/Gen_head.rules
@@ -7,8 +7,8 @@
 		<CustomBuildRule
 			Name="Gen_head"
 			DisplayName="Gen_head"
-			CommandLine="python $(ProjectDir)..\src\to_c_cmd.py [AllOptions] [AdditionalOptions] [inputs] &lt; $(InputPath) &gt; $(InputPath).h"
-			Outputs="$(InputPath).h"
+			CommandLine="python $(ProjectDir)..\src\to_c_cmd.py [AllOptions] [AdditionalOptions] [inputs] &lt; $(InputPath) &gt; $(IntDir)/$(InputName)$(InputExt).h"
+			Outputs="$(IntDir)/$(InputName)$(InputExt).h"
 			FileExtensions=".*"
 			AdditionalDependencies="$(ProjectDir)..\src\to_c_cmd.py"
 			ExecutionDescription="Executing to_c_cmd on $(InputPath) ..."

--- a/winbuild/Languages.rules
+++ b/winbuild/Languages.rules
@@ -7,8 +7,8 @@
                <CustomBuildRule
                        Name="Languages"
                        DisplayName="Settings"
-                        CommandLine="python $(InputPath) [AllOptions] [AdditionalOptions] &gt; $(InputDir)../src/$(InputName).h"
-                        Outputs="$(InputDir)../src/$(InputName).h"
+                        CommandLine="python $(InputPath) [AllOptions] [AdditionalOptions] &gt; $(IntDir)/$(InputName).h"
+                        Outputs="$(IntDir)/$(InputName).h"
                        FileExtensions="*.py"
                        AdditionalDependencies=""
                        ExecutionDescription="Executing languages ..."

--- a/winbuild/Lex.rules
+++ b/winbuild/Lex.rules
@@ -7,8 +7,8 @@
 		<CustomBuildRule
 			Name="Lex"
 			DisplayName="Lex"
-			CommandLine="flex [AllOptions] -t -P$(InputName)YY [AdditionalOptions] [inputs] | python $(ProjectDir)..\src\increasebuffer.py &gt; $(InputDir)$(InputName).cpp"
-			Outputs="$(InputDir)/$(InputName).cpp"
+			CommandLine="flex [AllOptions] -t -P$(InputName)YY [AdditionalOptions] [inputs] | python $(ProjectDir)..\src\increasebuffer.py &gt; $(IntDir)/$(InputName).cpp"
+			Outputs="$(IntDir)/$(InputName).cpp"
 			FileExtensions="*.l"
 			AdditionalDependencies="$(ProjectDir)..\src\increasebuffer.py"
 			ExecutionDescription="Executing Lex for $(InputPath) ..."

--- a/winbuild/Settings.rules
+++ b/winbuild/Settings.rules
@@ -7,8 +7,8 @@
 		<CustomBuildRule
 			Name="Settings"
 			DisplayName="Settings"
-			CommandLine="python $(InputPath) [AllOptions] [AdditionalOptions] [inputs]"
-			Outputs="$(InputDir)../src/$(InputName).h"
+			CommandLine="python $(InputPath) [AllOptions] [AdditionalOptions] $(IntDir)"
+			Outputs="$(IntDir)/$(InputName).h"
 			FileExtensions="*.py"
 			AdditionalDependencies="$(ProjectDir)..\configure"
 			ExecutionDescription="Executing Settings ..."

--- a/winbuild/Unistd.rules
+++ b/winbuild/Unistd.rules
+<?xml version="1.0" encoding="utf-8"?>
+<VisualStudioToolFile
+	Name="unistd"
+	Version="8.00"
+	>
+	<Rules>
+		<CustomBuildRule
+			Name="Unistd"
+			DisplayName="Unistd"
+			CommandLine="python $(InputPath) [AllOptions] [AdditionalOptions] $(IntDir)"
+			Outputs="$(IntDir)/$(InputName).h"
+			FileExtensions="*.py"
+			ExecutionDescription="Executing Unistd ..."
+			ShowOnlyRuleProperties="false"
+			>
+		</CustomBuildRule>
+	</Rules>
+</VisualStudioToolFile>
--- a/winbuild/Version.rules
+++ b/winbuild/Version.rules
@@ -7,8 +7,8 @@
 		<CustomBuildRule
 			Name="Version"
 			DisplayName="Version"
-			CommandLine="python $(InputPath)"
-			Outputs="$(InputDir)..\src\$(InputName).cpp"
+			CommandLine="python $(InputPath) $(IntDir)"
+			Outputs="$(IntDir)\$(InputName).cpp"
 			FileExtensions="*.py"
 			AdditionalDependencies="$(ProjectDir)..\configure"
 			ExecutionDescription="Executing Version ..."

--- a/winbuild/doxyindexer.vcproj
+++ b/winbuild/doxyindexer.vcproj
@@ -22,7 +22,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\bin\Debug"
-			IntermediateDirectory=".\Debug"
+			IntermediateDirectory=".\Debug\doxyindexer"
 			ConfigurationType="1"
 			CharacterSet="1"
 			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
@@ -53,7 +53,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				ProgramDatabaseFileName=".\Debug\$(TargetName).pdb"
+				ProgramDatabaseFileName=".\Debug\doxyindexer\$(TargetName).pdb"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -74,7 +74,7 @@
 				IgnoreAllDefaultLibraries="false"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug\$(TargetName).pdb"
+				ProgramDatabaseFile=".\Debug\doxyindexer\$(TargetName).pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -103,7 +103,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\bin\Debug64"
-			IntermediateDirectory=".\Debug64"
+			IntermediateDirectory=".\Debug64\doxyindexer"
 			ConfigurationType="1"
 			CharacterSet="1"
 			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
@@ -135,7 +135,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
-				ProgramDatabaseFileName=".\Debug64\$(TargetName).pdb"
+				ProgramDatabaseFileName=".\Debug64\doxyindexer\$(TargetName).pdb"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -153,7 +153,7 @@
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(XAPIAN_DIR)\Debug64&quot;;Debug64"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug64\$(TargetName).pdb"
+				ProgramDatabaseFile=".\Debug64\doxyindexer\$(TargetName).pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -182,7 +182,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="..\bin\Relase"
-			IntermediateDirectory=".\Release"
+			IntermediateDirectory=".\Release\doxyindexer"
 			ConfigurationType="1"
 			CharacterSet="1"
 			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
@@ -214,7 +214,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
-				ProgramDatabaseFileName=".\Release\$(TargetName).pdb"
+				ProgramDatabaseFileName=".\Release\doxyindexer\$(TargetName).pdb"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -233,7 +233,7 @@
 				AdditionalLibraryDirectories="&quot;$(XAPIAN_DIR)\Release&quot;;Release"
 				GenerateManifest="false"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Release\$(TargetName).pdb"
+				ProgramDatabaseFile=".\Release\doxyindexer\$(TargetName).pdb"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -264,7 +264,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\bin\Relase64"
-			IntermediateDirectory=".\Release64"
+			IntermediateDirectory=".\Release64\doxyindexer"
 			ConfigurationType="1"
 			CharacterSet="1"
 			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
@@ -297,7 +297,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
-				ProgramDatabaseFileName=".\Relase64\$(TargetName).pdb"
+				ProgramDatabaseFileName=".\Relase64\doxyindexer\$(TargetName).pdb"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -315,7 +315,7 @@
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(XAPIAN_DIR)\Release64&quot;;Release64"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Release64\$(TargetName).pdb"
+				ProgramDatabaseFile=".\Release64\doxyindexer\$(TargetName).pdb"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"

--- a/winbuild/doxysearch.vcproj
+++ b/winbuild/doxysearch.vcproj
@@ -22,7 +22,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\bin\Debug"
-			IntermediateDirectory=".\Debug"
+			IntermediateDirectory=".\Debug\doxysearch"
 			ConfigurationType="1"
 			CharacterSet="1"
 			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
@@ -53,7 +53,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				ProgramDatabaseFileName=".\Debug\$(TargetName).pdb"
+				ProgramDatabaseFileName=".\Debug\doxysearch\$(TargetName).pdb"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -71,7 +71,7 @@
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(XAPIAN_DIR)\Debug&quot;"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug\$(TargetName).pdb"
+				ProgramDatabaseFile=".\Debug\doxysearch\$(TargetName).pdb"
 				SubSystem="1"
 				TargetMachine="1"
 			/>
@@ -100,7 +100,7 @@
 		<Configuration
 			Name="Debug|x64"
 			OutputDirectory="..\bin\Debug64"
-			IntermediateDirectory=".\Debug64"
+			IntermediateDirectory=".\Debug64\doxysearch"
 			ConfigurationType="1"
 			CharacterSet="1"
 			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
@@ -132,7 +132,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
-				ProgramDatabaseFileName=".\Debug64\$(TargetName).pdb"
+				ProgramDatabaseFileName=".\Debug64\doxysearch\$(TargetName).pdb"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -150,7 +150,7 @@
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(XAPIAN_DIR)\Debug64&quot;"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug64\$(TargetName).pdb"
+				ProgramDatabaseFile=".\Debug64\doxysearch\$(TargetName).pdb"
 				SubSystem="1"
 				TargetMachine="17"
 			/>
@@ -179,7 +179,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="..\bin\Release"
-			IntermediateDirectory=".\Release"
+			IntermediateDirectory=".\Release\doxysearch"
 			ConfigurationType="1"
 			CharacterSet="1"
 			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
@@ -211,7 +211,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
-				ProgramDatabaseFileName=".\Release\$(TargetName).pdb"
+				ProgramDatabaseFileName=".\Release\doxysearch\$(TargetName).pdb"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -229,7 +229,7 @@
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(XAPIAN_DIR)\Release&quot;"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Release\$(TargetName).pdb"
+				ProgramDatabaseFile=".\Release\doxysearch\$(TargetName).pdb"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -260,7 +260,7 @@
 		<Configuration
 			Name="Release|x64"
 			OutputDirectory="..\bin\Release64"
-			IntermediateDirectory=".\Release64"
+			IntermediateDirectory=".\Release64\doxysearch"
 			ConfigurationType="1"
 			CharacterSet="1"
 			BuildLogFile="$(IntDir)\$(TargetName)BuildLog.htm"
@@ -293,7 +293,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				DebugInformationFormat="3"
-				ProgramDatabaseFileName=".\Release64\$(TargetName).pdb"
+				ProgramDatabaseFileName=".\Release64\doxysearch\$(TargetName).pdb"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -311,7 +311,7 @@
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(XAPIAN_DIR)\Release64&quot;"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Release64\$(TargetName).pdb"
+				ProgramDatabaseFile=".\Release64\doxysearch\$(TargetName).pdb"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"

--- a/winbuild/qtools.vcproj
+++ b/winbuild/qtools.vcproj
@@ -19,8 +19,8 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
+			OutputDirectory=".\Release\qtools"
+			IntermediateDirectory=".\Release\qtools"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -54,10 +54,10 @@
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release/qtools.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDatabaseFileName=".\Release\$(TargetName).pdb"
+				PrecompiledHeaderFile=".\Release\qtools/qtools.pch"
+				AssemblerListingLocation=".\Release\qtools/"
+				ObjectFile=".\Release\qtools/"
+				ProgramDatabaseFileName=".\Release\qtools\$(TargetName).pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -87,7 +87,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile=".\Release/qtools.bsc"
+				OutputFile=".\Release\qtools/qtools.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -98,8 +98,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory=".\Release64"
-			IntermediateDirectory=".\Release64"
+			OutputDirectory=".\Release64\qtools"
+			IntermediateDirectory=".\Release64\qtools"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -134,10 +134,10 @@
 				StringPooling="true"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release64/qtools.pch"
-				AssemblerListingLocation=".\Release64/"
-				ObjectFile=".\Release64/"
-				ProgramDatabaseFileName=".\Release64\$(TargetName).pdb"
+				PrecompiledHeaderFile=".\Release64\qtools/qtools.pch"
+				AssemblerListingLocation=".\Release64\qtools/"
+				ObjectFile=".\Release64\qtools/"
+				ProgramDatabaseFileName=".\Release64\qtools\$(TargetName).pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile=".\Release64/qtools.bsc"
+				OutputFile=".\Release64\qtools/qtools.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -178,8 +178,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
+			OutputDirectory=".\Debug\qtools"
+			IntermediateDirectory=".\Debug\qtools"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -211,10 +211,10 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug/qtools.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDatabaseFileName=".\Debug\$(TargetName).pdb"
+				PrecompiledHeaderFile=".\Debug\qtools/qtools.pch"
+				AssemblerListingLocation=".\Debug\qtools/"
+				ObjectFile=".\Debug\qtools/"
+				ProgramDatabaseFileName=".\Debug\qtools\$(TargetName).pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -244,7 +244,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile=".\Debug/qtools.bsc"
+				OutputFile=".\Debug\qtools/qtools.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -255,8 +255,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory=".\Debug64"
-			IntermediateDirectory=".\Debug64"
+			OutputDirectory=".\Debug64\qtools"
+			IntermediateDirectory=".\Debug64\qtools"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -289,10 +289,10 @@
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug64/qtools.pch"
-				AssemblerListingLocation=".\Debug64/"
-				ObjectFile=".\Debug64/"
-				ProgramDatabaseFileName=".\Debug64\$(TargetName).pdb"
+				PrecompiledHeaderFile=".\Debug64\qtools/qtools.pch"
+				AssemblerListingLocation=".\Debug64\qtools/"
+				ObjectFile=".\Debug64\qtools/"
+				ProgramDatabaseFileName=".\Debug64\qtools\$(TargetName).pdb"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -322,7 +322,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile=".\Debug64/qtools.bsc"
+				OutputFile=".\Debug64\qtools/qtools.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"

--- a/winbuild/runbison.bat
+++ b/winbuild/runbison.bat
-bison -l -d -p ce_parseexpYY %1\..\src\constexp.y -o %1\..\src\ce_parse.c
-del %1\..\src\ce_parse.c
-bison -l -p constexpYY %1\..\src\constexp.y -o %1\..\src\ce_parse.cpp
-
-bison -l -d -p vhdlscannerYY %1\..\src\vhdlparser.y -o %1\..\src\vhdlparser.c
-del %1\..\src\vhdlparser.c
-bison -l -p vhdlscannerYY %1\..\src\vhdlparser.y -o %1\..\src\vhdlparser.cpp
--- a/winbuild/unistd.h
+++ b/winbuild/unistd.h
-/* this is a dummy file, that is needed for compiling files that are 
- * generated with flex under Windows 95/NT. 
- */
-#if defined(_MSC_VER)
-#include <io.h>
-#endif
-
--- a/winbuild/unistd.py
+++ b/winbuild/unistd.py
+# 
+
+import sys
+import os
+
+f1 = open(os.path.join(sys.argv[1],'unistd.h'),'w')
+
+f1.write("#ifndef UNISTD_H\n")
+f1.write("#define UNISTD_H\n")
+f1.write("/* this is a dummy file, that is needed for compiling files that are\n")
+f1.write(" * generated with flex under Windows 95/NT.\n")
+f1.write(" */\n")
+f1.write("#if defined(_MSC_VER)\n")
+f1.write("  #include <io.h>\n")
+f1.write("#endif\n")
+f1.write("#endif\n")
--- a/winbuild/version.bat
+++ b/winbuild/version.bat
-@for /F "tokens=1* delims== " %%i in (..\configure) do @call :oneline "%%i" "%%j"
-@if "%mnt%"=="NO" goto :writereleaseversion
-@goto :writecvsversion
- 
-:oneline
-@if "-%~1"=="-doxygen_version_major" call :aset major %2 
-@if "-%~1"=="-doxygen_version_minor" call :aset minor %2 
-@if "-%~1"=="-doxygen_version_revision" call :aset revision %2 
-@if "-%~1"=="-doxygen_version_mmn" call :aset mnt %2 
-@goto :EOF
-
-:aset
-@set %1=%~2
-@goto :EOF
-
-:writecvsversion
-echo %major%.%minor%.%revision%-%mnt%>..\VERSION
-echo char versionString[]="%major%.%minor%.%revision%-%mnt%";>..\src\version.cpp
-@goto :EOF
-
-:writereleaseversion
-echo %major%.%minor%.%revision%>..\VERSION
-echo char versionString[]="%major%.%minor%.%revision%";>..\src\version.cpp
-@goto :EOF