Changeset 7769 in orxonox.OLD

Timestamp:

May 23, 2006, 12:45:40 PM (18 years ago)

Author:

ponder

Message:

If QT-frameworks ( macosx ) are present, the library directories for QT_LIB are also returned correctly.
Added pck-config to handle macosx-specific stuff. Maybe we could use if throughout the configure.ac?
Removed direct.h from the util/file.cc includes.

Location:

branches/osx

Files:

• acinclude.m4 (modified) (2 diffs)
• configure.ac (modified) (4 diffs)
• src/lib/util/file.cc (modified) (1 diff)

branches/osx/acinclude.m4

@@ -135 +135 @@
     for _lib_directory in ${QT_COMMON_LIB_DIRECTORIES}
     do
-      if test -e ${_lib_directory}/libQtCore.so || test -e ${_lib_directory}/libQtCore4.a ; then
+      if test -e ${_lib_directory}/libQtCore.so || test -e ${_lib_directory}/libQtCore4.a || \
+                        test -e ${_lib_directory}/QtCore.framework ; then
         QT_LIB_DIRECTORY=${_lib_directory}
         break
-      fi
+          fi
     done
     if test -n ${QT_LIB_DIRECTORY} ; then
@@ -194 +195 @@
     fi
 
-    echo "QT_LIBS = ${QT_LIBS}"
-    echo "QT_CXXFLAGS = ${QT_CXXFLAGS}"
-    echo "QT_LD_FLAGS = ${QT_LDFLAGS}"
+    echo "QT_LIBS          = ${QT_LIBS}"
+    echo "QT_CXXFLAGS      = ${QT_CXXFLAGS}"
+    echo "QT_LD_FLAGS      = ${QT_LDFLAGS}"
     echo "QT_BIN_DIRECTORY = ${QT_BIN_DIRECTORY}"
 

branches/osx/configure.ac

@@ -432 +432 @@
  *darwin*)
  echo "OS X detected"
-
  osX="yes"
-
- CPPFLAGS="-I/$prefix/include $CPPFLAGS"
- LDFLAGS="$LDFLAGS -L$prefix/lib"
+ QT_PREFIX="$prefix"
+ CPPFLAGS="-I/$prefix/include $CPPFLAGS -F$prefix/lib"
+ LDFLAGS="$LDFLAGS -L$prefix/lib -F$prefix/lib"
+ PCK_CONFIG_PATH='/opt/local'
 # checking gl header
    AC_CHECK_HEADERS([OpenGL/gl.h] ,,
       [AC_MSG_ERROR([cannot find opengl headers]) ])
-# cheking for GLU-header
+# checking for GLU-header
     AC_CHECK_HEADERS([OpenGL/glu.h] ,,
       [AC_MSG_ERROR([cannot find opengl headers]) ])
@@ -461 +461 @@
    fi
 
-
+ LIBS="$LIBS"
    AC_CHECK_HEADERS([OpenAL/al.h] ,,
       [AC_MSG_ERROR([cannot find opengl headers]) ])
@@ -471 +471 @@
        SDL_CFLAGS=`sdl-config --cflags`
        SDL_LIBS=`sdl-config --libs`
-       CXXFL\AGS="$CXXFLAGS $SDL_CFLAGS"
+       CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
        LIBS="$LIBS $SDL_LIBS"
    AC_CHECK_HEADERS([SDL/SDL.h] ,,
@@ -565 +565 @@
 # QT #
 #----#
-AX_CHECK_QT([${QT_PREFIX}], [QtCore QtCore4],, [http://www.trolltech.com])
-if test x$have_qt = xno ; then
-    WITH_QT=no
+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)
+else
+        AX_CHECK_QT([${QT_PREFIX}], [QtCore QtCore4],, [http://www.trolltech.com])
+        if test x$have_qt = xno ; then
+                WITH_QT=no
+        fi
 fi
 

branches/osx/src/lib/util/file.cc

@@ -23 +23 @@
 #include <fstream>
 
-#ifdef __unix__
+#ifdef __unix__ 
 #include <unistd.h>
 #elif __WIN32__ || _MS_DOS_
 #include <dir.h>
 #else
-#include <direct.h>
+//#include <direct.h>
 #endif