Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8715 in orxonox.OLD for branches/terrain/acinclude.m4


Ignore:
Timestamp:
Jun 22, 2006, 1:51:50 PM (18 years ago)
Author:
ponder
Message:
  • Added special checks for macosx to acinclude.m4 and configure.ac. This sucks
  • Reapplied the endianness checks to the md2_model file. They got lost during the merge operation.
  • Tried to do the collision detection for the ground. But somehow it doesn't work. Perhaps an offset will do.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/terrain/acinclude.m4

    r8523 r8715  
    105105      `ls -dr /usr/local/qt*/include   2>/dev/null`
    106106      `ls -dr /opt/qt*/include         2>/dev/null`
     107      `ls -dr /opt/local/include       2>/dev/null`
    107108      `ls -dr /Developer/qt*/include   2>/dev/null`
    108109      `ls -dr /c/Qt/*/include          2>/dev/null`
    … …  
    115116      `ls -dr /usr/local/qt*/lib       2>/dev/null`
    116117      `ls -dr /opt/qt*/lib             2>/dev/null`
     118      `ls -dr /opt/local/lib               2>/dev/null`
    117119      `ls -dr /Developer/qt*/lib       2>/dev/null`
    118120      `ls -dr /c/Qt/*/lib              2>/dev/null`
    … …  
    125127      `ls -dr /usr/local/qt*/bin       2>/dev/null`
    126128      `ls -dr /opt/qt*/bin             2>/dev/null`
     129      `ls -dr /opt/local/bin                  2>/dev/null`
    127130      `ls -dr /Developer/qt*/bin       2>/dev/null`
    128131      `ls -dr /c/Qt/*/bin              2>/dev/null`
    … …  
    175178    QT_LIBS=""
    176179    QT_CXXFLAGS="-I${QT_INCLUDE_DIRECTORY}"
    177     LDFLAGS="${LDFLAGS} -L${QT_LIB_DIRECTORY} -Wl,-rpath -Wl,${QT_LIB_DIRECTORY}"
    178 
     180         if test x$osX = xyes ; then
     181                LDFLAGS="${LDFLAGS} -L${QT_LIB_DIRECTORY}"
     182         else
     183        LDFLAGS="${LDFLAGS} -L${QT_LIB_DIRECTORY} -Wl,-rpath -Wl,${QT_LIB_DIRECTORY}"
     184         fi
    179185    CACHED_CPPFLAG=${CPPFLAGS}
    180186    CACHED_LDFLAGS=${LDFLAGS}
    … …  
    190196    done
    191197
    192     if [test "x$_lib_check" = "xyes"] ; then
    193          QT_LIBS="${QT_LIBS} -l$_found_lib"
    194          AX_CHECK_REQUIRED_LIB([QtCore QtCore4], [main],,,[http://www.trolltech.com] )
    195          AX_CHECK_REQUIRED_LIB([QtGui QtGui4], [main],,,[http://www.trolltech.com] )
    196          AX_CHECK_REQUIRED_LIB([QtOpenGL QtOpenGL4], [main],,,[http://www.trolltech.com] )
    197 
    198          $3
     198    if [test "x$_lib_check" = "xyes" || test "x$osX" = "xyes"] ; then
     199                        if [test x$osX = xyes] ; then
     200# kraus: Need to add a check here. For the moment this just works fine...
     201                                QT_LIBS="${QT_LIBS} -framework QtCore -framework QtGui -framework QtOpenGL"
     202                                QT_LD_FLAGS="${QT_LD_FLAGS} -L${QT_LIB_DIRECTORY}"
     203                        else
     204                QT_LIBS="${QT_LIBS} -l$_found_lib"
     205                AX_CHECK_REQUIRED_LIB([QtCore QtCore4], [main],,,[http://www.trolltech.com] )
     206                AX_CHECK_REQUIRED_LIB([QtGui QtGui4], [main],,,[http://www.trolltech.com] )
     207                AX_CHECK_REQUIRED_LIB([QtOpenGL QtOpenGL4], [main],,,[http://www.trolltech.com] )
     208
     209                $3
     210                        fi
    199211    else
    200212         echo "------------------"
    … …  
    205217         exit -1
    206218    fi
    207 
     219         echo "configuration for qt: "
    208220    echo "QT_LIBS          = ${QT_LIBS}"
    209221    echo "QT_CXXFLAGS      = ${QT_CXXFLAGS}"
    … …  
    251263dnl Check for Lua.
    252264
    253 LUA_INCLUDE_DIRECTORY="/usr/include"
     265LUA_INCLUDE_DIRECTORY="/$prefix/include"
    254266LUA_COMMON_INCLUDE_DIRECTORIES="
    255267      `ls -dr $1                       2>/dev/null`
    … …  
    259271      `ls -dr /usr/local/include/lua   2>/dev/null`
    260272      `ls -dr /opt/lua*/include        2>/dev/null`
     273      `ls -dr /opt/local/include       2>/dev/null`
    261274      `ls -dr /Developer/lua*/include  2>/dev/null`
    262275    "
    … …  
    276289    fi
    277290
    278 
     291if [ test x$osX = xyes ] ; then
     292        LUA_COMMON_LIB_DIRECTORIES="
     293        `ls -dr $1                    2>/dev/null`
     294      /usr/lib
     295      `ls -dr /usr/lib/lua*        2>/dev/null`
     296      `ls -dr /usr/local/lib/lua   2>/dev/null`
     297      `ls -dr /opt/lua*/lib        2>/dev/null`
     298      `ls -dr /opt/local/lib       2>/dev/null`
     299      `ls -dr /Developer/lua*/lib  2>/dev/null`
     300         "
     301  for _lua_lib_directory in ${LUA_COMMON_LIB_DIRECTORIES}
     302    do
     303      if test -e ${_lua_lib_directory}/liblua.a  || test -e ${_lua_lib_directory}/liblua.dylib ; then
     304        LUA_LIB_DIRECTORY=${_lua_lib_directory}
     305        LDFLAGS="${LDFLAGS} -L${LUA_LIB_DIRECTORY} -llua"
     306        break
     307      fi
     308  done 
     309else
    279310AC_CHECK_LIB([dl], [dlopen])
    280311AX_CHECK_REQUIRED_HEADER_LIB([lua.h], [lua lua50], [lua_open],,,)
    … …  
    288319#       [AX_GET_INSTALL_NECESSARY_LIB([http://www.lua.org/ftp], [lua-5.0.tar.gz], [lua-5.0], [extern_libs/], [include/*.h lib/*.a])
    289320#       LUA_LIBS="-llualib -llua"  LUA_INCLUDES="-I$(top_build_dir)/extern_libs" ], [http://www.lua.org])
    290 
     321fi
    291322AC_SUBST([LUA_LIBS])
    292323AC_SUBST([LUA_INCLUDES])
Note: See TracChangeset for help on using the changeset viewer.