Index: orxonox/branches/updater/Makefile.am
===================================================================
--- orxonox/branches/updater/Makefile.am	(revision 3469)
+++ orxonox/branches/updater/Makefile.am	(revision 3561)
@@ -16,5 +16,5 @@
 ## doxygen stuff
 if DOXYGEN
-DOXYGEN_INPUT = "src src/gui src/importer"
+DOXYGEN_INPUT = "src src/lib/gui/gui src/lib/graphics/importer"
 
 ## Exclude the application wizard templates, and some file templates
Index: orxonox/branches/updater/Makefile.in
===================================================================
--- orxonox/branches/updater/Makefile.in	(revision 3469)
+++ orxonox/branches/updater/Makefile.in	(revision 3561)
@@ -133,4 +133,6 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SUB_PROJECTS_FALSE = @SUB_PROJECTS_FALSE@
+SUB_PROJECTS_TRUE = @SUB_PROJECTS_TRUE@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
@@ -189,5 +191,5 @@
 	     doc/doxyconf/project 
 
-@DOXYGEN_TRUE@DOXYGEN_INPUT = "src src/gui src/importer"
+@DOXYGEN_TRUE@DOXYGEN_INPUT = "src src/lib/gui/gui src/lib/graphics/importer"
 @DOXYGEN_TRUE@DOXYGEN_EXCLUDE = 
 @DOXYGEN_TRUE@DOXYGEN_EXAMPLE_PATH = 
Index: orxonox/branches/updater/NEWS
===================================================================
--- orxonox/branches/updater/NEWS	(revision 3469)
+++ orxonox/branches/updater/NEWS	(revision 3561)
@@ -5,5 +5,5 @@
 Date: December 14, 2004
 Topic: Repository Moved
-Body: Today we moved the repository. The new location of the repository is <A href="http://orxonox.ethz.ch/repos/reporx">http://orxonox.ethz.ch/repos/reporx</A>.
+Body: Today we moved the repository. The new location of the repository is <A href="http://svn.orxonox.ethz.ch/reporx">http://svn.orxonox.ethz.ch/reporx</A>.
 
 Date:	November 16, 2004
Index: orxonox/branches/updater/configure
===================================================================
--- orxonox/branches/updater/configure	(revision 3469)
+++ orxonox/branches/updater/configure	(revision 3561)
@@ -312,5 +312,5 @@
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP DEBUG DOXYGEN DOXYGEN_TRUE DOXYGEN_FALSE MSBITFIELDS GTK2_LIBS GTK2_CFLAGS HAVE_GTK2_TRUE HAVE_GTK2_FALSE GTHREAD_LIBS GTHREAD_CFLAGS HAVE_GTHREAD_TRUE HAVE_GTHREAD_FALSE CURL_LIBS CURL_CFLAGS HAVE_CURL_TRUE HAVE_CURL_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP DEBUG SUB_PROJECTS_TRUE SUB_PROJECTS_FALSE DOXYGEN DOXYGEN_TRUE DOXYGEN_FALSE MSBITFIELDS GTK2_LIBS GTK2_CFLAGS HAVE_GTK2_TRUE HAVE_GTK2_FALSE GTHREAD_LIBS GTHREAD_CFLAGS HAVE_GTHREAD_TRUE HAVE_GTHREAD_FALSE CURL_LIBS CURL_CFLAGS HAVE_CURL_TRUE HAVE_CURL_FALSE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
@@ -867,4 +867,5 @@
   --enable-debug          compiles in debug mode. Lots of debug info about the
                           game.
+  --enable-sub-projects   also builds the subProjects while make from srcdir
 
 Optional Packages:
@@ -1338,5 +1339,5 @@
 
 
-# Detect the canonical host and target build environment.
+## Detect the canonical host and target build environment.
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -1446,5 +1447,4 @@
     NONENONEs,x,x, &&
   program_prefix=${target_alias}-
-
 
 am__api_version="1.8"
@@ -1853,6 +1853,7 @@
 
 
-
-# Checks for programs.
+#########################
+## Checks for programs ##
+#########################
 ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -3841,6 +3842,11 @@
 
 
-### CHECKING  OPTIONAT ARGUMENTS
-## DEBUG-statement
+##################################
+## CHECKING  OPTIONAL ARGUMENTS ##
+##################################
+
+#-----------------#
+# DEBUG-statement #
+#-----------------#
 DEBUG=no
 echo "$as_me:$LINENO: checking if DEBUG-mode should be enabled" >&5
@@ -3852,14 +3858,14 @@
 fi;
 
-if test "$DEBUG" = "no"; then
+if test x$DEBUG = xno; then
 	echo "no"
-	echo " -> Setting debuglevel to 1. Like this you can still see errors."
-	DEBUG=1
-elif test "$DEBUG" = yes; then
+	echo " -> Setting debuglevel to 3. (orxonox is still in Development. It really is needed."
+	DEBUG=3
+elif test x$DEBUG = xyes; then
 	echo "yes"
-	echo " -> Setting debuglevel to 3. HARD DEBUG MODE!!."
-	DEBUG=3
-else
-	echo "yes set to $DEBUG"
+	echo " -> Setting debuglevel to 4. HARD DEBUG MODE!!."
+	DEBUG=4
+else
+	echo "yes: setting debuglevel to to $DEBUG"
 fi
 
@@ -3871,5 +3877,7 @@
 
 
-## GTK-disabled
+#--------------#
+# GTK-disabled #
+#--------------#
 echo "$as_me:$LINENO: checking if gtk should be enabled" >&5
 echo $ECHO_N "checking if gtk should be enabled... $ECHO_C" >&6
@@ -3882,12 +3890,14 @@
   def_gtk=yes
 fi;
-if test "$def_gtk" = yes; then
+if test x$def_gtk = xyes; then
   echo "yes"
 fi
-if test "$def_gtk" = no; then
+if test x$def_gtk = xno; then
   echo "no"
 fi
 
-## gThread-disabled
+#------------------#
+# gThread-disabled #
+#------------------#
 echo "$as_me:$LINENO: checking if gThread should be enabled" >&5
 echo $ECHO_N "checking if gThread should be enabled... $ECHO_C" >&6
@@ -3900,12 +3910,14 @@
   def_gthread=yes
 fi;
-if test "$def_gthread" = yes; then
+if test x$def_gthread = xyes; then
   echo "yes"
 fi
-if test "$def_gthread" = no; then
+if test x$def_gthread = xno; then
   echo "no"
 fi
 
-## pthread-disabled
+#------------------#
+# pthread-disabled #
+#------------------#
 echo "$as_me:$LINENO: checking if pthread should be enabled" >&5
 echo $ECHO_N "checking if pthread should be enabled... $ECHO_C" >&6
@@ -3918,12 +3930,14 @@
   def_pthread=yes
 fi;
-if test "$def_pthread" = yes; then
+if test x$def_pthread = xyes; then
   echo "yes"
 fi
-if test "$def_pthread" = no; then
+if test x$def_pthread = xno; then
   echo "no"
 fi
 
-## libCurl disabled?
+#------------------#
+# libCurl-disabled #
+#------------------#
 echo "$as_me:$LINENO: checking if libcURL should be enabled" >&5
 echo $ECHO_N "checking if libcURL should be enabled... $ECHO_C" >&6
@@ -3936,12 +3950,14 @@
   def_curl=yes
 fi;
-if test "$def_curl" = yes; then
+if test x$def_curl = xyes; then
   echo "yes"
 fi
-if test "$def_curl" = no; then
+if test x$def_curl = xno; then
   echo "no"
 fi
 
-### SDL_image-disable
+#-------------------#
+# SDL_image-disable #
+#-------------------#
 def_sdl_image=yes
 echo "$as_me:$LINENO: checking if SDL_image should be enabled" >&5
@@ -3953,14 +3969,46 @@
   def_sdl_image=no
 fi;
-if test "$def_sdl_image" = yes; then
+if test x$def_sdl_image = xyes; then
   echo "yes"
 fi
-if test "$def_sdl_image" = no; then
+if test x$def_sdl_image = xno; then
   echo "no"
 fi
-
-
-## PROGRAMM CHECKING
-# checking for Doxygen
+#-------------------#
+# SubProject-enable #
+#-------------------#
+def_sub_projects=no
+echo "$as_me:$LINENO: checking if the SubProjects should be built" >&5
+echo $ECHO_N "checking if the SubProjects should be built... $ECHO_C" >&6
+# Check whether --enable-sub-projects or --disable-sub-projects was given.
+if test "${enable_sub_projects+set}" = set; then
+  enableval="$enable_sub_projects"
+  def_sub_projects=yes
+fi;
+if test x$def_sub_projects = xyes; then
+  echo "yes"
+fi
+if test x$def_sub_projects = xno; then
+  echo "no"
+fi
+
+
+if test x$def_sub_projects = xyes; then
+  SUB_PROJECTS_TRUE=
+  SUB_PROJECTS_FALSE='#'
+else
+  SUB_PROJECTS_TRUE='#'
+  SUB_PROJECTS_FALSE=
+fi
+
+
+#######################
+## PROGRAMM CHECKING ##
+## 3. party Programs ##
+#######################
+
+#----------------------#
+# checking for Doxygen #
+#----------------------#
 # Extract the first word of "doxygen", so it can be a program name with args.
 set dummy doxygen; ac_word=$2
@@ -4013,5 +4061,9 @@
 
 
-### CHECKING FOR SYSTEM ###
+#########################
+## CHECKING FOR SYSTEM ##
+#########################
+## here the system is checked, and openGL is included
+## also checking for SDL on differen Systems
 
 echo "$as_me:$LINENO: checking for System" >&5
@@ -4019,5 +4071,7 @@
 ## checking for openGL-environment and other sys-specific parameters
 case "$target" in
-### WINDOWS ###
+#---------#
+# WINDOWS #
+#---------#
   *-*-mingw32*)
 echo "mingw-WINDOWS detected"
@@ -4322,5 +4376,5 @@
 fi
 
-    if test "$FOUND_opengl32" = "yes" ; then
+    if test x$FOUND_opengl32 = xyes ; then
 	LIBS="$LIBS -lopengl32"
     else
@@ -4551,5 +4605,5 @@
 fi
 
-    if test "$FOUND_glu32" = "yes" ; then
+    if test x$FOUND_glu32 = xyes ; then
 	LIBS="$LIBS -lGLU32"
     else
@@ -4624,5 +4678,5 @@
 fi
 
-    if test $FOUND_mingw32 = "yes"; then
+    if test x$FOUND_mingw32 = xyes; then
 	LIBS="$LIBS -lmingw32"
     fi
@@ -4846,5 +4900,5 @@
 fi
 
-    if test "$FOUND_sdlmain" = "yes" ; then
+    if test x$FOUND_sdlmain = xyes ; then
        LIBS="$LIBS -lsdlmain"
     else
@@ -4917,5 +4971,5 @@
 fi
 
-    if test "$FOUND_sdl" = "yes" ; then
+    if test x$FOUND_sdl = xyes ; then
        LIBS="$LIBS -lsdl"
     else
@@ -4928,6 +4982,7 @@
 
     ;;
-
-### LINUX ###
+#-------#
+# LINUX #
+#-------#
  *-*-linux*)
 echo "Linux detected"
@@ -4936,5 +4991,5 @@
 
 CPPFLAGS="-I/usr/X11R6/include"
-LDFLAGS="-L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib $LDFLAGS"
+LDFLAGS="-L/usr/lib/opengl/xorg-x11/lib -L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib $LDFLAGS"
 # checking gl header
 
@@ -5094,7 +5149,7 @@
 
 #  checking for Unix GL
-   echo "$as_me:$LINENO: checking for main in -lGL" >&5
-echo $ECHO_N "checking for main in -lGL... $ECHO_C" >&6
-if test "${ac_cv_lib_GL_main+set}" = set; then
+   echo "$as_me:$LINENO: checking for glLoadIdentity in -lGL" >&5
+echo $ECHO_N "checking for glLoadIdentity in -lGL... $ECHO_C" >&6
+if test "${ac_cv_lib_GL_glLoadIdentity+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -5108,9 +5163,15 @@
 /* end confdefs.h.  */
 
-
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char glLoadIdentity ();
 int
 main ()
 {
-main ();
+glLoadIdentity ();
   ;
   return 0;
@@ -5139,10 +5200,10 @@
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_GL_main=yes
+  ac_cv_lib_GL_glLoadIdentity=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_GL_main=no
+ac_cv_lib_GL_glLoadIdentity=no
 fi
 rm -f conftest.err conftest.$ac_objext \
@@ -5150,11 +5211,11 @@
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_GL_main" >&5
-echo "${ECHO_T}$ac_cv_lib_GL_main" >&6
-if test $ac_cv_lib_GL_main = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glLoadIdentity" >&5
+echo "${ECHO_T}$ac_cv_lib_GL_glLoadIdentity" >&6
+if test $ac_cv_lib_GL_glLoadIdentity = yes; then
   FOUND_GL=yes
 fi
 
-   if test "$FOUND_GL" = "yes" ; then
+   if test x$FOUND_GL = xyes ; then
      LIBS="$LIBS -lGL"
    else
@@ -5390,5 +5451,5 @@
 fi
 
-    if test "$FOUND_GLU" = "yes" ; then
+    if test x$FOUND_GLU = xyes ; then
       LIBS="$LIBS -lGLU"
     else
@@ -5619,5 +5680,5 @@
 fi
 
-     if test "$FOUND_SDL" = "yes" ; then
+     if test x$FOUND_SDL = xyes ; then
        LIBS="$LIBS -lSDL"
      else
@@ -5639,8 +5700,9 @@
 #    LIBS="$LIBS $SDL_LIBS"
     ;;
-
-### OS X ###
+#-----------#
+# MAC -OS X #
+#-----------#
  *darwin*)
-echo "OS X detected"
+ echo "OS X detected"
 
  osX="yes"
@@ -5960,4 +6022,10 @@
    LIBS="$LIBS -framework OpenGL"
 
+       SDL_CFLAGS=`sdl-config --cflags`
+       SDL_LIBS=`sdl-config --libs`
+       CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+       LIBS="$LIBS $SDL_LIBS"
+
+
 # checking for SDL-headers
 #    AC_CHECK_HEADERS(SDL/SDL.h ,,
@@ -5971,8 +6039,4 @@
 #      )
 
-       SDL_CFLAGS=`sdl-config --cflags`
-       SDL_LIBS=`sdl-config --libs`
-       CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
-       LIBS="$LIBS $SDL_LIBS"
 
     ;;
@@ -5984,6 +6048,12 @@
 
 
-## check for SDL_Image
-if test "$def_sdl_image" = "yes"; then
+###################################
+## CHECKING FOR HEADERS AND LIBS ##
+###################################
+
+#-----------#
+# SDL_Image #
+#-----------#
+if test x$def_sdl_image = xyes; then
 # checking for SDL_image-headers
 
@@ -6140,5 +6210,5 @@
 
 fi
-if test "$def_sdl_image" = "yes"; then
+if test x$def_sdl_image = xyes; then
 # checking for SDL_image-lib
   echo "$as_me:$LINENO: checking for main in -lSDL_image" >&5
@@ -6204,5 +6274,5 @@
 fi
 
-     if test "$FOUND_SDL_image" = "yes" ; then
+     if test x$FOUND_SDL_image = xyes ; then
        LIBS="$LIBS -lSDL_image"
      else
@@ -6215,7 +6285,9 @@
 fi
 
-
-if test "$def_sdl_image" = "no"; then
- ## checking for libjpeg
+## case no SDL-image:
+if test x$def_sdl_image = xno; then
+#---------#
+# libjpeg #
+#---------#
 
 for ac_header in jpeglib.h
@@ -6370,5 +6442,5 @@
 done
 
- if test $jpegHeader = "no"; then
+ if test x$jpegHeader = xno; then
 	echo " not including jpeg."
  else
@@ -6435,5 +6507,5 @@
 fi
 
-    if test "$FOUND_jpeg" = "yes" ; then
+    if test x$FOUND_jpeg = xyes ; then
       LIBS="$LIBS -ljpeg"
     else
@@ -6446,5 +6518,7 @@
  fi
 
- ## checking for libpng
+#--------#
+# libpng #
+#--------#
 
 for ac_header in png.h
@@ -6599,5 +6673,5 @@
 done
 
- if test $pngHeader = "no"; then
+ if test x$pngHeader = xno; then
 	echo " not including png."
  else
@@ -6664,5 +6738,5 @@
 fi
 
-    if test "$FOUND_png" = "yes" ; then
+    if test x$FOUND_png = xyes ; then
       LIBS="$LIBS -lpng"
     else
@@ -6676,6 +6750,8 @@
 fi
 
-## checking for GTK
-if test "$def_gtk" = yes; then
+#-----#
+# GTK #
+#-----#
+if test x$def_gtk = xyes; then
 
 	#PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3, have_gtk2=yes, have_gtk2=no)
@@ -6710,6 +6786,8 @@
 
 
-## checking for gThread
-if test "$def_gthread" = yes; then
+#---------#
+# gThread #
+#---------#
+if test x$def_gthread = xyes; then
 
 	echo "$as_me:$LINENO: checking for gthread" >&5
@@ -6743,6 +6821,8 @@
 
 
-## checking for libcURL
-if test "$def_curl" = yes; then
+#---------#
+# libcURL #
+#---------#
+if test x$def_curl = xyes; then
 
 
@@ -6987,6 +7067,7 @@
 
 
-
-##checking for pthread
+#---------#
+# pthread #
+#---------#
 if test x$def_pthread = xyes ; then
  if test x$have_gthread = xyes ; then
@@ -7205,9 +7286,11 @@
 fi
 
-   if test "$FOUND_pthread" = "yes" ; then
+   if test x$FOUND_pthread = xyes ; then
       LIBS="$LIBS -lpthread"
    fi
  fi
 fi
+
+
 # FIXME: Replace `main' with a function in `-lm':
 
@@ -8096,5 +8179,9 @@
 
 
-                                                  ac_config_files="$ac_config_files Makefile src/console/Makefile src/gui/Makefile src/Makefile src/importer/Makefile"
+######################
+## OUTPUT CONFIGURE ##
+######################
+                                                                                ac_config_files="$ac_config_files Makefile src/Makefile src/lib/Makefile src/lib/graphics/Makefile src/lib/graphics/importer/Makefile src/lib/gui/Makefile src/lib/gui/console/Makefile src/lib/gui/gui/Makefile"
+
 
 cat >confcache <<\_ACEOF
@@ -8207,4 +8294,11 @@
 Usually this means the macro was only invoked conditionally." >&5
 echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${SUB_PROJECTS_TRUE}" && test -z "${SUB_PROJECTS_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"SUB_PROJECTS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"SUB_PROJECTS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
@@ -8683,8 +8777,11 @@
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "src/console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/console/Makefile" ;;
-  "src/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/gui/Makefile" ;;
   "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-  "src/importer/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/importer/Makefile" ;;
+  "src/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;;
+  "src/lib/graphics/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/graphics/Makefile" ;;
+  "src/lib/graphics/importer/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/graphics/importer/Makefile" ;;
+  "src/lib/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gui/Makefile" ;;
+  "src/lib/gui/console/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gui/console/Makefile" ;;
+  "src/lib/gui/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gui/gui/Makefile" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
@@ -8831,4 +8928,6 @@
 s,@EGREP@,$EGREP,;t t
 s,@DEBUG@,$DEBUG,;t t
+s,@SUB_PROJECTS_TRUE@,$SUB_PROJECTS_TRUE,;t t
+s,@SUB_PROJECTS_FALSE@,$SUB_PROJECTS_FALSE,;t t
 s,@DOXYGEN@,$DOXYGEN,;t t
 s,@DOXYGEN_TRUE@,$DOXYGEN_TRUE,;t t
Index: orxonox/branches/updater/configure.ac
===================================================================
--- orxonox/branches/updater/configure.ac	(revision 3469)
+++ orxonox/branches/updater/configure.ac	(revision 3561)
@@ -1,14 +1,33 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
+########################################################################## 
+#   orxonox - the future of 3D-vertical-scrollers			 #
+#									 #
+#   Copyright (C) 2004 orx						 #
+#									 #
+#   This program is free software; you can redistribute it and/or modify #
+#   it under the terms of the GNU General Public License as published by #
+#   the Free Software Foundation; either version 2, or (at your option)  #
+#   any later version.							 #
+#									 #
+#   ### File Specific:							 #
+#   main-programmer: Benjamin Grauer					 #
+#   co-programmer: ...							 #
+#									 #
+#   This is the main configuration File of autoconf.			 #
+#   Please edit this file only, if you exactly know what you are doing.  #
+#   It is quite fragile, and compiling orxonox on different Platforms    #
+#   is only guarantied, if build with the right config.                  #
+##########################################################################
+
+#########################
+## AUTOCONF INIT PHASE ##
+#########################
 AC_PREREQ(2.56)
 AC_INIT(orxonox, 0.2.1-pre-alpha, [orxonox-dev at mail.datacore.ch])
 
-# Detect the canonical host and target build environment.
+## Detect the canonical host and target build environment.
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
-
 AM_INIT_AUTOMAKE
 
@@ -16,11 +35,17 @@
 AC_CONFIG_HEADER([config.h])
 
-
-# Checks for programs.
+#########################
+## Checks for programs ##
+#########################
 AC_PROG_CXX
 AC_HEADER_STDC
 
-### CHECKING  OPTIONAT ARGUMENTS
-## DEBUG-statement
+##################################
+## CHECKING  OPTIONAL ARGUMENTS ##
+##################################
+
+#-----------------#
+# DEBUG-statement #
+#-----------------#
 DEBUG=no
 AC_MSG_CHECKING([if DEBUG-mode should be enabled])
@@ -29,14 +54,14 @@
 	 DEBUG=$enableval)
 
-if test "$DEBUG" = "no"; then 
+if test x$DEBUG = xno; then 
 	echo "no"
-	echo " -> Setting debuglevel to 1. Like this you can still see errors."
-	DEBUG=1
-elif test "$DEBUG" = yes; then
+	echo " -> Setting debuglevel to 3. (orxonox is still in Development. It really is needed."
+	DEBUG=3
+elif test x$DEBUG = xyes; then
 	echo "yes"
-	echo " -> Setting debuglevel to 3. HARD DEBUG MODE!!."
-	DEBUG=3
+	echo " -> Setting debuglevel to 4. HARD DEBUG MODE!!."
+	DEBUG=4
 else       
-	echo "yes set to $DEBUG"
+	echo "yes: setting debuglevel to to $DEBUG"
 fi
 	AC_DEFINE_UNQUOTED(DEBUG, $DEBUG, [in which debug mode we are])
@@ -44,53 +69,63 @@
 AC_SUBST(DEBUG)
 
-## GTK-disabled
+#--------------#
+# GTK-disabled #
+#--------------#
 AC_MSG_CHECKING([if gtk should be enabled])
 AC_ARG_WITH([gtk], 
 	AC_HELP_STRING(	[--without-gtk], 
 	[Prevents GTK from being loaded]), [def_gtk=no], [def_gtk=yes]) 
-if test "$def_gtk" = yes; then 
+if test x$def_gtk = xyes; then 
   echo "yes"
 fi 
-if test "$def_gtk" = no; then 
+if test x$def_gtk = xno; then 
   echo "no"
 fi
 
-## gThread-disabled
+#------------------#
+# gThread-disabled #
+#------------------#
 AC_MSG_CHECKING([if gThread should be enabled])
 AC_ARG_WITH([gthread], 
-	AC_HELP_STRING(	[--without-gthread], 
+	AC_HELP_STRING(	[--without-gthread],
 	[Prevents gThread from being loaded]), [def_gthread=no], [def_gthread=yes]) 
-if test "$def_gthread" = yes; then 
+if test x$def_gthread = xyes; then 
   echo "yes"
 fi 
-if test "$def_gthread" = no; then 
+if test x$def_gthread = xno; then 
   echo "no"
 fi
 
-## pthread-disabled
+#------------------#
+# pthread-disabled #
+#------------------#
 AC_MSG_CHECKING([if pthread should be enabled])
 AC_ARG_WITH([pthread], 
 	AC_HELP_STRING(	[--without-pthread], 
 	[Prevents pthread from being loaded]), [def_pthread=no], [def_pthread=yes]) 
-if test "$def_pthread" = yes; then 
+if test x$def_pthread = xyes; then 
   echo "yes"
 fi 
-if test "$def_pthread" = no; then 
+if test x$def_pthread = xno; then 
   echo "no"
 fi
 
-## libCurl disabled?
+#------------------#
+# libCurl-disabled #
+#------------------#
 AC_MSG_CHECKING([if libcURL should be enabled])
 AC_ARG_WITH([curl], 
 	AC_HELP_STRING(	[--without-curl], 
 	[Prevents libcURL from being loaded]), [def_curl=no], [def_curl=yes]) 
-if test "$def_curl" = yes; then 
+if test x$def_curl = xyes; then 
   echo "yes"
 fi 
-if test "$def_curl" = no; then 
+if test x$def_curl = xno; then 
   echo "no"
 fi
 
-### SDL_image-disable
+#-------------------#
+# SDL_image-disable #
+#-------------------#
 def_sdl_image=yes
 AC_MSG_CHECKING([if SDL_image should be enabled])
@@ -98,23 +133,49 @@
 	AC_HELP_STRING(	[--without-sdl-image], 
 	[Prevents SDL_image from being loaded]), [def_sdl_image=no]) 
-if test "$def_sdl_image" = yes; then 
+if test x$def_sdl_image = xyes; then 
   echo "yes"
 fi 
-if test "$def_sdl_image" = no; then 
+if test x$def_sdl_image = xno; then 
   echo "no"
 fi
-
-
-## PROGRAMM CHECKING
-# checking for Doxygen
+#-------------------#
+# SubProject-enable #
+#-------------------#
+def_sub_projects=no
+AC_MSG_CHECKING([if the SubProjects should be built])
+AC_ARG_ENABLE([sub-projects], 
+	AC_HELP_STRING(	[--enable-sub-projects], 
+	[also builds the subProjects while make from srcdir]), [def_sub_projects=yes]) 
+if test x$def_sub_projects = xyes; then
+  echo "yes"
+fi 
+if test x$def_sub_projects = xno; then
+  echo "no"
+fi
+AM_CONDITIONAL(SUB_PROJECTS, test x$def_sub_projects = xyes)
+
+#######################
+## PROGRAMM CHECKING ##
+## 3. party Programs ##
+#######################
+
+#----------------------#
+# checking for Doxygen #
+#----------------------#
 AC_PATH_PROG(DOXYGEN, doxygen)
 AM_CONDITIONAL(DOXYGEN, test $DOXYGEN)
 
-### CHECKING FOR SYSTEM ###
+#########################
+## CHECKING FOR SYSTEM ##
+#########################
+## here the system is checked, and openGL is included
+## also checking for SDL on differen Systems
 
 AC_MSG_CHECKING([for System])
 ## checking for openGL-environment and other sys-specific parameters
 case "$target" in
-### WINDOWS ###
+#---------#
+# WINDOWS #
+#---------#
   *-*-mingw32*)
 echo "mingw-WINDOWS detected"
@@ -132,5 +193,5 @@
 #   checking for Windows openGl library
     AC_CHECK_LIB([opengl32], [main], FOUND_opengl32=yes, "gl/gl.h")
-    if test "$FOUND_opengl32" = "yes" ; then
+    if test x$FOUND_opengl32 = xyes ; then
 	LIBS="$LIBS -lopengl32"
     else
@@ -143,10 +204,10 @@
 
 # cheking for GLU-header
-    AC_CHECK_HEADERS(GL/glu.h ,,
+    AC_CHECK_HEADERS([GL/glu.h] ,,
       [AC_MSG_ERROR([cannot find opengl headers]) ])
 
 # checking for libGLU
     AC_CHECK_LIB([glu32], [main], FOUND_glu32=yes)
-    if test "$FOUND_glu32" = "yes" ; then
+    if test x$FOUND_glu32 = xyes ; then
 	LIBS="$LIBS -lGLU32"
     else
@@ -160,14 +221,14 @@
 # checking for mingw32
     AC_CHECK_LIB([mingw32], [main], FOUND_mingw32=yes)
-    if test $FOUND_mingw32 = "yes"; then 
+    if test x$FOUND_mingw32 = xyes; then 
 	LIBS="$LIBS -lmingw32"
     fi
 # checking for SDL-headers
-    AC_CHECK_HEADERS(SDL/SDL.h ,,
+    AC_CHECK_HEADERS([SDL/SDL.h] ,,
       [AC_MSG_ERROR([cannot find SDL headers]) ])
 
 #checking for libSDL
     AC_CHECK_LIB([sdlmain], [main], FOUND_sdlmain=yes)
-    if test "$FOUND_sdlmain" = "yes" ; then
+    if test x$FOUND_sdlmain = xyes ; then
        LIBS="$LIBS -lsdlmain"
     else
@@ -179,5 +240,5 @@
     fi
     AC_CHECK_LIB([sdl], [main], FOUND_sdl=yes)
-    if test "$FOUND_sdl" = "yes" ; then
+    if test x$FOUND_sdl = xyes ; then
        LIBS="$LIBS -lsdl"
     else
@@ -190,6 +251,7 @@
 
     ;;
-
-### LINUX ###
+#-------#
+# LINUX #
+#-------#
  *-*-linux*)
 echo "Linux detected"
@@ -198,12 +260,12 @@
 
 CPPFLAGS="-I/usr/X11R6/include"
-LDFLAGS="-L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib $LDFLAGS"
+LDFLAGS="-L/usr/lib/opengl/xorg-x11/lib -L/usr/Mesa-6.0.1/lib -L/usr/X11R6/lib $LDFLAGS"
 # checking gl header
-   AC_CHECK_HEADERS(GL/gl.h ,,
+   AC_CHECK_HEADERS([GL/gl.h] ,,
       [AC_MSG_ERROR([cannot find opengl headers]) ])
 
 #  checking for Unix GL
-   AC_CHECK_LIB([GL], [main], FOUND_GL=yes)
-   if test "$FOUND_GL" = "yes" ; then
+   AC_CHECK_LIB([GL], [glLoadIdentity], FOUND_GL=yes)
+   if test x$FOUND_GL = xyes ; then
      LIBS="$LIBS -lGL"
    else
@@ -216,9 +278,9 @@
 
 # cheking for GLU-header
-    AC_CHECK_HEADERS(GL/glu.h ,,
+    AC_CHECK_HEADERS([GL/glu.h] ,,
       [AC_MSG_ERROR([cannot find opengl headers]) ])
 
     AC_CHECK_LIB([GLU], [gluProject], FOUND_GLU=yes)
-    if test "$FOUND_GLU" = "yes" ; then
+    if test x$FOUND_GLU = xyes ; then
       LIBS="$LIBS -lGLU"
     else
@@ -231,10 +293,10 @@
 
 # checking for SDL-headers
-    AC_CHECK_HEADERS(SDL/SDL.h ,,
+    AC_CHECK_HEADERS([SDL/SDL.h] ,,
       [AC_MSG_ERROR([cannot find SDL headers]) ])
 
 # checking for SDL-lib
     AC_CHECK_LIB([SDL], [main], FOUND_SDL=yes)
-     if test "$FOUND_SDL" = "yes" ; then
+     if test x$FOUND_SDL = xyes ; then
        LIBS="$LIBS -lSDL"
      else
@@ -256,8 +318,9 @@
 #    LIBS="$LIBS $SDL_LIBS"
     ;;
-
-### OS X ###
+#-----------#
+# MAC -OS X #
+#-----------#
  *darwin*)
-echo "OS X detected"
+ echo "OS X detected"
 
  osX="yes"
@@ -265,11 +328,17 @@
  CPPFLAGS="-I/sw/include $CPPFLAGS"
 # checking gl header
-   AC_CHECK_HEADERS(OpenGL/gl.h ,,
+   AC_CHECK_HEADERS([OpenGL/gl.h] ,,
       [AC_MSG_ERROR([cannot find opengl headers]) ])
 # cheking for GLU-header
-    AC_CHECK_HEADERS(OpenGL/glu.h ,,
+    AC_CHECK_HEADERS([OpenGL/glu.h] ,,
       [AC_MSG_ERROR([cannot find opengl headers]) ])
 
    LIBS="$LIBS -framework OpenGL"
+
+       SDL_CFLAGS=`sdl-config --cflags`
+       SDL_LIBS=`sdl-config --libs`
+       CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+       LIBS="$LIBS $SDL_LIBS"
+
 
 # checking for SDL-headers
@@ -284,8 +353,4 @@
 #      )
 
-       SDL_CFLAGS=`sdl-config --cflags`
-       SDL_LIBS=`sdl-config --libs`
-       CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
-       LIBS="$LIBS $SDL_LIBS"
 
     ;;
@@ -297,14 +362,20 @@
 AC_SUBST(MSBITFIELDS)
 
-## check for SDL_Image
-if test "$def_sdl_image" = "yes"; then
+###################################
+## CHECKING FOR HEADERS AND LIBS ##
+###################################
+
+#-----------#
+# SDL_Image #
+#-----------#
+if test x$def_sdl_image = xyes; then
 # checking for SDL_image-headers
-  AC_CHECK_HEADERS(SDL/SDL_image.h ,,
+  AC_CHECK_HEADERS([SDL/SDL_image.h] ,,
       [echo "sdl_image not found. falling back to other options"; def_sdl_image=no ])
 fi
-if test "$def_sdl_image" = "yes"; then
+if test x$def_sdl_image = xyes; then
 # checking for SDL_image-lib
-  AC_CHECK_LIB([SDL_image], [main], FOUND_SDL_image=yes)
-     if test "$FOUND_SDL_image" = "yes" ; then
+  AC_CHECK_LIB([SDL_image], [main], [FOUND_SDL_image=yes])
+     if test x$FOUND_SDL_image = xyes ; then
        LIBS="$LIBS -lSDL_image"
      else
@@ -317,14 +388,16 @@
 fi
 
-
-if test "$def_sdl_image" = "no"; then
- ## checking for libjpeg
- AC_CHECK_HEADERS(jpeglib.h ,jpegHeader="yes",
-        jpegHeader="no")
- if test $jpegHeader = "no"; then
+## case no SDL-image:
+if test x$def_sdl_image = xno; then
+#---------#
+# libjpeg #
+#---------#
+ AC_CHECK_HEADERS([jpeglib.h], [jpegHeader="yes"],
+        [jpegHeader="no"])
+ if test x$jpegHeader = xno; then
 	echo " not including jpeg."
  else
-  AC_CHECK_LIB([jpeg], [main], FOUND_jpeg=yes)
-    if test "$FOUND_jpeg" = "yes" ; then
+  AC_CHECK_LIB([jpeg], [main], [FOUND_jpeg=yes])
+    if test x$FOUND_jpeg = xyes ; then
       LIBS="$LIBS -ljpeg"
     else
@@ -337,12 +410,14 @@
  fi
 
- ## checking for libpng
- AC_CHECK_HEADERS(png.h ,pngHeader="yes",
-        pngHeader="no")
- if test $pngHeader = "no"; then
+#--------#
+# libpng #
+#--------#
+ AC_CHECK_HEADERS([png.h], [pngHeader="yes"],
+        [pngHeader="no"])
+ if test x$pngHeader = xno; then
 	echo " not including png."
  else
   AC_CHECK_LIB([png], [main], FOUND_png=yes)
-    if test "$FOUND_png" = "yes" ; then
+    if test x$FOUND_png = xyes ; then
       LIBS="$LIBS -lpng"
     else
@@ -356,6 +431,8 @@
 fi
 
-## checking for GTK
-if test "$def_gtk" = yes; then 
+#-----#
+# GTK #
+#-----#
+if test x$def_gtk = xyes; then 
 
 	#PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.3 gthread-2.0 >= 2.0.3, have_gtk2=yes, have_gtk2=no)
@@ -376,6 +453,8 @@
 AM_CONDITIONAL(HAVE_GTK2, test x$have_gtk2 = xyes)
 
-## checking for gThread
-if test "$def_gthread" = yes; then 
+#---------#
+# gThread #
+#---------#
+if test x$def_gthread = xyes; then 
 
 	AC_MSG_CHECKING([for gthread])
@@ -395,8 +474,10 @@
 AM_CONDITIONAL(HAVE_GTHREAD, test x$have_gthread = xyes)
 
-## checking for libcURL
-if test "$def_curl" = yes; then 
-
- AC_CHECK_HEADERS([curl/curl.h], curlHeader="yes", curlHeader="no")
+#---------#
+# libcURL #
+#---------#
+if test x$def_curl = xyes; then 
+
+ AC_CHECK_HEADERS([curl/curl.h], [curlHeader="yes"], [curlHeader="no"])
  AC_CHECK_LIB([curl], [main], [FOUND_curl=yes])
  if test x$curlHeader = xyes & test x$FOUND_curl = xyes ; then
@@ -405,5 +486,5 @@
   CURLCFLAGS=`curl-config --cflags`
   AC_DEFINE_UNQUOTED(HAVE_CURL, 1, [if we have CURL])
- else 
+ else
   have_curl=no
  fi
@@ -414,15 +495,18 @@
 AM_CONDITIONAL(HAVE_CURL, test x$have_curl = xyes)
 
-
-##checking for pthread
+#---------#
+# pthread #
+#---------#
 if test x$def_pthread = xyes ; then
  if test x$have_gthread = xyes ; then
-  AC_CHECK_HEADERS([pthread.h], pthreadHeader="yes", pthreadHeader="no")
-  AC_CHECK_LIB([pthread], [main], FOUND_pthread=yes)
-   if test "$FOUND_pthread" = "yes" ; then
+  AC_CHECK_HEADERS([pthread.h], [pthreadHeader="yes"], [pthreadHeader="no"])
+  AC_CHECK_LIB([pthread], [main], [FOUND_pthread=yes])
+   if test x$FOUND_pthread = xyes ; then
       LIBS="$LIBS -lpthread"
    fi
  fi
 fi
+
+
 # FIXME: Replace `main' with a function in `-lm':
  AC_CHECK_LIB([m], [main])
@@ -440,8 +524,15 @@
 AC_CHECK_FUNCS([bzero sqrt])
 
+######################
+## OUTPUT CONFIGURE ##
+######################
 AC_CONFIG_FILES([Makefile
-		 src/console/Makefile
-                 src/gui/Makefile
                  src/Makefile
-		 src/importer/Makefile])
+		 src/lib/Makefile
+		 src/lib/graphics/Makefile
+		 src/lib/graphics/importer/Makefile
+		 src/lib/gui/Makefile
+		 src/lib/gui/console/Makefile
+                 src/lib/gui/gui/Makefile])
+
 AC_OUTPUT
Index: orxonox/branches/updater/doc/orxodox.checkFiles.pl
===================================================================
--- orxonox/branches/updater/doc/orxodox.checkFiles.pl	(revision 3561)
+++ orxonox/branches/updater/doc/orxodox.checkFiles.pl	(revision 3561)
@@ -0,0 +1,294 @@
+#!/usr/bin/perl
+########################################################################## 
+#   orxonox - the future of 3D-vertical-scrollers			 #
+#									 #
+#   Copyright (C) 2004 orx						 #
+#									 #
+#   This program is free software; you can redistribute it and/or modify #
+#   it under the terms of the GNU General Public License as published by #
+#   the Free Software Foundation; either version 2, or (at your option)  #
+#   any later version.							 #
+#									 #
+#   ### File Specific:							 #
+#   main-programmer: Benjamin Grauer					 #
+#   co-programmer: ...							 #
+#									 #
+#   This Script is for parsing single or multiple files for their        #
+#   doxygeb-tags, and outputs the warnings and errors, but prehibits     #
+#   the progress from being displayed.                                   #
+#   Usage: ./orxodox.checkFiles.pl [fileName1 [fileName2 [...]]]         #
+#   This script ignores file-extensions, and assumes that either         #
+#   .h, .cc or both may exist, and searches for them.                    #
+##########################################################################
+
+$inputFiles = @ARGV[0];
+$tempDoxFile = "TMPorxodox";
+
+unless (open (DOXfile, ">$tempDoxFile"))
+ {
+   die("cannot open file\n");
+ }
+
+$processFiles = "";
+$numberOfFiles = 0;
+foreach $inputFile (@ARGV)
+  {
+    $tmpNumber = $numberOfFiles;
+
+    $inputFile =~ s/\.cc$//;
+    $inputFile =~ s/\.h$//;
+
+    print "checking file $inputFile: ";
+
+    $inputFile =~ s/$/\.h/;
+    if (-e $inputFile)
+      {
+	$processFiles = "$processFiles $inputFile";
+	$numberOfFiles++;
+	print "found .h ";
+      }
+    $inputFile =~ s/\.h$/\.cc/;
+    if (-e $inputFile)
+      {
+	$processFiles = "$processFiles $inputFile";
+	$numberOfFiles++;
+	print "...found .cc ";
+      }
+    if ($tmpNumber == $numberOfFiles) {print "no matching files found";}
+    print "\n";
+  }
+
+if ($numberOfFiles == 0 && @ARGV !=0){
+  die("no Files have been found\n");}
+
+print "==================================================================\n";
+print "Generating temporary Documentation File\n";
+print "==================================================================\n";
+
+print DOXfile "# THIS IS A DEFAULT FILE FOR DOXYGEN DOCUMENTATION";
+
+printf DOXfile "# Doxyfile 1.3.7 \
+## SAMPLE FILE (to be executed from orxonox/trunk/) \
+ \
+#--------------------------------------------------------------------------- \
+# Project related configuration options \
+#--------------------------------------------------------------------------- \
+PROJECT_NAME           = Orxonox \
+PROJECT_NUMBER         = 1 \
+OUTPUT_DIRECTORY       = doxygen/ \
+CREATE_SUBDIRS         = YES \
+OUTPUT_LANGUAGE        = English \
+USE_WINDOWS_ENCODING   = YES \
+BRIEF_MEMBER_DESC      = YES \
+REPEAT_BRIEF           = YES \
+ABBREVIATE_BRIEF       =  \
+ALWAYS_DETAILED_SEC    = NO \
+INLINE_INHERITED_MEMB  = NO \
+FULL_PATH_NAMES        = NO \
+STRIP_FROM_PATH        =  \
+STRIP_FROM_INC_PATH    =  \
+SHORT_NAMES            = NO \
+JAVADOC_AUTOBRIEF      = NO \
+MULTILINE_CPP_IS_BRIEF = NO \
+DETAILS_AT_TOP         = NO \
+INHERIT_DOCS           = YES \
+DISTRIBUTE_GROUP_DOC   = NO \
+TAB_SIZE               = 8 \
+ALIASES                =  \
+OPTIMIZE_OUTPUT_FOR_C  = NO \
+OPTIMIZE_OUTPUT_JAVA   = NO \
+SUBGROUPING            = YES \
+#--------------------------------------------------------------------------- \
+# Build related configuration options \
+#--------------------------------------------------------------------------- \
+EXTRACT_ALL            = NO \
+EXTRACT_PRIVATE        = YES \
+EXTRACT_STATIC         = YES \
+EXTRACT_LOCAL_CLASSES  = YES \
+EXTRACT_LOCAL_METHODS  = NO \
+HIDE_UNDOC_MEMBERS     = NO \
+HIDE_UNDOC_CLASSES     = NO \
+HIDE_FRIEND_COMPOUNDS  = NO \
+HIDE_IN_BODY_DOCS      = NO \
+INTERNAL_DOCS          = NO \
+CASE_SENSE_NAMES       = YES \
+HIDE_SCOPE_NAMES       = NO \
+SHOW_INCLUDE_FILES     = YES \
+INLINE_INFO            = YES \
+SORT_MEMBER_DOCS       = YES \
+SORT_BRIEF_DOCS        = NO \
+SORT_BY_SCOPE_NAME     = NO \
+GENERATE_TODOLIST      = YES \
+GENERATE_TESTLIST      = YES \
+GENERATE_BUGLIST       = YES \
+GENERATE_DEPRECATEDLIST= YES \
+ENABLED_SECTIONS       =  \
+MAX_INITIALIZER_LINES  = 30 \
+SHOW_USED_FILES        = YES \
+#--------------------------------------------------------------------------- \
+# configuration options related to warning and progress messages \
+#--------------------------------------------------------------------------- \
+QUIET                  = YES \
+WARNINGS               = YES \
+WARN_IF_UNDOCUMENTED   = YES \
+WARN_IF_DOC_ERROR      = YES \
+WARN_FORMAT            = \"\$file:\$line: \$text\" \
+WARN_LOGFILE           =  \
+#--------------------------------------------------------------------------- \
+# configuration options related to the input files \
+#--------------------------------------------------------------------------- \
+INPUT                  = $processFiles \
+FILE_PATTERNS          =  \
+RECURSIVE              = NO \
+EXCLUDE                =  \
+EXCLUDE_SYMLINKS       = NO \
+EXCLUDE_PATTERNS       =  \
+EXAMPLE_PATH           =  \
+EXAMPLE_PATTERNS       =  \
+EXAMPLE_RECURSIVE      = NO \
+IMAGE_PATH             =  \
+INPUT_FILTER           =  \
+FILTER_SOURCE_FILES    = NO \
+#--------------------------------------------------------------------------- \
+# configuration options related to source browsing \
+#--------------------------------------------------------------------------- \
+SOURCE_BROWSER         = NO \
+INLINE_SOURCES         = NO \
+STRIP_CODE_COMMENTS    = YES \
+REFERENCED_BY_RELATION = YES \
+REFERENCES_RELATION    = YES \
+VERBATIM_HEADERS       = YES \
+#--------------------------------------------------------------------------- \
+# configuration options related to the alphabetical class index \
+#--------------------------------------------------------------------------- \
+ALPHABETICAL_INDEX     = NO \
+COLS_IN_ALPHA_INDEX    = 5 \
+IGNORE_PREFIX          =  \
+#--------------------------------------------------------------------------- \
+# configuration options related to the HTML output \
+#--------------------------------------------------------------------------- \
+GENERATE_HTML          = YES \
+HTML_OUTPUT            = html \
+HTML_FILE_EXTENSION    = .html \
+HTML_HEADER            =  \
+HTML_FOOTER            =  \
+HTML_STYLESHEET        =  \
+HTML_ALIGN_MEMBERS     = YES \
+GENERATE_HTMLHELP      = NO \
+CHM_FILE               =  \
+HHC_LOCATION           =  \
+GENERATE_CHI           = NO \
+BINARY_TOC             = NO \
+TOC_EXPAND             = NO \
+DISABLE_INDEX          = NO \
+ENUM_VALUES_PER_LINE   = 4 \
+GENERATE_TREEVIEW      = NO \
+TREEVIEW_WIDTH         = 250 \
+#--------------------------------------------------------------------------- \
+# configuration options related to the LaTeX output \
+#--------------------------------------------------------------------------- \
+GENERATE_LATEX         = NO \
+LATEX_OUTPUT           = latex \
+LATEX_CMD_NAME         = latex \
+MAKEINDEX_CMD_NAME     = makeindex \
+COMPACT_LATEX          = NO \
+PAPER_TYPE             = a4wide \
+EXTRA_PACKAGES         =  \
+LATEX_HEADER           =  \
+PDF_HYPERLINKS         = NO \
+USE_PDFLATEX           = NO \
+LATEX_BATCHMODE        = NO \
+LATEX_HIDE_INDICES     = NO \
+#--------------------------------------------------------------------------- \
+# configuration options related to the RTF output \
+#--------------------------------------------------------------------------- \
+GENERATE_RTF           = NO \
+RTF_OUTPUT             = rtf \
+COMPACT_RTF            = NO \
+RTF_HYPERLINKS         = NO \
+RTF_STYLESHEET_FILE    =  \
+RTF_EXTENSIONS_FILE    =  \
+#--------------------------------------------------------------------------- \
+# configuration options related to the man page output \
+#--------------------------------------------------------------------------- \
+GENERATE_MAN           = NO \
+MAN_OUTPUT             = man \
+MAN_EXTENSION          = .3 \
+MAN_LINKS              = NO \
+#--------------------------------------------------------------------------- \
+# configuration options related to the XML output \
+#--------------------------------------------------------------------------- \
+GENERATE_XML           = NO \
+XML_OUTPUT             = xml \
+XML_SCHEMA             =  \
+XML_DTD                =  \
+XML_PROGRAMLISTING     = YES \
+#--------------------------------------------------------------------------- \
+# configuration options for the AutoGen Definitions output \
+#--------------------------------------------------------------------------- \
+GENERATE_AUTOGEN_DEF   = NO \
+#--------------------------------------------------------------------------- \
+# configuration options related to the Perl module output \
+#--------------------------------------------------------------------------- \
+GENERATE_PERLMOD       = NO \
+PERLMOD_LATEX          = NO \
+PERLMOD_PRETTY         = YES \
+PERLMOD_MAKEVAR_PREFIX =  \
+#--------------------------------------------------------------------------- \
+# Configuration options related to the preprocessor    \
+#--------------------------------------------------------------------------- \
+ENABLE_PREPROCESSING   = YES \
+MACRO_EXPANSION        = NO \
+EXPAND_ONLY_PREDEF     = NO \
+SEARCH_INCLUDES        = YES \
+INCLUDE_PATH           =  \
+INCLUDE_FILE_PATTERNS  =  \
+PREDEFINED             =  \
+EXPAND_AS_DEFINED      =  \
+SKIP_FUNCTION_MACROS   = YES \
+#--------------------------------------------------------------------------- \
+# Configuration::additions related to external references    \
+#--------------------------------------------------------------------------- \
+TAGFILES               =  \
+GENERATE_TAGFILE       =  \
+ALLEXTERNALS           = NO \
+EXTERNAL_GROUPS        = YES \
+PERL_PATH              = /usr/bin/perl \
+#--------------------------------------------------------------------------- \
+# Configuration options related to the dot tool    \
+#--------------------------------------------------------------------------- \
+CLASS_DIAGRAMS         = YES \
+HIDE_UNDOC_RELATIONS   = YES \
+HAVE_DOT               = NO \
+CLASS_GRAPH            = YES \
+COLLABORATION_GRAPH    = YES \
+UML_LOOK               = NO \
+TEMPLATE_RELATIONS     = NO \
+INCLUDE_GRAPH          = YES \
+INCLUDED_BY_GRAPH      = YES \
+CALL_GRAPH             = NO \
+GRAPHICAL_HIERARCHY    = YES \
+DOT_IMAGE_FORMAT       = png \
+DOT_PATH               =  \
+DOTFILE_DIRS           =  \
+MAX_DOT_GRAPH_WIDTH    = 1024 \
+MAX_DOT_GRAPH_HEIGHT   = 1024 \
+MAX_DOT_GRAPH_DEPTH    = 0 \
+GENERATE_LEGEND        = YES \
+DOT_CLEANUP            = YES \
+#--------------------------------------------------------------------------- \
+# Configuration::additions related to the search engine    \
+#--------------------------------------------------------------------------- \
+SEARCHENGINE           = NO \
+ \
+";
+
+close DOXfile;
+
+print "==================================================================\n";
+print "Generating Documentation of $processFiles\n";
+print "==================================================================\n";
+exec("doxygen $tempDoxFile");
+
+
+unlink $tmpDoxFile;
Index: orxonox/branches/updater/doc/orxodox.src
===================================================================
--- orxonox/branches/updater/doc/orxodox.src	(revision 3469)
+++ orxonox/branches/updater/doc/orxodox.src	(revision 3561)
@@ -7,5 +7,5 @@
 PROJECT_NAME           = Orxonox
 PROJECT_NUMBER         = 1
-OUTPUT_DIRECTORY       = doc/doxygen/
+OUTPUT_DIRECTORY       = doxygen/
 CREATE_SUBDIRS         = YES
 OUTPUT_LANGUAGE        = English
@@ -34,6 +34,6 @@
 #---------------------------------------------------------------------------
 EXTRACT_ALL            = NO
-EXTRACT_PRIVATE        = NO
-EXTRACT_STATIC         = NO
+EXTRACT_PRIVATE        = YES
+EXTRACT_STATIC         = YES
 EXTRACT_LOCAL_CLASSES  = YES
 EXTRACT_LOCAL_METHODS  = NO
@@ -69,7 +69,7 @@
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = src/
+INPUT                  = .
 FILE_PATTERNS          = 
-RECURSIVE              = YES
+RECURSIVE              = NO
 EXCLUDE                = 
 EXCLUDE_SYMLINKS       = NO
Index: orxonox/branches/updater/doc/orxonox.1
===================================================================
--- orxonox/branches/updater/doc/orxonox.1	(revision 3469)
+++ orxonox/branches/updater/doc/orxonox.1	(revision 3561)
@@ -14,5 +14,5 @@
 .\" the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 .\"
-.TH ORXONOX 1 "April 13, 2004"
+.TH ORXONOX 1 "March 2, 2004"
 .\" Please update the above date whenever this man page is modified.
 .\"
@@ -28,29 +28,36 @@
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-orxonox \- the future of 3D-vertical-scrollers
+orxonox \-  High-End Vertical Scroller
 .SH SYNOPSIS
 .B orxonox
 .RI [ options ]
 .SH DESCRIPTION
-\fBorxonox\fP washes your windows, mends your fences, mows your lawn...
+\fBorxonox\fP is an open-source vertical scroller game programmed in C++,OpenGL and SDL. It's designed to run on all important platforms like Linux, MacOS X, Windows.
 .PP
-It also...
+It washes your windows, mends your fences, mows your lawn...
 .SH OPTIONS
 \fBorxonox\fP accepts the following options:
-.TP
-.BR  -q , " --quiet" , " --silent"
-Inhibit usual output.
-.TP
-.B  -v, --verbose
-Print more information.
 .TP
 .B \-h, \-\-help
 Show summary of options.
 .TP
-.B \-V, \-\-version
-Show version of program.
+.B \-v=<i>, \-\-verbose=\<i\>
+Prints out: 0: nothing, 1: error, 2: warnings, 3: information, 4+: debug
+.TP
+.B \-g, \-\-gui 
+displays the gui prior to starting orxonox. (this is also the case, if the configuration-files do not exist in your home).
+.TP
+.B \-q, \-\-windowed
+starts orxonox in windowed mode. (not fullscreen)
+.TP
+.B \-\-no\-sound 
+Disables audio completely
+.TP
+.B \-w, \-\-wireframe 
+Renders everything in Wireframe mode.
+.TP
 .\" .SH "SEE ALSO"
 .\" .BR foo (1), 
 .\" .BR bar (1).
 .SH AUTHOR
-orx <orxonox-announce@mail.datacore.ch>.
+orx-crew <orxonox@orxonox.ethz.ch>.
