Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2968 in orxonox.OLD


Ignore:
Timestamp:
Nov 24, 2004, 1:48:50 AM (20 years ago)
Author:
bensch
Message:

orxonox/trunk/importer: nicer configure.ac

Location:
orxonox/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/configure

    r2925 r2968  
    37583758        #done before loop
    37593759
    3760 # checking gl header (has to be here because of a Linux error)
     3760# checking gl header
    37613761   # On IRIX 5.3, sys/types and inttypes.h are conflicting.
    37623762
     
    46644664 Linux="yes"
    46654665
    4666 # checking gl header (has to be here because of a Linux error)
     4666# checking gl header
    46674667
    46684668for ac_header in GL/gl.h
     
    53555355     fi
    53565356
    5357     ;;
    5358   *)
    5359     mingw="no"
    5360     ;;
    5361 esac
    5362 echo "$as_me:$LINENO: result: $mingw" >&5
    5363 echo "${ECHO_T}$mingw" >&6
    5364 
    5365 
    5366 #### Checking for LIBraries.
    5367 
    5368 # FIXME: Replace `main' with a function in `-lOSMesa':
     5357     # FIXME: Replace `main' with a function in `-lOSMesa':
    53695358
    53705359echo "$as_me:$LINENO: checking for main in -lOSMesa" >&5
     
    54355424fi
    54365425
    5437 # FIXME: Replace `main' with a function in `-lX11':
     5426     # FIXME: Replace `main' with a function in `-lX11':
    54385427
    54395428echo "$as_me:$LINENO: checking for main in -lX11" >&5
     
    55045493fi
    55055494
    5506 # FIXME: Replace `main' with a function in `-lXt':
     5495     # FIXME: Replace `main' with a function in `-lXt':
    55075496
    55085497echo "$as_me:$LINENO: checking for main in -lXt" >&5
     
    55735562fi
    55745563
     5564    ;;
     5565  *)
     5566    mingw="no"
     5567    ;;
     5568esac
     5569
     5570
     5571
    55755572
    55765573
    55775574#checking for pthread libs
    5578 echo "$as_me:$LINENO: checking for main in -lpthread" >&5
     5575 echo "$as_me:$LINENO: checking for main in -lpthread" >&5
    55795576echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6
    55805577if test "${ac_cv_lib_pthread_main+set}" = set; then
     
    56385635fi
    56395636
    5640 if test "$FOUND_pthread" = "yes" ; then
     5637 if test "$FOUND_pthread" = "yes" ; then
    56415638    LIBS="$LIBS -lpthread"
    5642 fi
     5639 fi
    56435640
    56445641
  • orxonox/trunk/configure.ac

    r2925 r2968  
    150150     fi   
    151151       
     152     # FIXME: Replace `main' with a function in `-lOSMesa':
     153      AC_CHECK_LIB([OSMesa], [main])
     154     # FIXME: Replace `main' with a function in `-lX11':
     155      AC_CHECK_LIB([X11], [main])
     156     # FIXME: Replace `main' with a function in `-lXt':
     157      AC_CHECK_LIB([Xt], [main])
    152158    ;;
    153159  *)
     
    155161    ;;
    156162esac
    157 AC_MSG_RESULT([$mingw])
     163
    158164AC_SUBST(MSBITFIELDS)
    159165
    160 #### Checking for LIBraries.
    161 
    162 # FIXME: Replace `main' with a function in `-lOSMesa':
    163 AC_CHECK_LIB([OSMesa], [main])
    164 # FIXME: Replace `main' with a function in `-lX11':
    165 AC_CHECK_LIB([X11], [main])
    166 # FIXME: Replace `main' with a function in `-lXt':
    167 AC_CHECK_LIB([Xt], [main])
    168166
    169167
    170168#checking for pthread libs
    171 AC_CHECK_LIB([pthread], [main], FOUND_pthread=yes)
    172 if test "$FOUND_pthread" = "yes" ; then
     169 AC_CHECK_LIB([pthread], [main], FOUND_pthread=yes)
     170 if test "$FOUND_pthread" = "yes" ; then
    173171    LIBS="$LIBS -lpthread"
    174 fi
     172 fi
    175173
    176174
     
    178176
    179177# FIXME: Replace `main' with a function in `-lm':
    180 AC_CHECK_LIB([m], [main])
     178 AC_CHECK_LIB([m], [main])
    181179
    182180LIBS="$LIBS `pkg-config --libs  gtk+-2.0`"
  • orxonox/trunk/importer/framework.cc

    r2966 r2968  
    128128              {
    129129                rotAxis.normalize();
    130                 printf ("rotAxis: %f, %f, %f\n", rotAxis.x, rotAxis.y, rotAxis.z, rotAngle);
     130                //              printf ("rotAxis: %f, %f, %f\n", rotAxis.x, rotAxis.y, rotAxis.z, rotAngle);
    131131                               
    132132                rotAngle = angle_rad (p1, p2);
  • orxonox/trunk/src/player.cc

    r2816 r2968  
    2626{
    2727
    28   obj = new Object ("reaphigh.obj");
     28  obj = new Object ("eagle.obj");
    2929  /*
    3030  objectList = glGenLists(1);
     
    108108 
    109109  glMatrixMode (GL_MODELVIEW);
    110   glRotatef (-90, 0,1,0);
     110  //  glRotatef (-90, 0,1,0);
    111111  obj->draw();
    112112  //  glCallList (objectList);
Note: See TracChangeset for help on using the changeset viewer.