Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4063 in orxonox.OLD for orxonox/branches


Ignore:
Timestamp:
May 5, 2005, 2:37:08 PM (20 years ago)
Author:
patrick
Message:

orxonox/branche/md2_loader: merged trunk into my branche

Location:
orxonox/branches/md2_loader
Files:
20 deleted
24 edited
22 copied

Legend:

Unmodified
Added
Removed

  • orxonox/branches/md2_loader/Makefile.in

    r3789 r4063  
    105105EXEEXT = @EXEEXT@
    106106GPROF = @GPROF@
    107 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    108 GTHREAD_LIBS = @GTHREAD_LIBS@
    109107GTK2_CFLAGS = @GTK2_CFLAGS@
    110108GTK2_LIBS = @GTK2_LIBS@
    111109HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    112110HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    113 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    114 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    115111HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    116112HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    133129PACKAGE_VERSION = @PACKAGE_VERSION@
    134130PATH_SEPARATOR = @PATH_SEPARATOR@
     131RANLIB = @RANLIB@
    135132SET_MAKE = @SET_MAKE@
    136133SHELL = @SHELL@
    … …  
    141138ac_ct_CC = @ac_ct_CC@
    142139ac_ct_CXX = @ac_ct_CXX@
     140ac_ct_RANLIB = @ac_ct_RANLIB@
    143141ac_ct_STRIP = @ac_ct_STRIP@
    144142am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

  • orxonox/branches/md2_loader/aclocal.m4

    r4010 r4063  
    1 # generated automatically by aclocal 1.8.2 -*- Autoconf -*-
     1# generated automatically by aclocal 1.8.5 -*- Autoconf -*-
    22
    33# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
    … …  
    4141# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
    4242AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
    43          [AM_AUTOMAKE_VERSION([1.8.2])])
     43         [AM_AUTOMAKE_VERSION([1.8.5])])
    4444
    4545# AM_AUX_DIR_EXPAND
    … …  
    150150fi])])
    151151
    152 # serial 6                                              -*- Autoconf -*-
     152# serial 7                                              -*- Autoconf -*-
    153153
    154154# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
    … …  
    237237    for i in 1 2 3 4 5 6; do
    238238      echo '#include "conftst'$i'.h"' >> sub/conftest.c
    239       : > sub/conftst$i.h
     239      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
     240      # Solaris 8's {/usr,}/bin/sh.
     241      touch sub/conftst$i.h
    240242    done
    241243    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
    … …  
    265267       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
    266268      # icc doesn't choke on unknown options, it will just issue warnings
    267       # (even with -Werror).  So we grep stderr for any message
    268       # that says an option was ignored.
    269       if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
     269      # or remarks (even with -Werror).  So we grep stderr for any message
     270      # that says an option was ignored or not supported.
     271      # When given -MP, icc 7.0 and 7.1 complain thusly:
     272      #   icc: Command line warning: ignoring option '-M'; no argument required
     273      # The diagnosis changed in icc 8.0:
     274      #   icc: Command line remark: option '-MP' not supported
     275      if (grep 'ignoring option' conftest.err ||
     276          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
    270277        am_cv_$1_dependencies_compiler_type=$depmode
    271278        break
    … …  
    313320# Generate code to set up dependency tracking.   -*- Autoconf -*-
    314321
    315 # Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
     322# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
    316323
    317324# This program is free software; you can redistribute it and/or modify
    … …  
    352359  # Extract the definition of DEP_FILES from the Makefile without
    353360  # running `make'.
    354   DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
     361  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
    355362  test -z "$DEPDIR" && continue
    356363  # When using ansi2knr, U may be empty or an underscore; expand it
    357   U=`sed -n -e '/^U = / s///p' < "$mf"`
     364  U=`sed -n 's/^U = //p' < "$mf"`
    358365  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
    359366  # We invoke sed twice because it is the simplest approach to
    360367  # changing $(DEPDIR) to its actual value in the expansion.
    361   for file in `sed -n -e '
     368  for file in `sed -n '
    362369    /^DEP_FILES = .*\\\\$/ {
    363370      s/^DEP_FILES = //
    … …  
    718725# Do not use -m 0755 and let people choose whatever they expect by
    719726# setting umask.
     727#
     728# We cannot accept any implementation of `mkdir' that recognizes `-p'.
     729# Some implementations (such as Solaris 8's) are not thread-safe: if a
     730# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
     731# concurrently, both version can detect that a/ is missing, but only
     732# one can create it and the other will error out.  Consequently we
     733# restrict ourselves to GNU make (using the --version option ensures
     734# this.)
    720735AC_DEFUN([AM_PROG_MKDIR_P],
    721 [if mkdir -p -- . 2>/dev/null; then
     736[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
    722737  # Keeping the `.' argument allows $(mkdir_p) to be used without
    723738  # argument.  Indeed, we sometimes output rules like
    … …  
    732747  # directories to create, and then abort because `.' already
    733748  # exists.
    734   for d in ./-p ./--;
     749  for d in ./-p ./--version;
    735750  do
    736751    test -d $d && rmdir $d

  • orxonox/branches/md2_loader/configure

    r4010 r4063  
    312312#endif"
    313313
    314 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 DOCUMENTATION_TRUE DOCUMENTATION_FALSE DOXYGEN DOXYGEN_TRUE DOXYGEN_FALSE GPROF 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'
     314ac_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 RANLIB ac_ct_RANLIB CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP DEBUG SUB_PROJECTS_TRUE SUB_PROJECTS_FALSE DOCUMENTATION_TRUE DOCUMENTATION_FALSE DOXYGEN DOXYGEN_TRUE DOXYGEN_FALSE GPROF MSBITFIELDS GTK2_LIBS GTK2_CFLAGS HAVE_GTK2_TRUE HAVE_GTK2_FALSE CURL_LIBS CURL_CFLAGS HAVE_CURL_TRUE HAVE_CURL_FALSE LIBOBJS LTLIBOBJS'
    315315ac_subst_files=''
    316316
    … …  
    879879  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
    880880  --without-gtk           Prevents GTK from being loaded
    881   --without-gthread       Prevents gThread from being loaded
    882   --without-pthread       Prevents pthread from being loaded
    883881  --without-curl          Prevents libcURL from being loaded
    884882
    … …  
    16041602fi
    16051603
    1606 if mkdir -p -- . 2>/dev/null; then
     1604if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
    16071605  # Keeping the `.' argument allows $(mkdir_p) to be used without
    16081606  # argument.  Indeed, we sometimes output rules like
    … …  
    16171615  # directories to create, and then abort because `.' already
    16181616  # exists.
    1619   for d in ./-p ./--;
     1617  for d in ./-p ./--version;
    16201618  do
    16211619    test -d $d && rmdir $d
    … …  
    25232521    for i in 1 2 3 4 5 6; do
    25242522      echo '#include "conftst'$i'.h"' >> sub/conftest.c
    2525       : > sub/conftst$i.h
     2523      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
     2524      # Solaris 8's {/usr,}/bin/sh.
     2525      touch sub/conftst$i.h
    25262526    done
    25272527    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
    … …  
    25512551       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
    25522552      # icc doesn't choke on unknown options, it will just issue warnings
    2553       # (even with -Werror).  So we grep stderr for any message
    2554       # that says an option was ignored.
    2555       if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
     2553      # or remarks (even with -Werror).  So we grep stderr for any message
     2554      # that says an option was ignored or not supported.
     2555      # When given -MP, icc 7.0 and 7.1 complain thusly:
     2556      #   icc: Command line warning: ignoring option '-M'; no argument required
     2557      # The diagnosis changed in icc 8.0:
     2558      #   icc: Command line remark: option '-MP' not supported
     2559      if (grep 'ignoring option' conftest.err ||
     2560          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
    25562561        am_cv_CXX_dependencies_compiler_type=$depmode
    25572562        break
    … …  
    25832588fi
    25842589
     2590
     2591if test -n "$ac_tool_prefix"; then
     2592  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
     2593set dummy ${ac_tool_prefix}ranlib; ac_word=$2
     2594echo "$as_me:$LINENO: checking for $ac_word" >&5
     2595echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     2596if test "${ac_cv_prog_RANLIB+set}" = set; then
     2597  echo $ECHO_N "(cached) $ECHO_C" >&6
     2598else
     2599  if test -n "$RANLIB"; then
     2600  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
     2601else
     2602as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     2603for as_dir in $PATH
     2604do
     2605  IFS=$as_save_IFS
     2606  test -z "$as_dir" && as_dir=.
     2607  for ac_exec_ext in '' $ac_executable_extensions; do
     2608  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2609    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     2610    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     2611    break 2
     2612  fi
     2613done
     2614done
     2615
     2616fi
     2617fi
     2618RANLIB=$ac_cv_prog_RANLIB
     2619if test -n "$RANLIB"; then
     2620  echo "$as_me:$LINENO: result: $RANLIB" >&5
     2621echo "${ECHO_T}$RANLIB" >&6
     2622else
     2623  echo "$as_me:$LINENO: result: no" >&5
     2624echo "${ECHO_T}no" >&6
     2625fi
     2626
     2627fi
     2628if test -z "$ac_cv_prog_RANLIB"; then
     2629  ac_ct_RANLIB=$RANLIB
     2630  # Extract the first word of "ranlib", so it can be a program name with args.
     2631set dummy ranlib; ac_word=$2
     2632echo "$as_me:$LINENO: checking for $ac_word" >&5
     2633echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
     2634if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
     2635  echo $ECHO_N "(cached) $ECHO_C" >&6
     2636else
     2637  if test -n "$ac_ct_RANLIB"; then
     2638  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
     2639else
     2640as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     2641for as_dir in $PATH
     2642do
     2643  IFS=$as_save_IFS
     2644  test -z "$as_dir" && as_dir=.
     2645  for ac_exec_ext in '' $ac_executable_extensions; do
     2646  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     2647    ac_cv_prog_ac_ct_RANLIB="ranlib"
     2648    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     2649    break 2
     2650  fi
     2651done
     2652done
     2653
     2654  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
     2655fi
     2656fi
     2657ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
     2658if test -n "$ac_ct_RANLIB"; then
     2659  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
     2660echo "${ECHO_T}$ac_ct_RANLIB" >&6
     2661else
     2662  echo "$as_me:$LINENO: result: no" >&5
     2663echo "${ECHO_T}no" >&6
     2664fi
     2665
     2666  RANLIB=$ac_ct_RANLIB
     2667else
     2668  RANLIB="$ac_cv_prog_RANLIB"
     2669fi
    25852670
    25862671ac_ext=c
    … …  
    33543439    for i in 1 2 3 4 5 6; do
    33553440      echo '#include "conftst'$i'.h"' >> sub/conftest.c
    3356       : > sub/conftst$i.h
     3441      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
     3442      # Solaris 8's {/usr,}/bin/sh.
     3443      touch sub/conftst$i.h
    33573444    done
    33583445    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
    … …  
    33823469       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
    33833470      # icc doesn't choke on unknown options, it will just issue warnings
    3384       # (even with -Werror).  So we grep stderr for any message
    3385       # that says an option was ignored.
    3386       if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
     3471      # or remarks (even with -Werror).  So we grep stderr for any message
     3472      # that says an option was ignored or not supported.
     3473      # When given -MP, icc 7.0 and 7.1 complain thusly:
     3474      #   icc: Command line warning: ignoring option '-M'; no argument required
     3475      # The diagnosis changed in icc 8.0:
     3476      #   icc: Command line remark: option '-MP' not supported
     3477      if (grep 'ignoring option' conftest.err ||
     3478          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
    33873479        am_cv_CC_dependencies_compiler_type=$depmode
    33883480        break
    … …  
    39084000fi
    39094001if test x$def_gtk = xno; then
    3910   echo "no"
    3911 fi
    3912 
    3913 #------------------#
    3914 # gThread-disabled #
    3915 #------------------#
    3916 echo "$as_me:$LINENO: checking if gThread should be enabled" >&5
    3917 echo $ECHO_N "checking if gThread should be enabled... $ECHO_C" >&6
    3918 
    3919 # Check whether --with-gthread or --without-gthread was given.
    3920 if test "${with_gthread+set}" = set; then
    3921   withval="$with_gthread"
    3922   def_gthread=no
    3923 else
    3924   def_gthread=yes
    3925 fi;
    3926 if test x$def_gthread = xyes; then
    3927   echo "yes"
    3928 fi
    3929 if test x$def_gthread = xno; then
    3930   echo "no"
    3931 fi
    3932 
    3933 #------------------#
    3934 # pthread-disabled #
    3935 #------------------#
    3936 echo "$as_me:$LINENO: checking if pthread should be enabled" >&5
    3937 echo $ECHO_N "checking if pthread should be enabled... $ECHO_C" >&6
    3938 
    3939 # Check whether --with-pthread or --without-pthread was given.
    3940 if test "${with_pthread+set}" = set; then
    3941   withval="$with_pthread"
    3942   def_pthread=no
    3943 else
    3944   def_pthread=yes
    3945 fi;
    3946 if test x$def_pthread = xyes; then
    3947   echo "yes"
    3948 fi
    3949 if test x$def_pthread = xno; then
    39504002  echo "no"
    39514003fi
    … …  
    66556707
    66566708#---------#
    6657 # gThread #
    6658 #---------#
    6659 if test x$def_gthread = xyes; then
    6660 
    6661         echo "$as_me:$LINENO: checking for gthread" >&5
    6662 echo $ECHO_N "checking for gthread... $ECHO_C" >&6
    6663         if `pkg-config --exists gthread-2.0`; then
    6664                 echo "yes"
    6665                 have_gthread=yes
    6666                 GTHREAD_LIBS=`pkg-config --libs gthread-2.0`
    6667                 GTHREAD_CFLAGS=`pkg-config --cflags gthread-2.0`
    6668 
    6669 cat >>confdefs.h <<_ACEOF
    6670 #define HAVE_GTHREAD 1
    6671 _ACEOF
    6672 
    6673         else
    6674                 echo "no"
    6675         fi
    6676 
    6677 fi
    6678 
    6679 
    6680 
    6681 
    6682 if test x$have_gthread = xyes; then
    6683   HAVE_GTHREAD_TRUE=
    6684   HAVE_GTHREAD_FALSE='#'
    6685 else
    6686   HAVE_GTHREAD_TRUE='#'
    6687   HAVE_GTHREAD_FALSE=
    6688 fi
    6689 
    6690 
    6691 #---------#
    66926709# libcURL #
    66936710#---------#
    … …  
    69356952
    69366953
    6937 #---------#
    6938 # pthread #
    6939 #---------#
    6940 if test x$def_pthread = xyes ; then
    6941  if test x$have_gthread = xyes ; then
    6942 
    6943 for ac_header in pthread.h
     6954#--------#
     6955# efence #
     6956#--------#
     6957if test x$def_efence = xyes ; then
     6958  echo "$as_me:$LINENO: checking for main in -lefence" >&5
     6959echo $ECHO_N "checking for main in -lefence... $ECHO_C" >&6
     6960if test "${ac_cv_lib_efence_main+set}" = set; then
     6961  echo $ECHO_N "(cached) $ECHO_C" >&6
     6962else
     6963  ac_check_lib_save_LIBS=$LIBS
     6964LIBS="-lefence  $LIBS"
     6965cat >conftest.$ac_ext <<_ACEOF
     6966/* confdefs.h.  */
     6967_ACEOF
     6968cat confdefs.h >>conftest.$ac_ext
     6969cat >>conftest.$ac_ext <<_ACEOF
     6970/* end confdefs.h.  */
     6971
     6972
     6973int
     6974main ()
     6975{
     6976main ();
     6977  ;
     6978  return 0;
     6979}
     6980_ACEOF
     6981rm -f conftest.$ac_objext conftest$ac_exeext
     6982if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
     6983  (eval $ac_link) 2>conftest.er1
     6984  ac_status=$?
     6985  grep -v '^ *+' conftest.er1 >conftest.err
     6986  rm -f conftest.er1
     6987  cat conftest.err >&5
     6988  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     6989  (exit $ac_status); } &&
     6990         { ac_try='test -z "$ac_c_werror_flag"
     6991                         || test ! -s conftest.err'
     6992  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     6993  (eval $ac_try) 2>&5
     6994  ac_status=$?
     6995  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     6996  (exit $ac_status); }; } &&
     6997         { ac_try='test -s conftest$ac_exeext'
     6998  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     6999  (eval $ac_try) 2>&5
     7000  ac_status=$?
     7001  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7002  (exit $ac_status); }; }; then
     7003  ac_cv_lib_efence_main=yes
     7004else
     7005  echo "$as_me: failed program was:" >&5
     7006sed 's/^/| /' conftest.$ac_ext >&5
     7007
     7008ac_cv_lib_efence_main=no
     7009fi
     7010rm -f conftest.err conftest.$ac_objext \
     7011      conftest$ac_exeext conftest.$ac_ext
     7012LIBS=$ac_check_lib_save_LIBS
     7013fi
     7014echo "$as_me:$LINENO: result: $ac_cv_lib_efence_main" >&5
     7015echo "${ECHO_T}$ac_cv_lib_efence_main" >&6
     7016if test $ac_cv_lib_efence_main = yes; then
     7017  FOUND_efence=yes
     7018fi
     7019
     7020   if test x$FOUND_efence = xyes ; then
     7021      LIBS="$LIBS -lefence"
     7022   fi
     7023
     7024fi
     7025
     7026# FIXME: Replace `main' with a function in `-lm':
     7027
     7028echo "$as_me:$LINENO: checking for main in -lm" >&5
     7029echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6
     7030if test "${ac_cv_lib_m_main+set}" = set; then
     7031  echo $ECHO_N "(cached) $ECHO_C" >&6
     7032else
     7033  ac_check_lib_save_LIBS=$LIBS
     7034LIBS="-lm  $LIBS"
     7035cat >conftest.$ac_ext <<_ACEOF
     7036/* confdefs.h.  */
     7037_ACEOF
     7038cat confdefs.h >>conftest.$ac_ext
     7039cat >>conftest.$ac_ext <<_ACEOF
     7040/* end confdefs.h.  */
     7041
     7042
     7043int
     7044main ()
     7045{
     7046main ();
     7047  ;
     7048  return 0;
     7049}
     7050_ACEOF
     7051rm -f conftest.$ac_objext conftest$ac_exeext
     7052if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
     7053  (eval $ac_link) 2>conftest.er1
     7054  ac_status=$?
     7055  grep -v '^ *+' conftest.er1 >conftest.err
     7056  rm -f conftest.er1
     7057  cat conftest.err >&5
     7058  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7059  (exit $ac_status); } &&
     7060         { ac_try='test -z "$ac_c_werror_flag"
     7061                         || test ! -s conftest.err'
     7062  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7063  (eval $ac_try) 2>&5
     7064  ac_status=$?
     7065  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7066  (exit $ac_status); }; } &&
     7067         { ac_try='test -s conftest$ac_exeext'
     7068  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7069  (eval $ac_try) 2>&5
     7070  ac_status=$?
     7071  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7072  (exit $ac_status); }; }; then
     7073  ac_cv_lib_m_main=yes
     7074else
     7075  echo "$as_me: failed program was:" >&5
     7076sed 's/^/| /' conftest.$ac_ext >&5
     7077
     7078ac_cv_lib_m_main=no
     7079fi
     7080rm -f conftest.err conftest.$ac_objext \
     7081      conftest$ac_exeext conftest.$ac_ext
     7082LIBS=$ac_check_lib_save_LIBS
     7083fi
     7084echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5
     7085echo "${ECHO_T}$ac_cv_lib_m_main" >&6
     7086if test $ac_cv_lib_m_main = yes; then
     7087  cat >>confdefs.h <<_ACEOF
     7088#define HAVE_LIBM 1
     7089_ACEOF
     7090
     7091  LIBS="-lm $LIBS"
     7092
     7093fi
     7094
     7095
     7096
     7097# Checks for header files.
     7098echo "$as_me:$LINENO: checking for ANSI C header files" >&5
     7099echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
     7100if test "${ac_cv_header_stdc+set}" = set; then
     7101  echo $ECHO_N "(cached) $ECHO_C" >&6
     7102else
     7103  cat >conftest.$ac_ext <<_ACEOF
     7104/* confdefs.h.  */
     7105_ACEOF
     7106cat confdefs.h >>conftest.$ac_ext
     7107cat >>conftest.$ac_ext <<_ACEOF
     7108/* end confdefs.h.  */
     7109#include <stdlib.h>
     7110#include <stdarg.h>
     7111#include <string.h>
     7112#include <float.h>
     7113
     7114int
     7115main ()
     7116{
     7117
     7118  ;
     7119  return 0;
     7120}
     7121_ACEOF
     7122rm -f conftest.$ac_objext
     7123if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
     7124  (eval $ac_compile) 2>conftest.er1
     7125  ac_status=$?
     7126  grep -v '^ *+' conftest.er1 >conftest.err
     7127  rm -f conftest.er1
     7128  cat conftest.err >&5
     7129  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7130  (exit $ac_status); } &&
     7131         { ac_try='test -z "$ac_c_werror_flag"
     7132                         || test ! -s conftest.err'
     7133  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7134  (eval $ac_try) 2>&5
     7135  ac_status=$?
     7136  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7137  (exit $ac_status); }; } &&
     7138         { ac_try='test -s conftest.$ac_objext'
     7139  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7140  (eval $ac_try) 2>&5
     7141  ac_status=$?
     7142  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7143  (exit $ac_status); }; }; then
     7144  ac_cv_header_stdc=yes
     7145else
     7146  echo "$as_me: failed program was:" >&5
     7147sed 's/^/| /' conftest.$ac_ext >&5
     7148
     7149ac_cv_header_stdc=no
     7150fi
     7151rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
     7152
     7153if test $ac_cv_header_stdc = yes; then
     7154  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
     7155  cat >conftest.$ac_ext <<_ACEOF
     7156/* confdefs.h.  */
     7157_ACEOF
     7158cat confdefs.h >>conftest.$ac_ext
     7159cat >>conftest.$ac_ext <<_ACEOF
     7160/* end confdefs.h.  */
     7161#include <string.h>
     7162
     7163_ACEOF
     7164if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
     7165  $EGREP "memchr" >/dev/null 2>&1; then
     7166  :
     7167else
     7168  ac_cv_header_stdc=no
     7169fi
     7170rm -f conftest*
     7171
     7172fi
     7173
     7174if test $ac_cv_header_stdc = yes; then
     7175  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
     7176  cat >conftest.$ac_ext <<_ACEOF
     7177/* confdefs.h.  */
     7178_ACEOF
     7179cat confdefs.h >>conftest.$ac_ext
     7180cat >>conftest.$ac_ext <<_ACEOF
     7181/* end confdefs.h.  */
     7182#include <stdlib.h>
     7183
     7184_ACEOF
     7185if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
     7186  $EGREP "free" >/dev/null 2>&1; then
     7187  :
     7188else
     7189  ac_cv_header_stdc=no
     7190fi
     7191rm -f conftest*
     7192
     7193fi
     7194
     7195if test $ac_cv_header_stdc = yes; then
     7196  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
     7197  if test "$cross_compiling" = yes; then
     7198  :
     7199else
     7200  cat >conftest.$ac_ext <<_ACEOF
     7201/* confdefs.h.  */
     7202_ACEOF
     7203cat confdefs.h >>conftest.$ac_ext
     7204cat >>conftest.$ac_ext <<_ACEOF
     7205/* end confdefs.h.  */
     7206#include <ctype.h>
     7207#if ((' ' & 0x0FF) == 0x020)
     7208# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
     7209# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
     7210#else
     7211# define ISLOWER(c) \
     7212                   (('a' <= (c) && (c) <= 'i') \
     7213                     || ('j' <= (c) && (c) <= 'r') \
     7214                     || ('s' <= (c) && (c) <= 'z'))
     7215# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
     7216#endif
     7217
     7218#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
     7219int
     7220main ()
     7221{
     7222  int i;
     7223  for (i = 0; i < 256; i++)
     7224    if (XOR (islower (i), ISLOWER (i))
     7225        || toupper (i) != TOUPPER (i))
     7226      exit(2);
     7227  exit (0);
     7228}
     7229_ACEOF
     7230rm -f conftest$ac_exeext
     7231if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
     7232  (eval $ac_link) 2>&5
     7233  ac_status=$?
     7234  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7235  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
     7236  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     7237  (eval $ac_try) 2>&5
     7238  ac_status=$?
     7239  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     7240  (exit $ac_status); }; }; then
     7241  :
     7242else
     7243  echo "$as_me: program exited with status $ac_status" >&5
     7244echo "$as_me: failed program was:" >&5
     7245sed 's/^/| /' conftest.$ac_ext >&5
     7246
     7247( exit $ac_status )
     7248ac_cv_header_stdc=no
     7249fi
     7250rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
     7251fi
     7252fi
     7253fi
     7254echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
     7255echo "${ECHO_T}$ac_cv_header_stdc" >&6
     7256if test $ac_cv_header_stdc = yes; then
     7257
     7258cat >>confdefs.h <<\_ACEOF
     7259#define STDC_HEADERS 1
     7260_ACEOF
     7261
     7262fi
     7263
     7264
     7265
     7266for ac_header in stdlib.h string.h
    69447267do
    69457268as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    … …  
    70857408#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
    70867409_ACEOF
    7087  pthreadHeader="yes"
    7088 else
    7089   pthreadHeader="no"
     7410
    70907411fi
    70917412
    70927413done
    70937414
    7094   echo "$as_me:$LINENO: checking for main in -lpthread" >&5
    7095 echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6
    7096 if test "${ac_cv_lib_pthread_main+set}" = set; then
     7415
     7416# Checks for typedefs, structures, and compiler characteristics.
     7417echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
     7418echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6
     7419if test "${ac_cv_header_stdbool_h+set}" = set; then
    70977420  echo $ECHO_N "(cached) $ECHO_C" >&6
    70987421else
    7099   ac_check_lib_save_LIBS=$LIBS
    7100 LIBS="-lpthread  $LIBS"
    7101 cat >conftest.$ac_ext <<_ACEOF
     7422  cat >conftest.$ac_ext <<_ACEOF
    71027423/* confdefs.h.  */
    71037424_ACEOF
    … …  
    71067427/* end confdefs.h.  */
    71077428
     7429#include <stdbool.h>
     7430#ifndef bool
     7431# error bool is not defined
     7432#endif
     7433#ifndef false
     7434# error false is not defined
     7435#endif
     7436#if false
     7437# error false is not 0
     7438#endif
     7439#ifndef true
     7440# error true is not defined
     7441#endif
     7442#if true != 1
     7443# error true is not 1
     7444#endif
     7445#ifndef __bool_true_false_are_defined
     7446# error __bool_true_false_are_defined is not defined
     7447#endif
     7448
     7449        struct s { _Bool s: 1; _Bool t; } s;
     7450
     7451        char a[true == 1 ? 1 : -1];
     7452        char b[false == 0 ? 1 : -1];
     7453        char c[__bool_true_false_are_defined == 1 ? 1 : -1];
     7454        char d[(bool) -0.5 == true ? 1 : -1];
     7455        bool e = &s;
     7456        char f[(_Bool) -0.0 == false ? 1 : -1];
     7457        char g[true];
     7458        char h[sizeof (_Bool)];
     7459        char i[sizeof s.t];
    71087460
    71097461int
    71107462main ()
    71117463{
    7112 main ();
     7464 return !a + !b + !c + !d + !e + !f + !g + !h + !i;
    71137465  ;
    71147466  return 0;
    71157467}
    71167468_ACEOF
    7117 rm -f conftest.$ac_objext conftest$ac_exeext
    7118 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    7119   (eval $ac_link) 2>conftest.er1
     7469rm -f conftest.$ac_objext
     7470if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
     7471  (eval $ac_compile) 2>conftest.er1
    71207472  ac_status=$?
    71217473  grep -v '^ *+' conftest.er1 >conftest.err
    … …  
    71317483  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    71327484  (exit $ac_status); }; } &&
    7133          { ac_try='test -s conftest$ac_exeext'
     7485         { ac_try='test -s conftest.$ac_objext'
    71347486  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    71357487  (eval $ac_try) 2>&5
    … …  
    71377489  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    71387490  (exit $ac_status); }; }; then
    7139   ac_cv_lib_pthread_main=yes
     7491  ac_cv_header_stdbool_h=yes
    71407492else
    71417493  echo "$as_me: failed program was:" >&5
    71427494sed 's/^/| /' conftest.$ac_ext >&5
    71437495
    7144 ac_cv_lib_pthread_main=no
    7145 fi
    7146 rm -f conftest.err conftest.$ac_objext \
    7147       conftest$ac_exeext conftest.$ac_ext
    7148 LIBS=$ac_check_lib_save_LIBS
    7149 fi
    7150 echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5
    7151 echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6
    7152 if test $ac_cv_lib_pthread_main = yes; then
    7153   FOUND_pthread=yes
    7154 fi
    7155 
    7156    if test x$FOUND_pthread = xyes ; then
    7157       LIBS="$LIBS -lpthread"
    7158    fi
    7159  fi
    7160 fi
    7161 
    7162 
    7163 #--------#
    7164 # efence #
    7165 #--------#
    7166 if test x$def_efence = xyes ; then
    7167   echo "$as_me:$LINENO: checking for main in -lefence" >&5
    7168 echo $ECHO_N "checking for main in -lefence... $ECHO_C" >&6
    7169 if test "${ac_cv_lib_efence_main+set}" = set; then
     7496ac_cv_header_stdbool_h=no
     7497fi
     7498rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
     7499fi
     7500echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
     7501echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6
     7502echo "$as_me:$LINENO: checking for _Bool" >&5
     7503echo $ECHO_N "checking for _Bool... $ECHO_C" >&6
     7504if test "${ac_cv_type__Bool+set}" = set; then
    71707505  echo $ECHO_N "(cached) $ECHO_C" >&6
    71717506else
    7172   ac_check_lib_save_LIBS=$LIBS
    7173 LIBS="-lefence  $LIBS"
    7174 cat >conftest.$ac_ext <<_ACEOF
     7507  cat >conftest.$ac_ext <<_ACEOF
    71757508/* confdefs.h.  */
    71767509_ACEOF
    … …  
    71787511cat >>conftest.$ac_ext <<_ACEOF
    71797512/* end confdefs.h.  */
    7180 
    7181 
     7513$ac_includes_default
    71827514int
    71837515main ()
    71847516{
    7185 main ();
     7517if ((_Bool *) 0)
     7518  return 0;
     7519if (sizeof (_Bool))
     7520  return 0;
    71867521  ;
    71877522  return 0;
    71887523}
    71897524_ACEOF
    7190 rm -f conftest.$ac_objext conftest$ac_exeext
    7191 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    7192   (eval $ac_link) 2>conftest.er1
     7525rm -f conftest.$ac_objext
     7526if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
     7527  (eval $ac_compile) 2>conftest.er1
    71937528  ac_status=$?
    71947529  grep -v '^ *+' conftest.er1 >conftest.err
    … …  
    72047539  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    72057540  (exit $ac_status); }; } &&
    7206          { ac_try='test -s conftest$ac_exeext'
    7207   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    7208   (eval $ac_try) 2>&5
    7209   ac_status=$?
    7210   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7211   (exit $ac_status); }; }; then
    7212   ac_cv_lib_efence_main=yes
    7213 else
    7214   echo "$as_me: failed program was:" >&5
    7215 sed 's/^/| /' conftest.$ac_ext >&5
    7216 
    7217 ac_cv_lib_efence_main=no
    7218 fi
    7219 rm -f conftest.err conftest.$ac_objext \
    7220       conftest$ac_exeext conftest.$ac_ext
    7221 LIBS=$ac_check_lib_save_LIBS
    7222 fi
    7223 echo "$as_me:$LINENO: result: $ac_cv_lib_efence_main" >&5
    7224 echo "${ECHO_T}$ac_cv_lib_efence_main" >&6
    7225 if test $ac_cv_lib_efence_main = yes; then
    7226   FOUND_efence=yes
    7227 fi
    7228 
    7229    if test x$FOUND_efence = xyes ; then
    7230       LIBS="$LIBS -lefence"
    7231    fi
    7232 
    7233 fi
    7234 
    7235 # FIXME: Replace `main' with a function in `-lm':
    7236 
    7237 echo "$as_me:$LINENO: checking for main in -lm" >&5
    7238 echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6
    7239 if test "${ac_cv_lib_m_main+set}" = set; then
    7240   echo $ECHO_N "(cached) $ECHO_C" >&6
    7241 else
    7242   ac_check_lib_save_LIBS=$LIBS
    7243 LIBS="-lm  $LIBS"
    7244 cat >conftest.$ac_ext <<_ACEOF
    7245 /* confdefs.h.  */
    7246 _ACEOF
    7247 cat confdefs.h >>conftest.$ac_ext
    7248 cat >>conftest.$ac_ext <<_ACEOF
    7249 /* end confdefs.h.  */
    7250 
    7251 
    7252 int
    7253 main ()
    7254 {
    7255 main ();
    7256   ;
    7257   return 0;
    7258 }
    7259 _ACEOF
    7260 rm -f conftest.$ac_objext conftest$ac_exeext
    7261 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    7262   (eval $ac_link) 2>conftest.er1
    7263   ac_status=$?
    7264   grep -v '^ *+' conftest.er1 >conftest.err
    7265   rm -f conftest.er1
    7266   cat conftest.err >&5
    7267   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7268   (exit $ac_status); } &&
    7269          { ac_try='test -z "$ac_c_werror_flag"
    7270                          || test ! -s conftest.err'
    7271   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    7272   (eval $ac_try) 2>&5
    7273   ac_status=$?
    7274   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7275   (exit $ac_status); }; } &&
    7276          { ac_try='test -s conftest$ac_exeext'
    7277   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    7278   (eval $ac_try) 2>&5
    7279   ac_status=$?
    7280   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7281   (exit $ac_status); }; }; then
    7282   ac_cv_lib_m_main=yes
    7283 else
    7284   echo "$as_me: failed program was:" >&5
    7285 sed 's/^/| /' conftest.$ac_ext >&5
    7286 
    7287 ac_cv_lib_m_main=no
    7288 fi
    7289 rm -f conftest.err conftest.$ac_objext \
    7290       conftest$ac_exeext conftest.$ac_ext
    7291 LIBS=$ac_check_lib_save_LIBS
    7292 fi
    7293 echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5
    7294 echo "${ECHO_T}$ac_cv_lib_m_main" >&6
    7295 if test $ac_cv_lib_m_main = yes; then
    7296   cat >>confdefs.h <<_ACEOF
    7297 #define HAVE_LIBM 1
    7298 _ACEOF
    7299 
    7300   LIBS="-lm $LIBS"
    7301 
    7302 fi
    7303 
    7304 
    7305 
    7306 # Checks for header files.
    7307 echo "$as_me:$LINENO: checking for ANSI C header files" >&5
    7308 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
    7309 if test "${ac_cv_header_stdc+set}" = set; then
    7310   echo $ECHO_N "(cached) $ECHO_C" >&6
    7311 else
    7312   cat >conftest.$ac_ext <<_ACEOF
    7313 /* confdefs.h.  */
    7314 _ACEOF
    7315 cat confdefs.h >>conftest.$ac_ext
    7316 cat >>conftest.$ac_ext <<_ACEOF
    7317 /* end confdefs.h.  */
    7318 #include <stdlib.h>
    7319 #include <stdarg.h>
    7320 #include <string.h>
    7321 #include <float.h>
    7322 
    7323 int
    7324 main ()
    7325 {
    7326 
    7327   ;
    7328   return 0;
    7329 }
    7330 _ACEOF
    7331 rm -f conftest.$ac_objext
    7332 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    7333   (eval $ac_compile) 2>conftest.er1
    7334   ac_status=$?
    7335   grep -v '^ *+' conftest.er1 >conftest.err
    7336   rm -f conftest.er1
    7337   cat conftest.err >&5
    7338   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7339   (exit $ac_status); } &&
    7340          { ac_try='test -z "$ac_c_werror_flag"
    7341                          || test ! -s conftest.err'
    7342   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    7343   (eval $ac_try) 2>&5
    7344   ac_status=$?
    7345   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7346   (exit $ac_status); }; } &&
    73477541         { ac_try='test -s conftest.$ac_objext'
    73487542  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    … …  
    73517545  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    73527546  (exit $ac_status); }; }; then
    7353   ac_cv_header_stdc=yes
     7547  ac_cv_type__Bool=yes
    73547548else
    73557549  echo "$as_me: failed program was:" >&5
    73567550sed 's/^/| /' conftest.$ac_ext >&5
    73577551
    7358 ac_cv_header_stdc=no
     7552ac_cv_type__Bool=no
    73597553fi
    73607554rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    7361 
    7362 if test $ac_cv_header_stdc = yes; then
    7363   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    7364   cat >conftest.$ac_ext <<_ACEOF
    7365 /* confdefs.h.  */
    7366 _ACEOF
    7367 cat confdefs.h >>conftest.$ac_ext
    7368 cat >>conftest.$ac_ext <<_ACEOF
    7369 /* end confdefs.h.  */
    7370 #include <string.h>
    7371 
    7372 _ACEOF
    7373 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    7374   $EGREP "memchr" >/dev/null 2>&1; then
    7375   :
    7376 else
    7377   ac_cv_header_stdc=no
    7378 fi
    7379 rm -f conftest*
    7380 
    7381 fi
    7382 
    7383 if test $ac_cv_header_stdc = yes; then
    7384   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    7385   cat >conftest.$ac_ext <<_ACEOF
    7386 /* confdefs.h.  */
    7387 _ACEOF
    7388 cat confdefs.h >>conftest.$ac_ext
    7389 cat >>conftest.$ac_ext <<_ACEOF
    7390 /* end confdefs.h.  */
    7391 #include <stdlib.h>
    7392 
    7393 _ACEOF
    7394 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    7395   $EGREP "free" >/dev/null 2>&1; then
    7396   :
    7397 else
    7398   ac_cv_header_stdc=no
    7399 fi
    7400 rm -f conftest*
    7401 
    7402 fi
    7403 
    7404 if test $ac_cv_header_stdc = yes; then
    7405   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
    7406   if test "$cross_compiling" = yes; then
    7407   :
    7408 else
    7409   cat >conftest.$ac_ext <<_ACEOF
    7410 /* confdefs.h.  */
    7411 _ACEOF
    7412 cat confdefs.h >>conftest.$ac_ext
    7413 cat >>conftest.$ac_ext <<_ACEOF
    7414 /* end confdefs.h.  */
    7415 #include <ctype.h>
    7416 #if ((' ' & 0x0FF) == 0x020)
    7417 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
    7418 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
    7419 #else
    7420 # define ISLOWER(c) \
    7421                    (('a' <= (c) && (c) <= 'i') \
    7422                      || ('j' <= (c) && (c) <= 'r') \
    7423                      || ('s' <= (c) && (c) <= 'z'))
    7424 # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
    7425 #endif
    7426 
    7427 #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
    7428 int
    7429 main ()
    7430 {
    7431   int i;
    7432   for (i = 0; i < 256; i++)
    7433     if (XOR (islower (i), ISLOWER (i))
    7434         || toupper (i) != TOUPPER (i))
    7435       exit(2);
    7436   exit (0);
    7437 }
    7438 _ACEOF
    7439 rm -f conftest$ac_exeext
    7440 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
    7441   (eval $ac_link) 2>&5
    7442   ac_status=$?
    7443   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7444   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
    7445   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    7446   (eval $ac_try) 2>&5
    7447   ac_status=$?
    7448   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7449   (exit $ac_status); }; }; then
    7450   :
    7451 else
    7452   echo "$as_me: program exited with status $ac_status" >&5
    7453 echo "$as_me: failed program was:" >&5
    7454 sed 's/^/| /' conftest.$ac_ext >&5
    7455 
    7456 ( exit $ac_status )
    7457 ac_cv_header_stdc=no
    7458 fi
    7459 rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
    7460 fi
    7461 fi
    7462 fi
    7463 echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
    7464 echo "${ECHO_T}$ac_cv_header_stdc" >&6
    7465 if test $ac_cv_header_stdc = yes; then
     7555fi
     7556echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
     7557echo "${ECHO_T}$ac_cv_type__Bool" >&6
     7558if test $ac_cv_type__Bool = yes; then
     7559
     7560cat >>confdefs.h <<_ACEOF
     7561#define HAVE__BOOL 1
     7562_ACEOF
     7563
     7564
     7565fi
     7566
     7567if test $ac_cv_header_stdbool_h = yes; then
    74667568
    74677569cat >>confdefs.h <<\_ACEOF
    7468 #define STDC_HEADERS 1
    7469 _ACEOF
    7470 
    7471 fi
    7472 
    7473 
    7474 
    7475 for ac_header in stdlib.h string.h
     7570#define HAVE_STDBOOL_H 1
     7571_ACEOF
     7572
     7573fi
     7574
     7575
     7576# Checks for library functions.
     7577
     7578for ac_header in stdlib.h
    74767579do
    74777580as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    … …  
    76227725done
    76237726
    7624 
    7625 # Checks for typedefs, structures, and compiler characteristics.
    7626 echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
    7627 echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6
    7628 if test "${ac_cv_header_stdbool_h+set}" = set; then
    7629   echo $ECHO_N "(cached) $ECHO_C" >&6
    7630 else
    7631   cat >conftest.$ac_ext <<_ACEOF
    7632 /* confdefs.h.  */
    7633 _ACEOF
    7634 cat confdefs.h >>conftest.$ac_ext
    7635 cat >>conftest.$ac_ext <<_ACEOF
    7636 /* end confdefs.h.  */
    7637 
    7638 #include <stdbool.h>
    7639 #ifndef bool
    7640 # error bool is not defined
    7641 #endif
    7642 #ifndef false
    7643 # error false is not defined
    7644 #endif
    7645 #if false
    7646 # error false is not 0
    7647 #endif
    7648 #ifndef true
    7649 # error true is not defined
    7650 #endif
    7651 #if true != 1
    7652 # error true is not 1
    7653 #endif
    7654 #ifndef __bool_true_false_are_defined
    7655 # error __bool_true_false_are_defined is not defined
    7656 #endif
    7657 
    7658         struct s { _Bool s: 1; _Bool t; } s;
    7659 
    7660         char a[true == 1 ? 1 : -1];
    7661         char b[false == 0 ? 1 : -1];
    7662         char c[__bool_true_false_are_defined == 1 ? 1 : -1];
    7663         char d[(bool) -0.5 == true ? 1 : -1];
    7664         bool e = &s;
    7665         char f[(_Bool) -0.0 == false ? 1 : -1];
    7666         char g[true];
    7667         char h[sizeof (_Bool)];
    7668         char i[sizeof s.t];
    7669 
    7670 int
    7671 main ()
    7672 {
    7673  return !a + !b + !c + !d + !e + !f + !g + !h + !i;
    7674   ;
    7675   return 0;
    7676 }
    7677 _ACEOF
    7678 rm -f conftest.$ac_objext
    7679 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    7680   (eval $ac_compile) 2>conftest.er1
    7681   ac_status=$?
    7682   grep -v '^ *+' conftest.er1 >conftest.err
    7683   rm -f conftest.er1
    7684   cat conftest.err >&5
    7685   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7686   (exit $ac_status); } &&
    7687          { ac_try='test -z "$ac_c_werror_flag"
    7688                          || test ! -s conftest.err'
    7689   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    7690   (eval $ac_try) 2>&5
    7691   ac_status=$?
    7692   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7693   (exit $ac_status); }; } &&
    7694          { ac_try='test -s conftest.$ac_objext'
    7695   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    7696   (eval $ac_try) 2>&5
    7697   ac_status=$?
    7698   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7699   (exit $ac_status); }; }; then
    7700   ac_cv_header_stdbool_h=yes
    7701 else
    7702   echo "$as_me: failed program was:" >&5
    7703 sed 's/^/| /' conftest.$ac_ext >&5
    7704 
    7705 ac_cv_header_stdbool_h=no
    7706 fi
    7707 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    7708 fi
    7709 echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
    7710 echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6
    7711 echo "$as_me:$LINENO: checking for _Bool" >&5
    7712 echo $ECHO_N "checking for _Bool... $ECHO_C" >&6
    7713 if test "${ac_cv_type__Bool+set}" = set; then
    7714   echo $ECHO_N "(cached) $ECHO_C" >&6
    7715 else
    7716   cat >conftest.$ac_ext <<_ACEOF
    7717 /* confdefs.h.  */
    7718 _ACEOF
    7719 cat confdefs.h >>conftest.$ac_ext
    7720 cat >>conftest.$ac_ext <<_ACEOF
    7721 /* end confdefs.h.  */
    7722 $ac_includes_default
    7723 int
    7724 main ()
    7725 {
    7726 if ((_Bool *) 0)
    7727   return 0;
    7728 if (sizeof (_Bool))
    7729   return 0;
    7730   ;
    7731   return 0;
    7732 }
    7733 _ACEOF
    7734 rm -f conftest.$ac_objext
    7735 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    7736   (eval $ac_compile) 2>conftest.er1
    7737   ac_status=$?
    7738   grep -v '^ *+' conftest.er1 >conftest.err
    7739   rm -f conftest.er1
    7740   cat conftest.err >&5
    7741   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7742   (exit $ac_status); } &&
    7743          { ac_try='test -z "$ac_c_werror_flag"
    7744                          || test ! -s conftest.err'
    7745   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    7746   (eval $ac_try) 2>&5
    7747   ac_status=$?
    7748   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7749   (exit $ac_status); }; } &&
    7750          { ac_try='test -s conftest.$ac_objext'
    7751   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    7752   (eval $ac_try) 2>&5
    7753   ac_status=$?
    7754   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7755   (exit $ac_status); }; }; then
    7756   ac_cv_type__Bool=yes
    7757 else
    7758   echo "$as_me: failed program was:" >&5
    7759 sed 's/^/| /' conftest.$ac_ext >&5
    7760 
    7761 ac_cv_type__Bool=no
    7762 fi
    7763 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    7764 fi
    7765 echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
    7766 echo "${ECHO_T}$ac_cv_type__Bool" >&6
    7767 if test $ac_cv_type__Bool = yes; then
    7768 
    7769 cat >>confdefs.h <<_ACEOF
    7770 #define HAVE__BOOL 1
    7771 _ACEOF
    7772 
    7773 
    7774 fi
    7775 
    7776 if test $ac_cv_header_stdbool_h = yes; then
    7777 
    7778 cat >>confdefs.h <<\_ACEOF
    7779 #define HAVE_STDBOOL_H 1
    7780 _ACEOF
    7781 
    7782 fi
    7783 
    7784 
    7785 # Checks for library functions.
    7786 
    7787 for ac_header in stdlib.h
    7788 do
    7789 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
    7790 if eval "test \"\${$as_ac_Header+set}\" = set"; then
    7791   echo "$as_me:$LINENO: checking for $ac_header" >&5
    7792 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    7793 if eval "test \"\${$as_ac_Header+set}\" = set"; then
    7794   echo $ECHO_N "(cached) $ECHO_C" >&6
    7795 fi
    7796 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
    7797 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    7798 else
    7799   # Is the header compilable?
    7800 echo "$as_me:$LINENO: checking $ac_header usability" >&5
    7801 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
    7802 cat >conftest.$ac_ext <<_ACEOF
    7803 /* confdefs.h.  */
    7804 _ACEOF
    7805 cat confdefs.h >>conftest.$ac_ext
    7806 cat >>conftest.$ac_ext <<_ACEOF
    7807 /* end confdefs.h.  */
    7808 $ac_includes_default
    7809 #include <$ac_header>
    7810 _ACEOF
    7811 rm -f conftest.$ac_objext
    7812 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    7813   (eval $ac_compile) 2>conftest.er1
    7814   ac_status=$?
    7815   grep -v '^ *+' conftest.er1 >conftest.err
    7816   rm -f conftest.er1
    7817   cat conftest.err >&5
    7818   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7819   (exit $ac_status); } &&
    7820          { ac_try='test -z "$ac_c_werror_flag"
    7821                          || test ! -s conftest.err'
    7822   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    7823   (eval $ac_try) 2>&5
    7824   ac_status=$?
    7825   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7826   (exit $ac_status); }; } &&
    7827          { ac_try='test -s conftest.$ac_objext'
    7828   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    7829   (eval $ac_try) 2>&5
    7830   ac_status=$?
    7831   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7832   (exit $ac_status); }; }; then
    7833   ac_header_compiler=yes
    7834 else
    7835   echo "$as_me: failed program was:" >&5
    7836 sed 's/^/| /' conftest.$ac_ext >&5
    7837 
    7838 ac_header_compiler=no
    7839 fi
    7840 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
    7841 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
    7842 echo "${ECHO_T}$ac_header_compiler" >&6
    7843 
    7844 # Is the header present?
    7845 echo "$as_me:$LINENO: checking $ac_header presence" >&5
    7846 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
    7847 cat >conftest.$ac_ext <<_ACEOF
    7848 /* confdefs.h.  */
    7849 _ACEOF
    7850 cat confdefs.h >>conftest.$ac_ext
    7851 cat >>conftest.$ac_ext <<_ACEOF
    7852 /* end confdefs.h.  */
    7853 #include <$ac_header>
    7854 _ACEOF
    7855 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    7856   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
    7857   ac_status=$?
    7858   grep -v '^ *+' conftest.er1 >conftest.err
    7859   rm -f conftest.er1
    7860   cat conftest.err >&5
    7861   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    7862   (exit $ac_status); } >/dev/null; then
    7863   if test -s conftest.err; then
    7864     ac_cpp_err=$ac_c_preproc_warn_flag
    7865     ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
    7866   else
    7867     ac_cpp_err=
    7868   fi
    7869 else
    7870   ac_cpp_err=yes
    7871 fi
    7872 if test -z "$ac_cpp_err"; then
    7873   ac_header_preproc=yes
    7874 else
    7875   echo "$as_me: failed program was:" >&5
    7876 sed 's/^/| /' conftest.$ac_ext >&5
    7877 
    7878   ac_header_preproc=no
    7879 fi
    7880 rm -f conftest.err conftest.$ac_ext
    7881 echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
    7882 echo "${ECHO_T}$ac_header_preproc" >&6
    7883 
    7884 # So?  What about this header?
    7885 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
    7886   yes:no: )
    7887     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
    7888 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
    7889     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
    7890 echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
    7891     ac_header_preproc=yes
    7892     ;;
    7893   no:yes:* )
    7894     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
    7895 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
    7896     { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
    7897 echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
    7898     { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
    7899 echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
    7900     { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
    7901 echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
    7902     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
    7903 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
    7904     { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
    7905 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
    7906     (
    7907       cat <<\_ASBOX
    7908 ## ---------------------------------------------- ##
    7909 ## Report this to orxonox-dev at mail.datacore.ch ##
    7910 ## ---------------------------------------------- ##
    7911 _ASBOX
    7912     ) |
    7913       sed "s/^/$as_me: WARNING:     /" >&2
    7914     ;;
    7915 esac
    7916 echo "$as_me:$LINENO: checking for $ac_header" >&5
    7917 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
    7918 if eval "test \"\${$as_ac_Header+set}\" = set"; then
    7919   echo $ECHO_N "(cached) $ECHO_C" >&6
    7920 else
    7921   eval "$as_ac_Header=\$ac_header_preproc"
    7922 fi
    7923 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
    7924 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
    7925 
    7926 fi
    7927 if test `eval echo '${'$as_ac_Header'}'` = yes; then
    7928   cat >>confdefs.h <<_ACEOF
    7929 #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
    7930 _ACEOF
    7931 
    7932 fi
    7933 
    7934 done
    7935 
    79367727echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
    79377728echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6
    … …  
    82628053Usually this means the macro was only invoked conditionally." >&5
    82638054echo "$as_me: error: conditional \"HAVE_GTK2\" was never defined.
    8264 Usually this means the macro was only invoked conditionally." >&2;}
    8265    { (exit 1); exit 1; }; }
    8266 fi
    8267 if test -z "${HAVE_GTHREAD_TRUE}" && test -z "${HAVE_GTHREAD_FALSE}"; then
    8268   { { echo "$as_me:$LINENO: error: conditional \"HAVE_GTHREAD\" was never defined.
    8269 Usually this means the macro was only invoked conditionally." >&5
    8270 echo "$as_me: error: conditional \"HAVE_GTHREAD\" was never defined.
    82718055Usually this means the macro was only invoked conditionally." >&2;}
    82728056   { (exit 1); exit 1; }; }
    … …  
    88688652s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
    88698653s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
     8654s,@RANLIB@,$RANLIB,;t t
     8655s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
    88708656s,@CC@,$CC,;t t
    88718657s,@CFLAGS@,$CFLAGS,;t t
    … …  
    88908676s,@HAVE_GTK2_TRUE@,$HAVE_GTK2_TRUE,;t t
    88918677s,@HAVE_GTK2_FALSE@,$HAVE_GTK2_FALSE,;t t
    8892 s,@GTHREAD_LIBS@,$GTHREAD_LIBS,;t t
    8893 s,@GTHREAD_CFLAGS@,$GTHREAD_CFLAGS,;t t
    8894 s,@HAVE_GTHREAD_TRUE@,$HAVE_GTHREAD_TRUE,;t t
    8895 s,@HAVE_GTHREAD_FALSE@,$HAVE_GTHREAD_FALSE,;t t
    88968678s,@CURL_LIBS@,$CURL_LIBS,;t t
    88978679s,@CURL_CFLAGS@,$CURL_CFLAGS,;t t
    … …  
    95259307  # Extract the definition of DEP_FILES from the Makefile without
    95269308  # running `make'.
    9527   DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
     9309  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
    95289310  test -z "$DEPDIR" && continue
    95299311  # When using ansi2knr, U may be empty or an underscore; expand it
    9530   U=`sed -n -e '/^U = / s///p' < "$mf"`
     9312  U=`sed -n 's/^U = //p' < "$mf"`
    95319313  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
    95329314  # We invoke sed twice because it is the simplest approach to
    95339315  # changing $(DEPDIR) to its actual value in the expansion.
    9534   for file in `sed -n -e '
     9316  for file in `sed -n '
    95359317    /^DEP_FILES = .*\\\\$/ {
    95369318      s/^DEP_FILES = //

  • orxonox/branches/md2_loader/configure.ac

    r3995 r4063  
    3939#########################
    4040AC_PROG_CXX
     41AC_PROG_RANLIB
    4142AC_HEADER_STDC
    4243
    … …  
    9697fi
    9798if test x$def_gtk = xno; then
    98   echo "no"
    99 fi
    100 
    101 #------------------#
    102 # gThread-disabled #
    103 #------------------#
    104 AC_MSG_CHECKING([if gThread should be enabled])
    105 AC_ARG_WITH([gthread],
    106         AC_HELP_STRING( [--without-gthread],
    107         [Prevents gThread from being loaded]), [def_gthread=no], [def_gthread=yes])
    108 if test x$def_gthread = xyes; then
    109   echo "yes"
    110 fi
    111 if test x$def_gthread = xno; then
    112   echo "no"
    113 fi
    114 
    115 #------------------#
    116 # pthread-disabled #
    117 #------------------#
    118 AC_MSG_CHECKING([if pthread should be enabled])
    119 AC_ARG_WITH([pthread],
    120         AC_HELP_STRING( [--without-pthread],
    121         [Prevents pthread from being loaded]), [def_pthread=no], [def_pthread=yes])
    122 if test x$def_pthread = xyes; then
    123   echo "yes"
    124 fi
    125 if test x$def_pthread = xno; then
    12699  echo "no"
    127100fi
    … …  
    481454
    482455#---------#
    483 # gThread #
    484 #---------#
    485 if test x$def_gthread = xyes; then
    486 
    487         AC_MSG_CHECKING([for gthread])
    488         if `pkg-config --exists gthread-2.0`; then
    489                 echo "yes"
    490                 have_gthread=yes
    491                 GTHREAD_LIBS=`pkg-config --libs gthread-2.0`
    492                 GTHREAD_CFLAGS=`pkg-config --cflags gthread-2.0`
    493                 AC_DEFINE_UNQUOTED(HAVE_GTHREAD, 1, [if we have gThread])
    494         else
    495                 echo "no"
    496         fi
    497 
    498 fi
    499 AC_SUBST(GTHREAD_LIBS)
    500 AC_SUBST(GTHREAD_CFLAGS)
    501 AM_CONDITIONAL(HAVE_GTHREAD, test x$have_gthread = xyes)
    502 
    503 #---------#
    504456# libcURL #
    505457#---------#
    … …  
    521473AC_SUBST(CURL_CFLAGS)
    522474AM_CONDITIONAL(HAVE_CURL, test x$have_curl = xyes)
    523 
    524 #---------#
    525 # pthread #
    526 #---------#
    527 if test x$def_pthread = xyes ; then
    528  if test x$have_gthread = xyes ; then
    529   AC_CHECK_HEADERS([pthread.h], [pthreadHeader="yes"], [pthreadHeader="no"])
    530   AC_CHECK_LIB([pthread], [main], [FOUND_pthread=yes])
    531    if test x$FOUND_pthread = xyes ; then
    532       LIBS="$LIBS -lpthread"
    533    fi
    534  fi
    535 fi
    536 
    537475
    538476#--------#

  • orxonox/branches/md2_loader/src/Makefile.am

    r4010 r4063  
    1010AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/particles
    1111AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui
     12AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gui
    1213AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang
    1314AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util
    … …  
    2324
    2425
    25 AM_LDFLAGS= $(MWINDOWS)
    2626
    2727#"-O3 -pedantic -fPIC -ffast-math -I/usr/X11R6/include"
    2828
    2929
    30 bin_PROGRAMS=orxonox
    31 
     30bin_PROGRAMS=orxonox
     31noinst_LIBRARIES = libORXgui.a
     32
     33orxonox_DEPENDENCIES = libORXgui.a
     34orxonox_LDADD = libORXgui.a
    3235orxonox_SOURCES= orxonox.cc \
    3336                 game_loader.cc \
    … …  
    8588                 lib/xmlparser/tinystr.cc \
    8689                 lib/xmlparser/tinyxmlerror.cc \
    87                  lib/xmlparser/tinyxmlparser.cc
    88                  
     90                 lib/xmlparser/tinyxmlparser.cc
    8991
    9092noinst_HEADERS = orxonox.h \
    … …  
    147149                 lib/math/vector.h \
    148150                 lib/math/curve.h \
    149                  glmenu/glmenu_imagescreen.h
     151                 glmenu/glmenu_imagescreen.h \
     152                 lib/gui/gui/gui.h \
     153                 lib/gui/gui/gui_gtk.h \
     154                 lib/gui/gui/gui_element.h \
     155                 lib/gui/gui/gui_video.h \
     156                 lib/gui/gui/gui_audio.h \
     157                 lib/gui/gui/gui_exec.h \
     158                 lib/gui/gui/gui_flags.h \
     159                 lib/gui/gui/gui_banner.h \
     160                 lib/gui/gui/gui_keys.h \
     161                 lib/gui/gui/gui_update.h
     162
     163libORXgui_a_CPPFLAGS=$(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
     164AM_LDFLAGS=$(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
     165
     166libORXgui_a_SOURCES = lib/gui/gui/gui.cc \
     167                            lib/gui/gui/gui_gtk.cc \
     168                            lib/gui/gui/gui_element.cc \
     169                            lib/gui/gui/gui_video.cc \
     170                            lib/gui/gui/gui_audio.cc \
     171                            lib/gui/gui/gui_exec.cc \
     172                            lib/gui/gui/gui_flags.cc \
     173                            lib/gui/gui/gui_banner.cc \
     174                            lib/gui/gui/gui_keys.cc \
     175                            lib/gui/gui/gui_update.cc
    150176
    151177

  • orxonox/branches/md2_loader/src/Makefile.in

    r4010 r4063  
    1616
    1717
    18 SOURCES = $(orxonox_SOURCES)
     18
     19SOURCES = $(libORXgui_a_SOURCES) $(orxonox_SOURCES)
    1920
    2021srcdir = @srcdir@
    … …  
    5051CONFIG_HEADER = $(top_builddir)/config.h
    5152CONFIG_CLEAN_FILES =
     53LIBRARIES = $(noinst_LIBRARIES)
     54AR = ar
     55ARFLAGS = cru
     56libORXgui_a_AR = $(AR) $(ARFLAGS)
     57libORXgui_a_LIBADD =
     58am_libORXgui_a_OBJECTS = libORXgui_a-gui.$(OBJEXT) \
     59        libORXgui_a-gui_gtk.$(OBJEXT) \
     60        libORXgui_a-gui_element.$(OBJEXT) \
     61        libORXgui_a-gui_video.$(OBJEXT) \
     62        libORXgui_a-gui_audio.$(OBJEXT) libORXgui_a-gui_exec.$(OBJEXT) \
     63        libORXgui_a-gui_flags.$(OBJEXT) \
     64        libORXgui_a-gui_banner.$(OBJEXT) \
     65        libORXgui_a-gui_keys.$(OBJEXT) \
     66        libORXgui_a-gui_update.$(OBJEXT)
     67libORXgui_a_OBJECTS = $(am_libORXgui_a_OBJECTS)
    5268am__installdirs = "$(DESTDIR)$(bindir)"
    5369binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    … …  
    7692        tinyxmlparser.$(OBJEXT)
    7793orxonox_OBJECTS = $(am_orxonox_OBJECTS)
    78 orxonox_LDADD = $(LDADD)
    7994DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    8095depcomp = $(SHELL) $(top_srcdir)/depcomp
    … …  
    96111@AMDEP_TRUE@    ./$(DEPDIR)/helper_parent.Po \
    97112@AMDEP_TRUE@    ./$(DEPDIR)/ini_parser.Po ./$(DEPDIR)/keynames.Po \
     113@AMDEP_TRUE@    ./$(DEPDIR)/libORXgui_a-gui.Po \
     114@AMDEP_TRUE@    ./$(DEPDIR)/libORXgui_a-gui_audio.Po \
     115@AMDEP_TRUE@    ./$(DEPDIR)/libORXgui_a-gui_banner.Po \
     116@AMDEP_TRUE@    ./$(DEPDIR)/libORXgui_a-gui_element.Po \
     117@AMDEP_TRUE@    ./$(DEPDIR)/libORXgui_a-gui_exec.Po \
     118@AMDEP_TRUE@    ./$(DEPDIR)/libORXgui_a-gui_flags.Po \
     119@AMDEP_TRUE@    ./$(DEPDIR)/libORXgui_a-gui_gtk.Po \
     120@AMDEP_TRUE@    ./$(DEPDIR)/libORXgui_a-gui_keys.Po \
     121@AMDEP_TRUE@    ./$(DEPDIR)/libORXgui_a-gui_update.Po \
     122@AMDEP_TRUE@    ./$(DEPDIR)/libORXgui_a-gui_video.Po \
    98123@AMDEP_TRUE@    ./$(DEPDIR)/light.Po ./$(DEPDIR)/list.Po \
    99124@AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/model.Po \
    … …  
    124149CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    125150        -o $@
    126 SOURCES = $(orxonox_SOURCES)
    127 DIST_SOURCES = $(orxonox_SOURCES)
     151SOURCES = $(libORXgui_a_SOURCES) $(orxonox_SOURCES)
     152DIST_SOURCES = $(libORXgui_a_SOURCES) $(orxonox_SOURCES)
    128153RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
    129154        html-recursive info-recursive install-data-recursive \
    … …  
    170195EXEEXT = @EXEEXT@
    171196GPROF = @GPROF@
    172 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    173 GTHREAD_LIBS = @GTHREAD_LIBS@
    174197GTK2_CFLAGS = @GTK2_CFLAGS@
    175198GTK2_LIBS = @GTK2_LIBS@
    176199HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    177200HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    178 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    179 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    180201HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    181202HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    198219PACKAGE_VERSION = @PACKAGE_VERSION@
    199220PATH_SEPARATOR = @PATH_SEPARATOR@
     221RANLIB = @RANLIB@
    200222SET_MAKE = @SET_MAKE@
    201223SHELL = @SHELL@
    … …  
    206228ac_ct_CC = @ac_ct_CC@
    207229ac_ct_CXX = @ac_ct_CXX@
     230ac_ct_RANLIB = @ac_ct_RANLIB@
    208231ac_ct_STRIP = @ac_ct_STRIP@
    209232am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    … …  
    247270target_vendor = @target_vendor@
    248271MAINSRCDIR = .
    249 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/graphics/particles -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common
    250 AM_LDFLAGS = $(MWINDOWS)
     272AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/graphics/particles -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/gui/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common
     273noinst_LIBRARIES = libORXgui.a
     274orxonox_DEPENDENCIES = libORXgui.a
     275orxonox_LDADD = libORXgui.a
    251276orxonox_SOURCES = orxonox.cc \
    252277                 game_loader.cc \
    … …  
    304329                 lib/xmlparser/tinystr.cc \
    305330                 lib/xmlparser/tinyxmlerror.cc \
    306                  lib/xmlparser/tinyxmlparser.cc
     331                 lib/xmlparser/tinyxmlparser.cc 
    307332
    308333noinst_HEADERS = orxonox.h \
    … …  
    365390                 lib/math/vector.h \
    366391                 lib/math/curve.h \
    367                  glmenu/glmenu_imagescreen.h
     392                 glmenu/glmenu_imagescreen.h \
     393                 lib/gui/gui/gui.h \
     394                 lib/gui/gui/gui_gtk.h \
     395                 lib/gui/gui/gui_element.h \
     396                 lib/gui/gui/gui_video.h \
     397                 lib/gui/gui/gui_audio.h \
     398                 lib/gui/gui/gui_exec.h \
     399                 lib/gui/gui/gui_flags.h \
     400                 lib/gui/gui/gui_banner.h \
     401                 lib/gui/gui/gui_keys.h \
     402                 lib/gui/gui/gui_update.h
     403
     404libORXgui_a_CPPFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS)
     405AM_LDFLAGS = $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
     406libORXgui_a_SOURCES = lib/gui/gui/gui.cc \
     407                            lib/gui/gui/gui_gtk.cc \
     408                            lib/gui/gui/gui_element.cc \
     409                            lib/gui/gui/gui_video.cc \
     410                            lib/gui/gui/gui_audio.cc \
     411                            lib/gui/gui/gui_exec.cc \
     412                            lib/gui/gui/gui_flags.cc \
     413                            lib/gui/gui/gui_banner.cc \
     414                            lib/gui/gui/gui_keys.cc \
     415                            lib/gui/gui/gui_update.cc
    368416
    369417EXTRA_DIST = orxonox.conf \
    … …  
    413461$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    414462        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
     463
     464clean-noinstLIBRARIES:
     465        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
     466libORXgui.a: $(libORXgui_a_OBJECTS) $(libORXgui_a_DEPENDENCIES)
     467        -rm -f libORXgui.a
     468        $(libORXgui_a_AR) libORXgui.a $(libORXgui_a_OBJECTS) $(libORXgui_a_LIBADD)
     469        $(RANLIB) libORXgui.a
    415470install-binPROGRAMS: $(bin_PROGRAMS)
    416471        @$(NORMAL_INSTALL)
    … …  
    468523@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ini_parser.Po@am__quote@
    469524@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keynames.Po@am__quote@
     525@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXgui_a-gui.Po@am__quote@
     526@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXgui_a-gui_audio.Po@am__quote@
     527@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXgui_a-gui_banner.Po@am__quote@
     528@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXgui_a-gui_element.Po@am__quote@
     529@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXgui_a-gui_exec.Po@am__quote@
     530@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXgui_a-gui_flags.Po@am__quote@
     531@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXgui_a-gui_gtk.Po@am__quote@
     532@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXgui_a-gui_keys.Po@am__quote@
     533@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXgui_a-gui_update.Po@am__quote@
     534@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libORXgui_a-gui_video.Po@am__quote@
    470535@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/light.Po@am__quote@
    471536@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@
    … …  
    518583@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    519584@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     585
     586libORXgui_a-gui.o: lib/gui/gui/gui.cc
     587@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui.o -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui.Tpo" -c -o libORXgui_a-gui.o `test -f 'lib/gui/gui/gui.cc' || echo '$(srcdir)/'`lib/gui/gui/gui.cc; \
     588@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui.Tpo" "$(DEPDIR)/libORXgui_a-gui.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui.Tpo"; exit 1; fi
     589@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui.cc' object='libORXgui_a-gui.o' libtool=no @AMDEPBACKSLASH@
     590@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui.TPo' @AMDEPBACKSLASH@
     591@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     592@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui.o `test -f 'lib/gui/gui/gui.cc' || echo '$(srcdir)/'`lib/gui/gui/gui.cc
     593
     594libORXgui_a-gui.obj: lib/gui/gui/gui.cc
     595@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui.obj -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui.Tpo" -c -o libORXgui_a-gui.obj `if test -f 'lib/gui/gui/gui.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui.cc'; fi`; \
     596@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui.Tpo" "$(DEPDIR)/libORXgui_a-gui.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui.Tpo"; exit 1; fi
     597@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui.cc' object='libORXgui_a-gui.obj' libtool=no @AMDEPBACKSLASH@
     598@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui.TPo' @AMDEPBACKSLASH@
     599@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     600@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui.obj `if test -f 'lib/gui/gui/gui.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui.cc'; fi`
     601
     602libORXgui_a-gui_gtk.o: lib/gui/gui/gui_gtk.cc
     603@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_gtk.o -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_gtk.Tpo" -c -o libORXgui_a-gui_gtk.o `test -f 'lib/gui/gui/gui_gtk.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_gtk.cc; \
     604@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_gtk.Tpo" "$(DEPDIR)/libORXgui_a-gui_gtk.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_gtk.Tpo"; exit 1; fi
     605@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_gtk.cc' object='libORXgui_a-gui_gtk.o' libtool=no @AMDEPBACKSLASH@
     606@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_gtk.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_gtk.TPo' @AMDEPBACKSLASH@
     607@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     608@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_gtk.o `test -f 'lib/gui/gui/gui_gtk.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_gtk.cc
     609
     610libORXgui_a-gui_gtk.obj: lib/gui/gui/gui_gtk.cc
     611@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_gtk.obj -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_gtk.Tpo" -c -o libORXgui_a-gui_gtk.obj `if test -f 'lib/gui/gui/gui_gtk.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_gtk.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_gtk.cc'; fi`; \
     612@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_gtk.Tpo" "$(DEPDIR)/libORXgui_a-gui_gtk.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_gtk.Tpo"; exit 1; fi
     613@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_gtk.cc' object='libORXgui_a-gui_gtk.obj' libtool=no @AMDEPBACKSLASH@
     614@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_gtk.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_gtk.TPo' @AMDEPBACKSLASH@
     615@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     616@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_gtk.obj `if test -f 'lib/gui/gui/gui_gtk.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_gtk.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_gtk.cc'; fi`
     617
     618libORXgui_a-gui_element.o: lib/gui/gui/gui_element.cc
     619@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_element.o -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_element.Tpo" -c -o libORXgui_a-gui_element.o `test -f 'lib/gui/gui/gui_element.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_element.cc; \
     620@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_element.Tpo" "$(DEPDIR)/libORXgui_a-gui_element.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_element.Tpo"; exit 1; fi
     621@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_element.cc' object='libORXgui_a-gui_element.o' libtool=no @AMDEPBACKSLASH@
     622@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_element.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_element.TPo' @AMDEPBACKSLASH@
     623@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     624@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_element.o `test -f 'lib/gui/gui/gui_element.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_element.cc
     625
     626libORXgui_a-gui_element.obj: lib/gui/gui/gui_element.cc
     627@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_element.obj -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_element.Tpo" -c -o libORXgui_a-gui_element.obj `if test -f 'lib/gui/gui/gui_element.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_element.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_element.cc'; fi`; \
     628@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_element.Tpo" "$(DEPDIR)/libORXgui_a-gui_element.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_element.Tpo"; exit 1; fi
     629@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_element.cc' object='libORXgui_a-gui_element.obj' libtool=no @AMDEPBACKSLASH@
     630@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_element.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_element.TPo' @AMDEPBACKSLASH@
     631@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     632@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_element.obj `if test -f 'lib/gui/gui/gui_element.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_element.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_element.cc'; fi`
     633
     634libORXgui_a-gui_video.o: lib/gui/gui/gui_video.cc
     635@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_video.o -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_video.Tpo" -c -o libORXgui_a-gui_video.o `test -f 'lib/gui/gui/gui_video.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_video.cc; \
     636@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_video.Tpo" "$(DEPDIR)/libORXgui_a-gui_video.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_video.Tpo"; exit 1; fi
     637@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_video.cc' object='libORXgui_a-gui_video.o' libtool=no @AMDEPBACKSLASH@
     638@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_video.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_video.TPo' @AMDEPBACKSLASH@
     639@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     640@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_video.o `test -f 'lib/gui/gui/gui_video.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_video.cc
     641
     642libORXgui_a-gui_video.obj: lib/gui/gui/gui_video.cc
     643@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_video.obj -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_video.Tpo" -c -o libORXgui_a-gui_video.obj `if test -f 'lib/gui/gui/gui_video.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_video.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_video.cc'; fi`; \
     644@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_video.Tpo" "$(DEPDIR)/libORXgui_a-gui_video.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_video.Tpo"; exit 1; fi
     645@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_video.cc' object='libORXgui_a-gui_video.obj' libtool=no @AMDEPBACKSLASH@
     646@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_video.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_video.TPo' @AMDEPBACKSLASH@
     647@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     648@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_video.obj `if test -f 'lib/gui/gui/gui_video.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_video.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_video.cc'; fi`
     649
     650libORXgui_a-gui_audio.o: lib/gui/gui/gui_audio.cc
     651@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_audio.o -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_audio.Tpo" -c -o libORXgui_a-gui_audio.o `test -f 'lib/gui/gui/gui_audio.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_audio.cc; \
     652@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_audio.Tpo" "$(DEPDIR)/libORXgui_a-gui_audio.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_audio.Tpo"; exit 1; fi
     653@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_audio.cc' object='libORXgui_a-gui_audio.o' libtool=no @AMDEPBACKSLASH@
     654@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_audio.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_audio.TPo' @AMDEPBACKSLASH@
     655@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     656@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_audio.o `test -f 'lib/gui/gui/gui_audio.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_audio.cc
     657
     658libORXgui_a-gui_audio.obj: lib/gui/gui/gui_audio.cc
     659@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_audio.obj -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_audio.Tpo" -c -o libORXgui_a-gui_audio.obj `if test -f 'lib/gui/gui/gui_audio.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_audio.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_audio.cc'; fi`; \
     660@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_audio.Tpo" "$(DEPDIR)/libORXgui_a-gui_audio.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_audio.Tpo"; exit 1; fi
     661@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_audio.cc' object='libORXgui_a-gui_audio.obj' libtool=no @AMDEPBACKSLASH@
     662@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_audio.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_audio.TPo' @AMDEPBACKSLASH@
     663@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     664@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_audio.obj `if test -f 'lib/gui/gui/gui_audio.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_audio.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_audio.cc'; fi`
     665
     666libORXgui_a-gui_exec.o: lib/gui/gui/gui_exec.cc
     667@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_exec.o -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_exec.Tpo" -c -o libORXgui_a-gui_exec.o `test -f 'lib/gui/gui/gui_exec.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_exec.cc; \
     668@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_exec.Tpo" "$(DEPDIR)/libORXgui_a-gui_exec.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_exec.Tpo"; exit 1; fi
     669@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_exec.cc' object='libORXgui_a-gui_exec.o' libtool=no @AMDEPBACKSLASH@
     670@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_exec.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_exec.TPo' @AMDEPBACKSLASH@
     671@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     672@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_exec.o `test -f 'lib/gui/gui/gui_exec.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_exec.cc
     673
     674libORXgui_a-gui_exec.obj: lib/gui/gui/gui_exec.cc
     675@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_exec.obj -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_exec.Tpo" -c -o libORXgui_a-gui_exec.obj `if test -f 'lib/gui/gui/gui_exec.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_exec.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_exec.cc'; fi`; \
     676@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_exec.Tpo" "$(DEPDIR)/libORXgui_a-gui_exec.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_exec.Tpo"; exit 1; fi
     677@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_exec.cc' object='libORXgui_a-gui_exec.obj' libtool=no @AMDEPBACKSLASH@
     678@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_exec.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_exec.TPo' @AMDEPBACKSLASH@
     679@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     680@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_exec.obj `if test -f 'lib/gui/gui/gui_exec.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_exec.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_exec.cc'; fi`
     681
     682libORXgui_a-gui_flags.o: lib/gui/gui/gui_flags.cc
     683@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_flags.o -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_flags.Tpo" -c -o libORXgui_a-gui_flags.o `test -f 'lib/gui/gui/gui_flags.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_flags.cc; \
     684@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_flags.Tpo" "$(DEPDIR)/libORXgui_a-gui_flags.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_flags.Tpo"; exit 1; fi
     685@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_flags.cc' object='libORXgui_a-gui_flags.o' libtool=no @AMDEPBACKSLASH@
     686@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_flags.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_flags.TPo' @AMDEPBACKSLASH@
     687@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     688@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_flags.o `test -f 'lib/gui/gui/gui_flags.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_flags.cc
     689
     690libORXgui_a-gui_flags.obj: lib/gui/gui/gui_flags.cc
     691@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_flags.obj -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_flags.Tpo" -c -o libORXgui_a-gui_flags.obj `if test -f 'lib/gui/gui/gui_flags.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_flags.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_flags.cc'; fi`; \
     692@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_flags.Tpo" "$(DEPDIR)/libORXgui_a-gui_flags.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_flags.Tpo"; exit 1; fi
     693@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_flags.cc' object='libORXgui_a-gui_flags.obj' libtool=no @AMDEPBACKSLASH@
     694@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_flags.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_flags.TPo' @AMDEPBACKSLASH@
     695@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     696@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_flags.obj `if test -f 'lib/gui/gui/gui_flags.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_flags.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_flags.cc'; fi`
     697
     698libORXgui_a-gui_banner.o: lib/gui/gui/gui_banner.cc
     699@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_banner.o -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_banner.Tpo" -c -o libORXgui_a-gui_banner.o `test -f 'lib/gui/gui/gui_banner.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_banner.cc; \
     700@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_banner.Tpo" "$(DEPDIR)/libORXgui_a-gui_banner.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_banner.Tpo"; exit 1; fi
     701@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_banner.cc' object='libORXgui_a-gui_banner.o' libtool=no @AMDEPBACKSLASH@
     702@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_banner.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_banner.TPo' @AMDEPBACKSLASH@
     703@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     704@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_banner.o `test -f 'lib/gui/gui/gui_banner.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_banner.cc
     705
     706libORXgui_a-gui_banner.obj: lib/gui/gui/gui_banner.cc
     707@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_banner.obj -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_banner.Tpo" -c -o libORXgui_a-gui_banner.obj `if test -f 'lib/gui/gui/gui_banner.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_banner.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_banner.cc'; fi`; \
     708@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_banner.Tpo" "$(DEPDIR)/libORXgui_a-gui_banner.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_banner.Tpo"; exit 1; fi
     709@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_banner.cc' object='libORXgui_a-gui_banner.obj' libtool=no @AMDEPBACKSLASH@
     710@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_banner.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_banner.TPo' @AMDEPBACKSLASH@
     711@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     712@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_banner.obj `if test -f 'lib/gui/gui/gui_banner.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_banner.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_banner.cc'; fi`
     713
     714libORXgui_a-gui_keys.o: lib/gui/gui/gui_keys.cc
     715@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_keys.o -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_keys.Tpo" -c -o libORXgui_a-gui_keys.o `test -f 'lib/gui/gui/gui_keys.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_keys.cc; \
     716@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_keys.Tpo" "$(DEPDIR)/libORXgui_a-gui_keys.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_keys.Tpo"; exit 1; fi
     717@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_keys.cc' object='libORXgui_a-gui_keys.o' libtool=no @AMDEPBACKSLASH@
     718@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_keys.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_keys.TPo' @AMDEPBACKSLASH@
     719@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     720@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_keys.o `test -f 'lib/gui/gui/gui_keys.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_keys.cc
     721
     722libORXgui_a-gui_keys.obj: lib/gui/gui/gui_keys.cc
     723@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_keys.obj -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_keys.Tpo" -c -o libORXgui_a-gui_keys.obj `if test -f 'lib/gui/gui/gui_keys.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_keys.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_keys.cc'; fi`; \
     724@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_keys.Tpo" "$(DEPDIR)/libORXgui_a-gui_keys.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_keys.Tpo"; exit 1; fi
     725@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_keys.cc' object='libORXgui_a-gui_keys.obj' libtool=no @AMDEPBACKSLASH@
     726@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_keys.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_keys.TPo' @AMDEPBACKSLASH@
     727@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     728@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_keys.obj `if test -f 'lib/gui/gui/gui_keys.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_keys.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_keys.cc'; fi`
     729
     730libORXgui_a-gui_update.o: lib/gui/gui/gui_update.cc
     731@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_update.o -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_update.Tpo" -c -o libORXgui_a-gui_update.o `test -f 'lib/gui/gui/gui_update.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_update.cc; \
     732@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_update.Tpo" "$(DEPDIR)/libORXgui_a-gui_update.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_update.Tpo"; exit 1; fi
     733@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_update.cc' object='libORXgui_a-gui_update.o' libtool=no @AMDEPBACKSLASH@
     734@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_update.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_update.TPo' @AMDEPBACKSLASH@
     735@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     736@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_update.o `test -f 'lib/gui/gui/gui_update.cc' || echo '$(srcdir)/'`lib/gui/gui/gui_update.cc
     737
     738libORXgui_a-gui_update.obj: lib/gui/gui/gui_update.cc
     739@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libORXgui_a-gui_update.obj -MD -MP -MF "$(DEPDIR)/libORXgui_a-gui_update.Tpo" -c -o libORXgui_a-gui_update.obj `if test -f 'lib/gui/gui/gui_update.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_update.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_update.cc'; fi`; \
     740@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/libORXgui_a-gui_update.Tpo" "$(DEPDIR)/libORXgui_a-gui_update.Po"; else rm -f "$(DEPDIR)/libORXgui_a-gui_update.Tpo"; exit 1; fi
     741@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/gui/gui/gui_update.cc' object='libORXgui_a-gui_update.obj' libtool=no @AMDEPBACKSLASH@
     742@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/libORXgui_a-gui_update.Po' tmpdepfile='$(DEPDIR)/libORXgui_a-gui_update.TPo' @AMDEPBACKSLASH@
     743@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     744@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_update.obj `if test -f 'lib/gui/gui/gui_update.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_update.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_update.cc'; fi`
    520745
    521746camera.o: world_entities/camera.cc
    … …  
    14091634
    14101635distdir: $(DISTFILES)
    1411         $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics $(distdir)/lib/graphics/particles $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/network $(distdir)/proto $(distdir)/story_entities $(distdir)/util $(distdir)/util/animation $(distdir)/util/common $(distdir)/world_entities
     1636        $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics $(distdir)/lib/graphics/particles $(distdir)/lib/gui/gui $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/network $(distdir)/proto $(distdir)/story_entities $(distdir)/util $(distdir)/util/animation $(distdir)/util/common $(distdir)/world_entities
    14121637        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    14131638        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
    … …  
    14511676check-am: all-am
    14521677check: check-recursive
    1453 all-am: Makefile $(PROGRAMS) $(HEADERS)
     1678all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS)
    14541679installdirs: installdirs-recursive
    14551680installdirs-am:
    … …  
    14831708clean: clean-recursive
    14841709
    1485 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
     1710clean-am: clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \
     1711        mostlyclean-am
    14861712
    14871713distclean: distclean-recursive
    … …  
    15331759
    15341760.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
    1535         clean clean-binPROGRAMS clean-generic clean-recursive ctags \
    1536         ctags-recursive distclean distclean-compile distclean-generic \
    1537         distclean-recursive distclean-tags distdir dvi dvi-am html \
    1538         html-am info info-am install install-am install-binPROGRAMS \
    1539         install-data install-data-am install-exec install-exec-am \
    1540         install-info install-info-am install-man install-strip \
    1541         installcheck installcheck-am installdirs installdirs-am \
    1542         maintainer-clean maintainer-clean-generic \
    1543         maintainer-clean-recursive mostlyclean mostlyclean-compile \
    1544         mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
    1545         tags tags-recursive uninstall uninstall-am \
    1546         uninstall-binPROGRAMS uninstall-info-am
     1761        clean clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \
     1762        clean-recursive ctags ctags-recursive distclean \
     1763        distclean-compile distclean-generic distclean-recursive \
     1764        distclean-tags distdir dvi dvi-am html html-am info info-am \
     1765        install install-am install-binPROGRAMS install-data \
     1766        install-data-am install-exec install-exec-am install-info \
     1767        install-info-am install-man install-strip installcheck \
     1768        installcheck-am installdirs installdirs-am maintainer-clean \
     1769        maintainer-clean-generic maintainer-clean-recursive \
     1770        mostlyclean mostlyclean-compile mostlyclean-generic \
     1771        mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
     1772        uninstall uninstall-am uninstall-binPROGRAMS uninstall-info-am
    15471773
    15481774

  • orxonox/branches/md2_loader/src/lib/Makefile.in

    r3789 r4063  
    8989EXEEXT = @EXEEXT@
    9090GPROF = @GPROF@
    91 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    92 GTHREAD_LIBS = @GTHREAD_LIBS@
    9391GTK2_CFLAGS = @GTK2_CFLAGS@
    9492GTK2_LIBS = @GTK2_LIBS@
    9593HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    9694HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    97 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    98 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    9995HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    10096HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    117113PACKAGE_VERSION = @PACKAGE_VERSION@
    118114PATH_SEPARATOR = @PATH_SEPARATOR@
     115RANLIB = @RANLIB@
    119116SET_MAKE = @SET_MAKE@
    120117SHELL = @SHELL@
    … …  
    125122ac_ct_CC = @ac_ct_CC@
    126123ac_ct_CXX = @ac_ct_CXX@
     124ac_ct_RANLIB = @ac_ct_RANLIB@
    127125ac_ct_STRIP = @ac_ct_STRIP@
    128126am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

  • orxonox/branches/md2_loader/src/lib/graphics/Makefile.in

    r3789 r4063  
    8989EXEEXT = @EXEEXT@
    9090GPROF = @GPROF@
    91 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    92 GTHREAD_LIBS = @GTHREAD_LIBS@
    9391GTK2_CFLAGS = @GTK2_CFLAGS@
    9492GTK2_LIBS = @GTK2_LIBS@
    9593HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    9694HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    97 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    98 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    9995HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    10096HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    117113PACKAGE_VERSION = @PACKAGE_VERSION@
    118114PATH_SEPARATOR = @PATH_SEPARATOR@
     115RANLIB = @RANLIB@
    119116SET_MAKE = @SET_MAKE@
    120117SHELL = @SHELL@
    … …  
    125122ac_ct_CC = @ac_ct_CC@
    126123ac_ct_CXX = @ac_ct_CXX@
     124ac_ct_RANLIB = @ac_ct_RANLIB@
    127125ac_ct_STRIP = @ac_ct_STRIP@
    128126am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

  • orxonox/branches/md2_loader/src/lib/graphics/importer/Makefile.in

    r3907 r4063  
    119119EXEEXT = @EXEEXT@
    120120GPROF = @GPROF@
    121 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    122 GTHREAD_LIBS = @GTHREAD_LIBS@
    123121GTK2_CFLAGS = @GTK2_CFLAGS@
    124122GTK2_LIBS = @GTK2_LIBS@
    125123HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    126124HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    127 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    128 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    129125HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    130126HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    147143PACKAGE_VERSION = @PACKAGE_VERSION@
    148144PATH_SEPARATOR = @PATH_SEPARATOR@
     145RANLIB = @RANLIB@
    149146SET_MAKE = @SET_MAKE@
    150147SHELL = @SHELL@
    … …  
    155152ac_ct_CC = @ac_ct_CC@
    156153ac_ct_CXX = @ac_ct_CXX@
     154ac_ct_RANLIB = @ac_ct_RANLIB@
    157155ac_ct_STRIP = @ac_ct_STRIP@
    158156am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

  • orxonox/branches/md2_loader/src/lib/graphics/importer/model.cc

    r4023 r4063  
    3535*/
    3636ModelFaceElement::ModelFaceElement()
    37 {}
     37{
     38  this->next = NULL;
     39}
    3840
    3941/**
    … …  
    4244ModelFaceElement::~ModelFaceElement()
    4345{
     46  if (this->next)
     47    delete this->next;
     48}
     49
     50/**
     51   \brief creates a new ModelFace
     52*/
     53ModelFace::ModelFace()
     54{
     55  this->vertexCount = 0;
     56
     57  this->firstElem = NULL;
     58 
     59  this->material = NULL;
     60 
     61  this->next = NULL;
     62
     63}
     64
     65/**
     66   \brief deletes a ModelFace
     67*/
     68ModelFace::~ModelFace()
     69{
     70  PRINTF(5)("Cleaning up Face\n");
     71
     72  if (this->firstElem != NULL)
     73    delete this->firstElem;
     74 
    4475  if (this->next != NULL)
    4576    delete this->next;
    46 }
    47 
    48 /**
    49    \brief creates a new ModelFace
    50 */
    51 ModelFace::ModelFace()
    52 {
    53   this->vertexCount = 0;
    54 
    55   this->firstElem = NULL;
    56  
    57   this->material = NULL;
    58  
    59   this->next = NULL;
    60 
    61 }
    62 
    63 /**
    64    \brief deletes a ModelFace
    65 */
    66 ModelFace::~ModelFace()
    67 {
    68   PRINTF(5)("Cleaning up Face\n");
    69 
    70   if (this->firstElem != NULL)
    71     {
    72       delete this->firstElem;
    73     }
    74      
    75   if (this->next != NULL)
    76     {
    77       delete this->next;
    78     }
    79 
    8077}
    8178
    … …  
    10299  PRINTF(5)("Cleaning up group\n");
    103100  if (this->firstFace != NULL)
    104     {
    105       delete this->firstFace;
    106     }
     101    delete this->firstFace;
    107102
    108103  if (this->next !=NULL)
    … …  
    175170
    176171  PRINTF(5)("Deleting display Lists.\n");
    177   ModelGroup* walker = this->firstGroup;
    178   while (walker != NULL)
    179     {
    180       glDeleteLists (walker->listNumber, 1);
    181       ModelGroup* delWalker = walker;
    182       walker = walker->next;
    183       delete delWalker;
    184     }
     172  delete this->firstGroup;
    185173
    186174  // deleting Arrays
    … …  
    191179  tIterator<Material>* tmpIt = this->materialList->getIterator();
    192180  Material* material = tmpIt->nextElement();
     181
     182  //! \todo do we really have to delete this material??
    193183  while(material)
    194184    {
    … …  
    227217{
    228218  PRINTF(4)("drawing the 3D-Models\n");
    229   ModelGroup* walker = this->firstGroup;
    230   while (walker != NULL)
    231     {
    232       PRINTF(5)("Drawing model %s\n", walker->name);
    233       glCallList (walker->listNumber);
    234       walker = walker->next;
     219  ModelGroup* tmpGroup = this->firstGroup;
     220  while (tmpGroup != NULL)
     221    {
     222      PRINTF(5)("Drawing model %s\n", tmpGroup->name);
     223      glCallList (tmpGroup->listNumber);
     224      tmpGroup = tmpGroup->next;
    235225    }
    236226}
    … …  
    250240    }
    251241  PRINTF(4)("drawing the requested 3D-Models if found.\n");
    252   ModelGroup* walker = this->firstGroup;
     242  ModelGroup* tmpGroup = this->firstGroup;
    253243  int counter = 0;
    254   while (walker != NULL)
     244  while (tmpGroup != NULL)
    255245    {
    256246      if (counter == groupNumber)
    257247        {
    258           PRINTF(4)("Drawing model number %i named %s\n", counter, walker->name);
    259           glCallList (walker->listNumber);
     248          PRINTF(4)("Drawing model number %i named %s\n", counter, tmpGroup->name);
     249          glCallList (tmpGroup->listNumber);
    260250          return;
    261251        }
    262252      ++counter;
    263       walker = walker->next;
     253      tmpGroup = tmpGroup->next;
    264254    }
    265255  PRINTF(2)("Model number %i in %s not Found.\n", groupNumber, this->name);
    … …  
    277267{
    278268  PRINTF(4)("drawing the requested 3D-Models if found.\n");
    279   ModelGroup* walker = this->firstGroup;
    280   while (walker != NULL)
    281     {
    282       if (!strcmp(walker->name, groupName))
     269  ModelGroup* tmpGroup = this->firstGroup;
     270  while (tmpGroup != NULL)
     271    {
     272      if (!strcmp(tmpGroup->name, groupName))
    283273        {
    284           PRINTF(4)("Drawing model %s\n", walker->name);
    285           glCallList (walker->listNumber);
     274          PRINTF(4)("Drawing model %s\n", tmpGroup->name);
     275          glCallList (tmpGroup->listNumber);
    286276          return;
    287277        }
    288       walker = walker->next;
     278      tmpGroup = tmpGroup->next;
    289279    }
    290280  PRINTF(2)("Model Named %s in %s not Found.\n", groupName, this->name);
    291281  return;
    292 }
    293 
    294 /**
    295    \returns Count of the Models in this File
    296 */
    297 int Model::getGroupCount (void) const
    298 {
    299   return this->groupCount;
    300282}
    301283
    … …  
    331313  if (this->normals)
    332314    delete this->normals;
     315
    333316  this->vertices = NULL;
    334317  this->vTexture = NULL;
    … …  
    410393   With it you should be able to create Models with more than one SubModel inside
    411394*/
    412 bool Model::addGroup (const char* groupString)
     395bool Model::addGroup(const char* groupString)
    413396{
    414397  PRINTF(5)("Read Group: %s.\n", groupString);
    … …  
    594577 
    595578  ModelFaceElement* tmpElem = this->currentGroup->currentFace->firstElem = new ModelFaceElement;
    596   tmpElem->next = NULL;
    597579 
    598580  va_list itemlist;
    … …  
    603585      if (this->currentGroup->currentFace->vertexCount>0)
    604586        tmpElem = tmpElem->next = new ModelFaceElement;
    605       tmpElem->next = NULL;
    606587
    607588      tmpElem->vertexNumber = va_arg (itemlist, int) -1;
    … …  
    834815  glNormalPointer(3, 0, this->normals->getArray());
    835816  glTexCoordPointer(2, GL_FLOAT, 0, this->vTexture->getArray());
    836 
    837817}
    838818
    … …  
    859839  if (elem->vertexNumber != -1)
    860840    glVertex3fv(this->vertices->getArray() + elem->vertexNumber * 3);
    861 
    862841}
    863842

  • orxonox/branches/md2_loader/src/lib/graphics/importer/model.h

    r4023 r4063  
    139139  void draw(int groupNumber) const;
    140140  void draw(char* groupName) const;
    141   int getGroupCount() const;
     141
     142  /** \returns Count of the Models (Groups) in this File */
     143  inline int getGroupCount(void) const {return this->groupCount;}
    142144
    143145  Material* addMaterial(Material* material);

  • orxonox/branches/md2_loader/src/lib/graphics/importer/objModel.cc

    r3916 r4063  
    196196  this->mtlFileName = new char [strlen(mtlFile)+1];
    197197  strcpy(this->mtlFileName, mtlFile);
    198   char* fileName = new char [strlen(objPath) + strlen(this->mtlFileName)+1];
    199   strcpy(fileName, this->objPath);
    200   strcat(fileName, this->mtlFileName);
     198  char* fileName = new char [strlen(this->objPath) + strlen(this->mtlFileName)+1];
     199  sprintf(fileName, "%s%s", this->objPath, this->mtlFileName);
    201200 
    202201

  • orxonox/branches/md2_loader/src/lib/gui/Makefile.in

    r3789 r4063  
    8989EXEEXT = @EXEEXT@
    9090GPROF = @GPROF@
    91 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    92 GTHREAD_LIBS = @GTHREAD_LIBS@
    9391GTK2_CFLAGS = @GTK2_CFLAGS@
    9492GTK2_LIBS = @GTK2_LIBS@
    9593HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    9694HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    97 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    98 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    9995HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    10096HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    117113PACKAGE_VERSION = @PACKAGE_VERSION@
    118114PATH_SEPARATOR = @PATH_SEPARATOR@
     115RANLIB = @RANLIB@
    119116SET_MAKE = @SET_MAKE@
    120117SHELL = @SHELL@
    … …  
    125122ac_ct_CC = @ac_ct_CC@
    126123ac_ct_CXX = @ac_ct_CXX@
     124ac_ct_RANLIB = @ac_ct_RANLIB@
    127125ac_ct_STRIP = @ac_ct_STRIP@
    128126am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

  • orxonox/branches/md2_loader/src/lib/gui/console/Makefile.in

    r3789 r4063  
    107107EXEEXT = @EXEEXT@
    108108GPROF = @GPROF@
    109 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    110 GTHREAD_LIBS = @GTHREAD_LIBS@
    111109GTK2_CFLAGS = @GTK2_CFLAGS@
    112110GTK2_LIBS = @GTK2_LIBS@
    113111HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    114112HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    115 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    116 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    117113HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    118114HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    136132PACKAGE_VERSION = @PACKAGE_VERSION@
    137133PATH_SEPARATOR = @PATH_SEPARATOR@
     134RANLIB = @RANLIB@
    138135SET_MAKE = @SET_MAKE@
    139136SHELL = @SHELL@
    … …  
    144141ac_ct_CC = @ac_ct_CC@
    145142ac_ct_CXX = @ac_ct_CXX@
     143ac_ct_RANLIB = @ac_ct_RANLIB@
    146144ac_ct_STRIP = @ac_ct_STRIP@
    147145am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

  • orxonox/branches/md2_loader/src/lib/gui/gui/Makefile.am

    r4024 r4063  
    1111AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
    1212AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui
     13AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gui
    1314AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang
    1415AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util
    … …  
    2425
    2526bin_PROGRAMS=gui
    26 gui_SOURCES=orxonox_gui.cc \
    27             orxonox_gui_gtk.cc \
    28             orxonox_gui_element.cc \
    29             orxonox_gui_video.cc \
    30             orxonox_gui_audio.cc \
    31             orxonox_gui_exec.cc \
    32             orxonox_gui_flags.cc \
    33             orxonox_gui_banner.cc \
    34             orxonox_gui_keys.cc \
    35             orxonox_gui_update.cc
     27gui_SOURCES=gui_main.cc \
     28            gui.cc \
     29            gui_gtk.cc \
     30            gui_element.cc \
     31            gui_video.cc \
     32            gui_audio.cc \
     33            gui_exec.cc \
     34            gui_flags.cc \
     35            gui_banner.cc \
     36            gui_keys.cc \
     37            gui_update.cc
    3638
    37 noinst_HEADERS=orxonox_gui.h \
    38             orxonox_gui_gtk.h \
    39             orxonox_gui_element.h \
    40             orxonox_gui_video.h \
    41             orxonox_gui_audio.h \
    42             orxonox_gui_exec.h \
    43             orxonox_gui_flags.h \
    44             orxonox_gui_banner.h \
    45             orxonox_gui_keys.h \
    46             orxonox_gui_update.h
     39noinst_HEADERS=gui.h \
     40            gui_gtk.h \
     41            gui_element.h \
     42            gui_video.h \
     43            gui_audio.h \
     44            gui_exec.h \
     45            gui_flags.h \
     46            gui_banner.h \
     47            gui_keys.h \
     48            gui_update.h
    4749
    4850#  uncomment the following if orxonox requires the mathlibrary

  • orxonox/branches/md2_loader/src/lib/gui/gui/Makefile.in

    r4024 r4063  
    5353binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    5454PROGRAMS = $(bin_PROGRAMS)
    55 am_gui_OBJECTS = orxonox_gui.$(OBJEXT) orxonox_gui_gtk.$(OBJEXT) \
    56         orxonox_gui_element.$(OBJEXT) orxonox_gui_video.$(OBJEXT) \
    57         orxonox_gui_audio.$(OBJEXT) orxonox_gui_exec.$(OBJEXT) \
    58         orxonox_gui_flags.$(OBJEXT) orxonox_gui_banner.$(OBJEXT) \
    59         orxonox_gui_keys.$(OBJEXT) orxonox_gui_update.$(OBJEXT)
     55am_gui_OBJECTS = gui_main.$(OBJEXT) gui.$(OBJEXT) gui_gtk.$(OBJEXT) \
     56        gui_element.$(OBJEXT) gui_video.$(OBJEXT) gui_audio.$(OBJEXT) \
     57        gui_exec.$(OBJEXT) gui_flags.$(OBJEXT) gui_banner.$(OBJEXT) \
     58        gui_keys.$(OBJEXT) gui_update.$(OBJEXT)
    6059gui_OBJECTS = $(am_gui_OBJECTS)
    6160gui_LDADD = $(LDADD)
    … …  
    6362depcomp = $(SHELL) $(top_srcdir)/depcomp
    6463am__depfiles_maybe = depfiles
    65 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/orxonox_gui.Po \
    66 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_audio.Po \
    67 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_banner.Po \
    68 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_element.Po \
    69 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_exec.Po \
    70 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_flags.Po \
    71 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_gtk.Po \
    72 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_keys.Po \
    73 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_update.Po \
    74 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox_gui_video.Po
     64@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gui.Po ./$(DEPDIR)/gui_audio.Po \
     65@AMDEP_TRUE@    ./$(DEPDIR)/gui_banner.Po \
     66@AMDEP_TRUE@    ./$(DEPDIR)/gui_element.Po ./$(DEPDIR)/gui_exec.Po \
     67@AMDEP_TRUE@    ./$(DEPDIR)/gui_flags.Po ./$(DEPDIR)/gui_gtk.Po \
     68@AMDEP_TRUE@    ./$(DEPDIR)/gui_keys.Po ./$(DEPDIR)/gui_main.Po \
     69@AMDEP_TRUE@    ./$(DEPDIR)/gui_update.Po ./$(DEPDIR)/gui_video.Po
    7570CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    7671        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    … …  
    117112EXEEXT = @EXEEXT@
    118113GPROF = @GPROF@
    119 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    120 GTHREAD_LIBS = @GTHREAD_LIBS@
    121114GTK2_CFLAGS = @GTK2_CFLAGS@
    122115GTK2_LIBS = @GTK2_LIBS@
    123116HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    124117HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    125 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    126 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    127118HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    128119HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    145136PACKAGE_VERSION = @PACKAGE_VERSION@
    146137PATH_SEPARATOR = @PATH_SEPARATOR@
     138RANLIB = @RANLIB@
    147139SET_MAKE = @SET_MAKE@
    148140SHELL = @SHELL@
    … …  
    153145ac_ct_CC = @ac_ct_CC@
    154146ac_ct_CXX = @ac_ct_CXX@
     147ac_ct_RANLIB = @ac_ct_RANLIB@
    155148ac_ct_STRIP = @ac_ct_STRIP@
    156149am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    … …  
    194187target_vendor = @target_vendor@
    195188MAINSRCDIR = ../../..
    196 AM_CXXFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS) -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/font -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
     189AM_CXXFLAGS = $(GTK2_CFLAGS) $(GTHREAD_CFLAGS) $(CURL_CFLAGS) $(MSBITFIELDS) -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/font -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/gui/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
    197190
    198191#AM_LDFLAGS=$(GTK2_LIBS)   $(GTHREAD_LIBS)
    199192AM_LDFLAGS = $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
    200 gui_SOURCES = orxonox_gui.cc \
    201             orxonox_gui_gtk.cc \
    202             orxonox_gui_element.cc \
    203             orxonox_gui_video.cc \
    204             orxonox_gui_audio.cc \
    205             orxonox_gui_exec.cc \
    206             orxonox_gui_flags.cc \
    207             orxonox_gui_banner.cc \
    208             orxonox_gui_keys.cc \
    209             orxonox_gui_update.cc
    210 
    211 noinst_HEADERS = orxonox_gui.h \
    212             orxonox_gui_gtk.h \
    213             orxonox_gui_element.h \
    214             orxonox_gui_video.h \
    215             orxonox_gui_audio.h \
    216             orxonox_gui_exec.h \
    217             orxonox_gui_flags.h \
    218             orxonox_gui_banner.h \
    219             orxonox_gui_keys.h \
    220             orxonox_gui_update.h
     193gui_SOURCES = gui_main.cc \
     194            gui.cc \
     195            gui_gtk.cc \
     196            gui_element.cc \
     197            gui_video.cc \
     198            gui_audio.cc \
     199            gui_exec.cc \
     200            gui_flags.cc \
     201            gui_banner.cc \
     202            gui_keys.cc \
     203            gui_update.cc
     204
     205noinst_HEADERS = gui.h \
     206            gui_gtk.h \
     207            gui_element.h \
     208            gui_video.h \
     209            gui_audio.h \
     210            gui_exec.h \
     211            gui_flags.h \
     212            gui_banner.h \
     213            gui_keys.h \
     214            gui_update.h
    221215
    222216
    … …  
    296290        -rm -f *.tab.c
    297291
    298 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui.Po@am__quote@
    299 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_audio.Po@am__quote@
    300 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_banner.Po@am__quote@
    301 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_element.Po@am__quote@
    302 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_exec.Po@am__quote@
    303 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_flags.Po@am__quote@
    304 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_gtk.Po@am__quote@
    305 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_keys.Po@am__quote@
    306 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_update.Po@am__quote@
    307 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox_gui_video.Po@am__quote@
     292@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui.Po@am__quote@
     293@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_audio.Po@am__quote@
     294@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_banner.Po@am__quote@
     295@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_element.Po@am__quote@
     296@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_exec.Po@am__quote@
     297@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_flags.Po@am__quote@
     298@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_gtk.Po@am__quote@
     299@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_keys.Po@am__quote@
     300@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_main.Po@am__quote@
     301@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_update.Po@am__quote@
     302@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui_video.Po@am__quote@
    308303
    309304.cc.o:

  • orxonox/branches/md2_loader/src/lib/gui/gui/rc

    r3423 r4063  
    1 # pixmap_path "<dir 1>:<dir 2>:<dir 3>:..."
    2 #
    3 pixmap_path "/usr/include/X11R6/pixmaps:/home/imain/pixmaps"
    4 #
    5 # style <name> [= <name>]
    6 # {
    7 #   <option>
    8 # }
    9 #
    10 # widget <widget_set> style <style_name>
    11 # widget_class <widget_class_set> style <style_name>
     1static const gchar* rc_string =
     2(       
     3"style'window'"
     4"{"                     
     5"bg[NORMAL] = { 0, 0, 0 }"
     6"fg[NORMAL] = { 0, 1.0, 0 }"
     7"base[NORMAL] = { 0, 0, 0 }"
     8"base[INSENSITIVE] = { 0, 0, 0 }"
     9"}"
    1210
    13 # Here is a list of all the possible states.  Note that some do not apply to
    14 # certain widgets.
    15 #
    16 # NORMAL - The normal state of a widget, without the mouse over top of
    17 # it, and not being pressed, etc.
    18 #
    19 # PRELIGHT - When the mouse is over top of the widget, colors defined
    20 # using this state will be in effect.
    21 #
    22 # ACTIVE - When the widget is pressed or clicked it will be active, and
    23 # the attributes assigned by this tag will be in effect.
    24 #
    25 # INSENSITIVE - When a widget is set insensitive, and cannot be
    26 # activated, it will take these attributes.
    27 #
    28 # SELECTED - When an object is selected, it takes these attributes.
    29 #
    30 # Given these states, we can set the attributes of the widgets in each of
    31 # these states using the following directives.
    32 #
    33 # fg - Sets the foreground color of a widget.
    34 # bg - Sets the background color of a widget.
    35 # bg_pixmap - Sets the background of a widget to a tiled pixmap.
    36 # font - Sets the font to be used with the given widget.
    37 #
     11"style'scale'"
     12"{"
     13"fg[NORMAL] = { 0, 1.0, 0 }"
     14"bg[NORMAL] = { 0, 1.0, 0 }"
     15"bg[INSENSITIVE] = { 0, 1.0, 0 }"
     16"bg[PRELIGHT] = { 0, 1.0, 0 }"
     17"bg[ACTIVE] =   {0.2, 0.2, 0.2 }"
     18"}"
    3819
    39 # This sets a style called "button".  The name is not really important, as
    40 # it is assigned to the actual widgets at the bottom of the file.
     20"style'button'"
     21"{"
     22"fg[PRELIGHT] = { 0, 0, 0 }"
     23"bg[PRELIGHT] = { 0, 1.0, 0 }"
     24"bg[ACTIVE] = { 0, 1.0, 0 }"
     25"fg[ACTIVE] = { 0, 1.0, 0 }"
     26"bg[NORMAL] = { 0, 0, 0 }"
     27"fg[NORMAL] = { 0, 1.0, 0 }"
     28"bg[INSENSITIVE] = { 1.0, 0, 1.0 }"
     29"fg[INSENSITIVE] = { 1.0, 0, 1.0 }"
     30"base[NORMAL] = { 0, 1.0, 0 }"
     31"base[PRELIGHT] = { 0, 1.0, 0 }"
     32"}"
    4133
    42 style "window"
    43 {
    44   #This sets the padding around the window to the pixmap specified.
    45   #bg_pixmap[<STATE>] = "<pixmap filename>"
    46   #bg_pixmap[NORMAL] = "warning.xpm"
    47   bg[NORMAL] = { 0, 0, 0 }
    48   fg[NORMAL] = { 0, 1.0, 0 }
    49   base[NORMAL] = { 0, 0, 0 }
    50   base[INSENSITIVE] = { 0, 0, 0 }
    51 }
     34"style'main_button' = 'button'"
     35"{"
     36"font = '-adobe-helvetica-medium-r-normal--*-100-*-*-*-*-*-*'"
     37"bg[PRELIGHT] = { 0, 0.75, 0 }"
     38"}"
    5239
    53 style "scale"
    54 {
    55   #Sets the foreground color (font color) to red when in the "NORMAL"
    56   #state.
    57  
    58   fg[NORMAL] = { 0, 1.0, 0 }
    59   bg[NORMAL] = { 0, 1.0, 0 }
    60   bg[INSENSITIVE] = { 0, 1.0, 0 }
    61   bg[PRELIGHT] = { 0, 1.0, 0 }
    62   bg[ACTIVE] =   {0.2, 0.2, 0.2 }
    63  
    64   #Sets the background pixmap of this widget to that of its parent.
    65   bg_pixmap[NORMAL] = "<parent>"
    66 }
     40"style'toggle_button' = 'button'"
     41"{"
     42"fg[NORMAL] = { 0, 1.0, 0 }"
     43"fg[ACTIVE] = { 0, 1.0, 0 }"
     44"text[NORMAL] = { 0, 0, 0}"
     45"}"
    6746
    68 style "button"
    69 {
    70   # This shows all the possible states for a button.  The only one that
    71   # doesn't apply is the SELECTED state.
    72  
    73   fg[PRELIGHT] = { 0, 0, 0 }
    74   bg[PRELIGHT] = { 0, 1.0, 0 }
    75   bg[ACTIVE] = { 0, 1.0, 0 }
    76   fg[ACTIVE] = { 0, 1.0, 0 }
    77   bg[NORMAL] = { 0, 0, 0 }
    78   fg[NORMAL] = { 0, 1.0, 0 }
    79   bg[INSENSITIVE] = { 1.0, 0, 1.0 }
    80   fg[INSENSITIVE] = { 1.0, 0, 1.0 }
    81   base[NORMAL] = { 0, 1.0, 0 }
    82   base[PRELIGHT] = { 0, 1.0, 0 }
    83 }
     47"style'text'"
     48"{"
     49"fg[NORMAL] = { 0, 1.0, 0 }"
     50"}"
    8451
    85 # In this example, we inherit the attributes of the "button" style and then
    86 # override the font and background color when prelit to create a new
    87 # "main_button" style.
     52"style'ruler'"
     53"{"
     54"font = '-adobe-helvetica-medium-r-normal--*-20-*-*-*-*-*-*'"
     55"}"
    8856
    89 style "main_button" = "button"
    90 {
    91   font = "-adobe-helvetica-medium-r-normal--*-100-*-*-*-*-*-*"
    92   bg[PRELIGHT] = { 0, 0.75, 0 }
    93 }
     57"widget'GtkWindow'              style'window'"
     58"widget'GtkFrame'               style'window'"
     59"widget'Gtk*EventBox'           style'window'"
     60"widget'GtkDialog'              style'window'"
     61"widget'GtkFileSelection'       style'window'"
     62"widget'*Gtk*Scale'             style'scale'"
     63"widget'*GtkCheckButton*'       style'toggle_button'"
     64"widget'*Gtk*Menu*'             style'toggle_button'"
     65"widget'*GtkRadioButton*'       style'toggle_button'"
     66"widget'*GtkButton*'            style'button'"
     67"widget'*Ruler'                 style'ruler'"
     68"widget'*GtkText'               style'text'"
     69"widget'*GtkLabel'              style'text'"
    9470
    95 style "toggle_button" = "button"
    96 {
    97   fg[NORMAL] = { 0, 1.0, 0 }
    98   fg[ACTIVE] = { 0, 1.0, 0 }
    99   text[NORMAL] = { 0, 0, 0}
    100   # This sets the background pixmap of the toggle_button to that of its
    101   # parent widget (as defined in the application).
    102   #bg_pixmap[NORMAL] = "<parent>"
    103 }
    104 
    105 style "text"
    106 {
    107   #bg_pixmap[NORMAL] = "marble.xpm"
    108   fg[NORMAL] = { 0, 1.0, 0 }
    109 }
    110 
    111 style "ruler"
    112 {
    113   font = "-adobe-helvetica-medium-r-normal--*-20-*-*-*-*-*-*"
    114 }
    115 
    116 # pixmap_path "~/.pixmaps"
    117 
    118 # These set the widget types to use the styles defined above.
    119 # The widget types are listed in the class hierarchy, but could probably be
    120 # just listed in this document for the users reference.
    121 
    122 widget_class "GtkWindow"           style "window"
    123 widget_class "GtkFrame"            style "window"
    124 widget_class "Gtk*EventBox"        style "window"
    125 widget_class "GtkDialog"           style "window"
    126 widget_class "GtkFileSelection"    style "window"
    127 widget_class "*Gtk*Scale"          style "scale"
    128 widget_class "*GtkCheckButton*"    style "toggle_button"
    129 widget_class "*Gtk*Menu*"          style "toggle_button"
    130 widget_class "*GtkRadioButton*"    style "toggle_button"
    131 widget_class "*GtkButton*"         style "button"
    132 widget_class "*Ruler"              style "ruler"
    133 widget_class "*GtkText"            style "text"
    134 widget_class "*GtkLabel"           style "text"
     71"widget'main window.*GtkButton*' style 'main_button'"
    13572
    13673
    137 # This sets all the buttons that are children of the "main window" to
    138 # the main_button style.  These must be documented to be taken advantage of.
    139 widget "main window.*GtkButton*" style "main_button"
     74);

  • orxonox/branches/md2_loader/src/lib/util/ini_parser.cc

    r3484 r4063  
    2323        \param filename: the path and name of the file to parse
    2424*/
    25 IniParser::IniParser (char* filename)
     25IniParser::IniParser (const char* filename)
    2626{
    2727  stream = NULL;
    … …  
    4343   \return zero on success or -1 if an error occured;
    4444*/
    45 int IniParser::openFile( char* filename)
     45int IniParser::openFile(const char* filename)
    4646{
    4747  if( filename == NULL) return -1;
    … …  
    144144   lead to unwanted behaviour.
    145145*/
    146 char* IniParser::getVar( char* name, char* section, char* defvalue = "")
     146char* IniParser::getVar(const char* name, char* section, char* defvalue = "")
    147147{
    148148  strcpy (internbuf, defvalue);

  • orxonox/branches/md2_loader/src/lib/util/ini_parser.h

    r3484 r4063  
    2626       
    2727 public:
    28   IniParser (char* filename);
     28  IniParser (const char* filename);
    2929  ~IniParser ();
    3030 
    31   char* getVar( char* name, char* section, char* defvalue);
    32         int openFile( char* name);
     31  char* getVar(const char* name, char* section, char* defvalue);
     32  int openFile(const char* name);
    3333  int getSection( char* section);
    3434  int nextVar( char* name, char* value);

  • orxonox/branches/md2_loader/src/orxonox.cc

    r4010 r4063  
    2222   main-programmer: Patrick Boenzli
    2323   co-programmer: Christian Meyer
    24    co-programmer: Benjamin Grauer: injected ResourceManager/GraphicsEngine
     24   co-programmer: Benjamin Grauer: injected ResourceManager/GraphicsEngine/GUI
    2525*/
    2626
    2727#include "orxonox.h"
     28
     29#include "gui.h"
    2830
    2931#include "world.h"
    … …  
    3739
    3840#include <string.h>
     41
    3942int verbose = 4;
    4043
    … …  
    4649Orxonox::Orxonox ()
    4750{
    48   pause = false;
     51  this->pause = false;
     52
     53  this->world = NULL;
     54  this->resources = NULL;
     55  this->localinput = NULL;
    4956}
    5057
    … …  
    5461Orxonox::~Orxonox ()
    5562{
     63  int i =0;
    5664  Orxonox::singletonRef = NULL;
    5765  if( world != NULL) delete world;
    58   if( localinput != NULL) delete world;
     66  if( localinput != NULL) delete localinput;
    5967  if( resources != NULL) delete resources;
    6068  delete GraphicsEngine::getInstance(); // deleting the Graphics
    … …  
    168176  PRINT(3)("initializing ResourceManager\n");
    169177  resourceManager = ResourceManager::getInstance();
    170   !resourceManager->setDataDir("../data/");
     178  if (!resourceManager->setDataDir("../data/"))
     179    {
     180      PRINTF(1)("Data Could not be located\n");
     181      exit(-1);
     182    }
    171183
    172184  PRINT(3)("initializing TextEngine\n");
    … …  
    281293
    282294
     295bool showGui = false;
    283296
    284297/**
    … …  
    302315
    303316  int i;
    304   for(i = 0; i < argc; ++i)
     317  for(i = 1; i < argc; ++i)
    305318    {
    306319      if(! strcmp( "--help", argv[i])) return startHelp();
    307320      else if(! strcmp( "--benchmark", argv[i])) return startBenchmarks();
    308     }
    309 
    310   PRINTF(2)("Orxonox does not understand the arguments");
     321      else if(! strcmp( "--gui", argv[i]) || !strcmp("-g", argv[i])) showGui = true;
     322      else PRINTF(2)("Orxonox does not understand the arguments %s\n", argv[i]);
     323    }
     324
    311325  return startOrxonox(argc, argv);
    312326}
    … …  
    316330int startHelp()
    317331{
    318   printf("orxonox: starts the orxonox game - rules\n");
    319   printf("usage: orxonox [arg]\n\n");
    320   printf("valid options:\n");
    321   printf(" --benchmark\tstarts the orxonox benchmark\n");
    322   printf(" --help \tshows this menu\n");
     332  PRINT(0)("orxonox: starts the orxonox game - rules\n");
     333  PRINT(0)("usage: orxonox [arg]\n\n");
     334  PRINT(0)("valid options:\n");
     335  PRINT(0)(" --benchmark\tstarts the orxonox benchmark\n");
     336  PRINT(0)(" --help \tshows this menu\n");
     337  PRINT(0)(" --gui/-g \tDisplays the Gui on startup\n");
    323338}
    324339
    … …  
    326341int startOrxonox(int argc, char** argv)
    327342{
    328   printf(">>> Starting Orxonox <<<\n");
     343  // checking for existence of the configuration-files
     344  if (showGui ||
     345      !ResourceManager::isFile("~/.orxonox/orxonox.conf") ||
     346      ResourceManager::isFile("~/.orxonox/orxonox.lock"))
     347    {
     348      if (ResourceManager::isFile("~/.orxonox/orxonox.lock"))
     349        ResourceManager::deleteFile("~/.orxonox/orxonox.lock");
     350      //      char* guiExec = new char[strlen(argv[0])+20];
     351      //      sprintf(guiExec,"%sGui --gui", argv[0]);
     352      Gui* gui = new Gui(argc, argv);
     353      if (! gui->startOrxonox)
     354        return 0;
     355     
     356      delete gui;
     357    }
     358 
     359  PRINT(0)(">>> Starting Orxonox <<<\n");
     360
     361  ResourceManager::touchFile("~/.orxonox/orxonox.lock");
     362
    329363  Orxonox *orx = Orxonox::getInstance();
    330364 
    331365  if((*orx).init(argc, argv) == -1)
    332366    {
    333       printf("! Orxonox initialization failed\n");
     367      PRINTF(1)("! Orxonox initialization failed\n");
    334368      return -1;
    335369    }
    … …  
    338372 
    339373  delete orx;
     374  ResourceManager::deleteFile("~/.orxonox/orxonox.lock");
    340375 
    341376}

  • orxonox/branches/md2_loader/src/subprojects/Makefile.in

    r3789 r4063  
    8989EXEEXT = @EXEEXT@
    9090GPROF = @GPROF@
    91 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    92 GTHREAD_LIBS = @GTHREAD_LIBS@
    9391GTK2_CFLAGS = @GTK2_CFLAGS@
    9492GTK2_LIBS = @GTK2_LIBS@
    9593HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    9694HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    97 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    98 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    9995HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    10096HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    117113PACKAGE_VERSION = @PACKAGE_VERSION@
    118114PATH_SEPARATOR = @PATH_SEPARATOR@
     115RANLIB = @RANLIB@
    119116SET_MAKE = @SET_MAKE@
    120117SHELL = @SHELL@
    … …  
    125122ac_ct_CC = @ac_ct_CC@
    126123ac_ct_CXX = @ac_ct_CXX@
     124ac_ct_RANLIB = @ac_ct_RANLIB@
    127125ac_ct_STRIP = @ac_ct_STRIP@
    128126am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

  • orxonox/branches/md2_loader/src/subprojects/testmain/Makefile.in

    r3789 r4063  
    104104EXEEXT = @EXEEXT@
    105105GPROF = @GPROF@
    106 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
    107 GTHREAD_LIBS = @GTHREAD_LIBS@
    108106GTK2_CFLAGS = @GTK2_CFLAGS@
    109107GTK2_LIBS = @GTK2_LIBS@
    110108HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
    111109HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
    112 HAVE_GTHREAD_FALSE = @HAVE_GTHREAD_FALSE@
    113 HAVE_GTHREAD_TRUE = @HAVE_GTHREAD_TRUE@
    114110HAVE_GTK2_FALSE = @HAVE_GTK2_FALSE@
    115111HAVE_GTK2_TRUE = @HAVE_GTK2_TRUE@
    … …  
    132128PACKAGE_VERSION = @PACKAGE_VERSION@
    133129PATH_SEPARATOR = @PATH_SEPARATOR@
     130RANLIB = @RANLIB@
    134131SET_MAKE = @SET_MAKE@
    135132SHELL = @SHELL@
    … …  
    140137ac_ct_CC = @ac_ct_CC@
    141138ac_ct_CXX = @ac_ct_CXX@
     139ac_ct_RANLIB = @ac_ct_RANLIB@
    142140ac_ct_STRIP = @ac_ct_STRIP@
    143141am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

  • orxonox/branches/md2_loader/src/util/resource_manager.cc

    r3983 r4063  
    510510    }
    511511
    512   stat(tmpDirName, &status);
    513   if (status.st_mode & (S_IFDIR
     512  if(!stat(tmpDirName, &status))
     513    {
     514      if (status.st_mode & (S_IFDIR
    514515#ifndef __WIN32__
    515                         | S_IFLNK
     516                            | S_IFLNK
    516517#endif
    517                         ))
    518     {
    519       delete tmpDirName;
    520       return true;
    521     }
    522   else
    523     {
    524       delete tmpDirName;
    525       return false;
    526     }
     518                            ))
     519        {
     520          delete tmpDirName;
     521          return true;
     522        }
     523      else
     524        {
     525          delete tmpDirName;
     526          return false;
     527        }
     528    }
     529  else
     530    return false;
    527531}
    528532
    … …  
    534538bool ResourceManager::isFile(const char* fileName)
    535539{
     540  char* tmpFileName = ResourceManager::homeDirCheck(fileName);
     541  // actually checks the File
    536542  struct stat status;
    537   stat(fileName, &status);
    538   if (status.st_mode & (S_IFREG
     543  if (!stat(tmpFileName, &status))
     544    {
     545      if (status.st_mode & (S_IFREG
    539546#ifndef __WIN32__
    540                         | S_IFLNK
     547                            | S_IFLNK
    541548#endif
    542                         ))
    543     return true;
    544   else
    545     return false;
    546 }
     549                            ))
     550        {
     551          delete tmpFileName;
     552          return true;
     553        }
     554      else
     555        {
     556          delete tmpFileName;
     557          return false;
     558        }
     559    }
     560  else
     561    {
     562      delete tmpFileName;
     563      return false;
     564    }
     565}
     566
     567bool ResourceManager::touchFile(const char* fileName)
     568{
     569  char* tmpName = ResourceManager::homeDirCheck(fileName);
     570
     571  FILE* stream;
     572  if( (stream = fopen (tmpName, "w")) == NULL)
     573    {
     574      PRINTF(1)("could not open %s fro writing\n", fileName);
     575      return false;
     576    }
     577  fclose(stream);
     578   
     579  delete tmpName;
     580}
     581
     582bool ResourceManager::deleteFile(const char* fileName)
     583{
     584  char* tmpName = ResourceManager::homeDirCheck(fileName);
     585  unlink(tmpName);
     586  delete tmpName;
     587}
     588
     589char* ResourceManager::homeDirCheck(const char* name)
     590{
     591  char* retName;
     592  if (!strncmp(name, "~/", 2))
     593    {
     594      char tmpFileName[500];
     595#ifdef __WIN32__
     596      strcpy(tmpFileName, getenv("USERPROFILE"));
     597#else
     598      strcpy(tmpFileName, getenv("HOME"));
     599#endif
     600      retName = new char[strlen(tmpFileName)+strlen(name)];
     601      sprintf(retName, "%s%s", tmpFileName, name+1);
     602    }
     603  else
     604    {
     605      retName = new char[strlen(name)+1];
     606      strcpy(retName, name);
     607    }
     608  return retName;
     609}
     610
     611
    547612
    548613/**

  • orxonox/branches/md2_loader/src/util/resource_manager.h

    r3983 r4063  
    7878  // utility functions of this class
    7979  static bool isDir(const char* directory);
    80   static bool isFile(const char* directory);
     80  static bool isFile(const char* fileName);
     81  static bool touchFile(const char* fileName);
     82  static bool deleteFile(const char* fileName);
     83  static char* homeDirCheck(const char* name);
    8184
    8285 private:
Note: See TracChangeset for help on using the changeset viewer.