Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2189 in orxonox.OLD


Ignore:
Timestamp:
Jul 17, 2004, 10:57:20 AM (20 years ago)
Author:
bensch
Message:

orxonox/branches/chris: now it configures the right values for Linux&Winodws.

Location:
orxonox/branches/chris
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/chris/configure

    r2188 r2189  
    17301730case `uname` in
    17311731  *MINGW*)
    1732     mingw=yes
     1732    mingw="yes"
    17331733    MSBITFIELDS="-mms-bitfields"
    17341734    MWINDOWS="-mwindows"
    17351735    ;;
    17361736  *)
    1737     mingw=no
     1737    mingw="no"
    17381738    ;;
    17391739esac
    … …  
    49024902fi
    49034903
     4904## mingw CHECK
     4905if test $mingw = yes ; then
     4906        echo "$as_me:$LINENO: checking for main in -lmingw32" >&5
     4907echo $ECHO_N "checking for main in -lmingw32... $ECHO_C" >&6
     4908if test "${ac_cv_lib_mingw32_main+set}" = set; then
     4909  echo $ECHO_N "(cached) $ECHO_C" >&6
     4910else
     4911  ac_check_lib_save_LIBS=$LIBS
     4912LIBS="-lmingw32  $LIBS"
     4913cat >conftest.$ac_ext <<_ACEOF
     4914/* confdefs.h.  */
     4915_ACEOF
     4916cat confdefs.h >>conftest.$ac_ext
     4917cat >>conftest.$ac_ext <<_ACEOF
     4918/* end confdefs.h.  */
     4919
     4920
     4921int
     4922main ()
     4923{
     4924main ();
     4925  ;
     4926  return 0;
     4927}
     4928_ACEOF
     4929rm -f conftest.$ac_objext conftest$ac_exeext
     4930if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
     4931  (eval $ac_link) 2>conftest.er1
     4932  ac_status=$?
     4933  grep -v '^ *+' conftest.er1 >conftest.err
     4934  rm -f conftest.er1
     4935  cat conftest.err >&5
     4936  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4937  (exit $ac_status); } &&
     4938         { ac_try='test -z "$ac_c_werror_flag"
     4939                         || test ! -s conftest.err'
     4940  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     4941  (eval $ac_try) 2>&5
     4942  ac_status=$?
     4943  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4944  (exit $ac_status); }; } &&
     4945         { ac_try='test -s conftest$ac_exeext'
     4946  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
     4947  (eval $ac_try) 2>&5
     4948  ac_status=$?
     4949  echo "$as_me:$LINENO: \$? = $ac_status" >&5
     4950  (exit $ac_status); }; }; then
     4951  ac_cv_lib_mingw32_main=yes
     4952else
     4953  echo "$as_me: failed program was:" >&5
     4954sed 's/^/| /' conftest.$ac_ext >&5
     4955
     4956ac_cv_lib_mingw32_main=no
     4957fi
     4958rm -f conftest.err conftest.$ac_objext \
     4959      conftest$ac_exeext conftest.$ac_ext
     4960LIBS=$ac_check_lib_save_LIBS
     4961fi
     4962echo "$as_me:$LINENO: result: $ac_cv_lib_mingw32_main" >&5
     4963echo "${ECHO_T}$ac_cv_lib_mingw32_main" >&6
     4964if test $ac_cv_lib_mingw32_main = yes; then
     4965  FOUND_mingw32=yes
     4966fi
     4967
     4968        if test $FOUND_mingw32 = "yes"; then
     4969                LIBS="$LIBS -lmingw32"
     4970        fi
     4971fi
     4972
    49044973## SDL CHECK
    49054974
    … …  
    50595128done
    50605129
    5061 
    5062 echo "$as_me:$LINENO: checking for main in -lSDL" >&5
     5130if test $mingw = no ; then
     5131        echo "$as_me:$LINENO: checking for main in -lSDL" >&5
    50635132echo $ECHO_N "checking for main in -lSDL... $ECHO_C" >&6
    50645133if test "${ac_cv_lib_SDL_main+set}" = set; then
    … …  
    51225191fi
    51235192
    5124 if test "$FOUND_SDL" = "yes" ; then
    5125     LIBS="$LIBS -lSDL"
    5126     #   checking for Windows sdl library
    5127 else
    5128     echo "We did not find the Linux sdl Library. Checking for Windows Library"
     5193        if test "$FOUND_SDL" = "yes" ; then
     5194                LIBS="$LIBS -lSDL"
     5195        fi
     5196#   checking for Windows sdl library
     5197else
    51295198    echo "$as_me:$LINENO: checking for main in -lsdlmain" >&5
    51305199echo $ECHO_N "checking for main in -lsdlmain... $ECHO_C" >&6
    … …  
    51905259
    51915260    if test "$FOUND_sdlmain" = "yes" ; then
    5192         LIBS="$LIBS -lsdlmain -lsdl"
    5193     else
    5194          echo "------------------"
    5195          echo "sdl library not found."
    5196          echo "please install the libsdl, which can be found at http://www.libsdl.org"
    5197          echo "------------------"
    5198          exit -1
     5261        LIBS="$LIBS -lsdlmain"
    51995262    fi
    5200 fi
    5201 
    5202 #checking for pthread libs
    5203 echo "$as_me:$LINENO: checking for main in -lpthread" >&5
    5204 echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6
    5205 if test "${ac_cv_lib_pthread_main+set}" = set; then
     5263        echo "$as_me:$LINENO: checking for main in -lsdl" >&5
     5264echo $ECHO_N "checking for main in -lsdl... $ECHO_C" >&6
     5265if test "${ac_cv_lib_sdl_main+set}" = set; then
    52065266  echo $ECHO_N "(cached) $ECHO_C" >&6
    52075267else
    52085268  ac_check_lib_save_LIBS=$LIBS
    5209 LIBS="-lpthread  $LIBS"
     5269LIBS="-lsdl  $LIBS"
    52105270cat >conftest.$ac_ext <<_ACEOF
    52115271/* confdefs.h.  */
    … …  
    52465306  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    52475307  (exit $ac_status); }; }; then
    5248   ac_cv_lib_pthread_main=yes
     5308  ac_cv_lib_sdl_main=yes
    52495309else
    52505310  echo "$as_me: failed program was:" >&5
    52515311sed 's/^/| /' conftest.$ac_ext >&5
    52525312
    5253 ac_cv_lib_pthread_main=no
     5313ac_cv_lib_sdl_main=no
    52545314fi
    52555315rm -f conftest.err conftest.$ac_objext \
    … …  
    52575317LIBS=$ac_check_lib_save_LIBS
    52585318fi
    5259 echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5
    5260 echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6
    5261 if test $ac_cv_lib_pthread_main = yes; then
    5262   FOUND_pthread=yes
    5263 fi
    5264 
    5265 if test "$FOUND_pthread" = "yes" ; then
    5266     LIBS="$LIBS -lpthread"
    5267 fi
    5268 
    5269 #checking for  libs
     5319echo "$as_me:$LINENO: result: $ac_cv_lib_sdl_main" >&5
     5320echo "${ECHO_T}$ac_cv_lib_sdl_main" >&6
     5321if test $ac_cv_lib_sdl_main = yes; then
     5322  FOUND_sdl=yes
     5323fi
     5324
     5325        if test "$FOUND_sdl" = "yes" ; then
     5326                LIBS="$LIBS -lsdl"
     5327        fi
     5328fi
     5329
     5330#checking for pthread libs
    52705331echo "$as_me:$LINENO: checking for main in -lpthread" >&5
    52715332echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6
    … …  
    53335394    LIBS="$LIBS -lpthread"
    53345395fi
    5335 
    53365396
    53375397

  • orxonox/branches/chris/configure.ac

    r2188 r2189  
    1111case `uname` in
    1212  *MINGW*)
    13     mingw=yes
     13    mingw="yes"
    1414    MSBITFIELDS="-mms-bitfields"
    1515    MWINDOWS="-mwindows"
    1616    ;;
    1717  *)
    18     mingw=no
     18    mingw="no"
    1919    ;;
    2020esac
    … …  
    104104fi
    105105
     106## mingw CHECK
     107if test $mingw = yes ; then
     108        AC_CHECK_LIB([mingw32], [main], FOUND_mingw32=yes)
     109        if test $FOUND_mingw32 = "yes"; then
     110                LIBS="$LIBS -lmingw32"
     111        fi
     112fi
     113
    106114## SDL CHECK
    107115
    … …  
    109117AC_CHECK_HEADERS(SDL/SDL.h ,,
    110118      [AC_MSG_ERROR([cannot find SDL headers]) ])
    111 
    112 AC_CHECK_LIB([SDL], [main], FOUND_SDL=yes)
    113 if test "$FOUND_SDL" = "yes" ; then
    114     LIBS="$LIBS -lSDL"
    115     #   checking for Windows sdl library
     119if test $mingw = no ; then
     120        AC_CHECK_LIB([SDL], [main], FOUND_SDL=yes)
     121        if test "$FOUND_SDL" = "yes" ; then
     122                LIBS="$LIBS -lSDL"
     123        fi
     124#   checking for Windows sdl library
    116125else
    117     echo "We did not find the Linux sdl Library. Checking for Windows Library"
    118126    AC_CHECK_LIB([sdlmain], [main], FOUND_sdlmain=yes)
    119127    if test "$FOUND_sdlmain" = "yes" ; then
    120         LIBS="$LIBS -lsdlmain -lsdl"
    121     else
    122          echo "------------------"
    123          echo "sdl library not found."
    124          echo "please install the libsdl, which can be found at http://www.libsdl.org"
    125          echo "------------------"
    126          exit -1
     128        LIBS="$LIBS -lsdlmain"
    127129    fi
     130        AC_CHECK_LIB([sdl], [main], FOUND_sdl=yes)
     131        if test "$FOUND_sdl" = "yes" ; then
     132                LIBS="$LIBS -lsdl"
     133        fi
    128134fi
    129135
    … …  
    133139    LIBS="$LIBS -lpthread"
    134140fi
    135 
    136 #checking for  libs
    137 AC_CHECK_LIB([pthread], [main], FOUND_pthread=yes)
    138 if test "$FOUND_pthread" = "yes" ; then
    139     LIBS="$LIBS -lpthread"
    140 fi
    141 
    142141
    143142

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

    r2188 r2189  
    99
    1010#  uncomment the following if bencoder requires the math library
    11 orxonox_LDADD=-lm
     11#orxonox_LDADD=-lm
    1212
    1313#EXTRA_DIST=orxonox.lsm.in orxonox.spec.in orxonox.texinfo

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

    r2188 r2189  
    118118bin_PROGRAMS = orxonox
    119119orxonox_SOURCES = orxonox.cc world.cc player.cc data_tank.cc world_entity.cc vector.cc camera.cc collision.cc command_node.cc ini_parser.cc keynames.cc track.cc
    120 
    121 #  uncomment the following if bencoder requires the math library
    122 orxonox_LDADD = -lm
    123120subdir = src
    124121ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    … …  
    134131        ini_parser.$(OBJEXT) keynames.$(OBJEXT) track.$(OBJEXT)
    135132orxonox_OBJECTS = $(am_orxonox_OBJECTS)
     133orxonox_LDADD = $(LDADD)
    136134orxonox_DEPENDENCIES =
    137135orxonox_LDFLAGS =
    … …  
    409407
    410408
     409#  uncomment the following if bencoder requires the math library
     410#orxonox_LDADD=-lm
     411
    411412#EXTRA_DIST=orxonox.lsm.in orxonox.spec.in orxonox.texinfo
    412413
Note: See TracChangeset for help on using the changeset viewer.