Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7791 in orxonox.OLD for branches/osx


Ignore:
Timestamp:
May 24, 2006, 8:54:34 AM (19 years ago)
Author:
ponder
Message:

Defined signal_handler as linux only, since the compiler couldn't locate the sighandler_t struct on mac.
Added the qt_binaries to the mac-specific QT_CHECK-macro.

Location:
branches/osx
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/osx/configure.ac

    r7769 r7791  
    567567if test `uname` = "Darwin" ; then
    568568        PKG_CONFIG_PATH="$prefix"
    569         PKG_CHECK_MODULES( QT, QtCore >= 4.01 )
    570         QT_INCLUDE_DIR= $($PKG_CONFIG --variable=includedir QtGui)
    571         EXTRA_QT_INCLUDE_DIR="$QT_INCLUDE_DIR/Qt"
    572         AC_CHECK_FILE([$QT_INCLUDE_DIR/QWidget],
    573                 AC_MSG_NOTICE([No extra QT_INCLUDE_DIR needed]),
    574 
    575         AC_CHECK_FILE([$EXTRA_QT_INCLUDE_DIR/QWidget],
    576                         QT_CFLAGS="$QT_CFLAGS -I$EXTRA_QT_INCLUDE_DIR",
    577                         AC_MSG_WARN([QWidget not found])))
    578             AC_MSG_NOTICE([Set QT_CFLAGS... $QT_CFLAGS])
    579             AC_CHECK_PROG(MOC, [moc], [moc])
    580 
    581             AC_SUBST(QT_CFLAGS)
    582             AC_SUBST(QT_LIBS)
     569        PKG_CHECK_MODULES( QT, QtOpenGL >= 4.01 QtCore >= 4.01 QtGui >= 4.0.1 )
     570        QT_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir QtOpenGL QtCore QtGui`
     571#----------#
     572            AC_PATH_PROG([QT_MOC], [moc], [no], ["${QT_BIN_DIRECTORY}:${PATH}"])
     573              if test x${QT_MOC} = xno ; then
     574                AC_MSG_ERROR([QT MOC not found])
     575              fi
     576        AC_SUBST([QT_MOC])
     577
     578        AC_PATH_PROG([QT_UIC], [uic], [no], ["${QT_BIN_DIRECTORY}:${PATH}"])
     579        AC_SUBST([QT_UIC])
     580
     581        AC_PATH_PROG([QT_RCC], [rcc], [no], ["${QT_BIN_DIRECTORY}:${PATH}"])
     582
     583        AC_SUBST([QT_RCC])     
     584        AC_SUBST( QT_INCLUDE_DIR )
     585        AC_SUBST( QT_CFLAGS )
     586        AC_SUBST( QT_LDFLAGS )
     587        AC_SUBST( QT_LIBS )
     588        echo "QT_LIBS                   = $QT_LIBS"
     589        echo "QT_CFLAGS                 = $QT_CFLAGS"
     590        echo "QT_INCLUDE_DIR    = $QT_INCLUDE_DIR"             
    583591else
    584592        AX_CHECK_QT([${QT_PREFIX}], [QtCore QtCore4],, [http://www.trolltech.com])
  • branches/osx/src/util/signal_handler.cc

    r7461 r7791  
    1717#include <assert.h>
    1818
    19 #ifndef __WIN32__
     19#ifdef __LINUX__
    2020
    2121SignalHandler * SignalHandler::singletonRef = NULL;
  • branches/osx/src/util/signal_handler.h

    r7440 r7791  
    1010#include <string>
    1111
    12 #define GDB_BT_FILE "orxonox.backtrace"
     12
    1313
    1414enum GdbRunType{
     
    1818
    1919
    20 #ifndef __WIN32__
     20#ifdef __LINUX__
    2121#include <signal.h>
    2222
Note: See TracChangeset for help on using the changeset viewer.