Changeset 7791 in orxonox.OLD

Timestamp:

May 24, 2006, 8:54:34 AM (18 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:

• configure.ac (modified) (1 diff)
• src/util/signal_handler.cc (modified) (1 diff)
• src/util/signal_handler.h (modified) (2 diffs)

branches/osx/configure.ac

@@ -567 +567 @@
 if test `uname` = "Darwin" ; then
         PKG_CONFIG_PATH="$prefix"
-        PKG_CHECK_MODULES( QT, QtCore >= 4.01 )
-        QT_INCLUDE_DIR= $($PKG_CONFIG --variable=includedir QtGui)
-        EXTRA_QT_INCLUDE_DIR="$QT_INCLUDE_DIR/Qt"
-        AC_CHECK_FILE([$QT_INCLUDE_DIR/QWidget],
-                AC_MSG_NOTICE([No extra QT_INCLUDE_DIR needed]),
-
-        AC_CHECK_FILE([$EXTRA_QT_INCLUDE_DIR/QWidget],
-                        QT_CFLAGS="$QT_CFLAGS -I$EXTRA_QT_INCLUDE_DIR",
-                        AC_MSG_WARN([QWidget not found])))
-            AC_MSG_NOTICE([Set QT_CFLAGS... $QT_CFLAGS])
-            AC_CHECK_PROG(MOC, [moc], [moc])
-
-            AC_SUBST(QT_CFLAGS)
-            AC_SUBST(QT_LIBS)
+        PKG_CHECK_MODULES( QT, QtOpenGL >= 4.01 QtCore >= 4.01 QtGui >= 4.0.1 )
+        QT_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir QtOpenGL QtCore QtGui`
+#----------#
+            AC_PATH_PROG([QT_MOC], [moc], [no], ["${QT_BIN_DIRECTORY}:${PATH}"])
+              if test x${QT_MOC} = xno ; then
+                AC_MSG_ERROR([QT MOC not found])
+              fi
+        AC_SUBST([QT_MOC])
+
+        AC_PATH_PROG([QT_UIC], [uic], [no], ["${QT_BIN_DIRECTORY}:${PATH}"])
+        AC_SUBST([QT_UIC])
+
+        AC_PATH_PROG([QT_RCC], [rcc], [no], ["${QT_BIN_DIRECTORY}:${PATH}"])
+
+        AC_SUBST([QT_RCC])      
+        AC_SUBST( QT_INCLUDE_DIR )
+        AC_SUBST( QT_CFLAGS )
+        AC_SUBST( QT_LDFLAGS )
+        AC_SUBST( QT_LIBS )
+        echo "QT_LIBS                   = $QT_LIBS"
+        echo "QT_CFLAGS                 = $QT_CFLAGS"
+        echo "QT_INCLUDE_DIR    = $QT_INCLUDE_DIR"              
 else
         AX_CHECK_QT([${QT_PREFIX}], [QtCore QtCore4],, [http://www.trolltech.com])

branches/osx/src/util/signal_handler.cc

@@ -17 +17 @@
 #include <assert.h>
 
-#ifndef __WIN32__
+#ifdef __LINUX__
 
 SignalHandler * SignalHandler::singletonRef = NULL;

branches/osx/src/util/signal_handler.h

@@ -10 +10 @@
 #include <string>
 
-#define GDB_BT_FILE "orxonox.backtrace"
+
 
 enum GdbRunType{
@@ -18 +18 @@
 
 
-#ifndef __WIN32__
+#ifdef __LINUX__
 #include <signal.h>