hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Qt4- and MinGW-compatibility

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@416 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2006-09-25 19:41:07 +00:00
parent 60abfb14d7
commit c0b1c47bd0
32 changed files with 225 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
acinclude.m4
View File

@@ -15,7 +15,7 @@ else
QTDIR=""
fi
for i in $QT_SEARCH ; do
QT_INCLUDE_SEARCH="include include/qt include/qt3 include/Qt"
QT_INCLUDE_SEARCH="include include/qt include/qt3 include/qt4/Qt include/Qt"
for j in $QT_INCLUDE_SEARCH ; do
if test -f $i/$j/qglobal.h -a x$QTDIR = x ; then
QTDIR=$i
@@ -80,12 +80,17 @@ if test x"$QT_TRANSLATIONS" = x ; then
fi
AC_MSG_RESULT([$QT_TRANSLATIONS])
QTHOSTDIR=/usr
# Check that moc is in path
AC_CHECK_PROG(MOC, moc, $QTDIR/bin/moc,,$QTDIR/bin/)
if test x$MOC = x ; then
AC_CHECK_PROG(MOC, moc-qt3, $QTDIR/bin/moc-qt3,,$QTDIR/bin/)
if test x$MOC = x ; then
AC_MSG_ERROR([*** not found! Make sure you have Qt-devel-tools installed!])
AC_CHECK_PROG(MOC, moc-qt4, $QTHOSTDIR/bin/moc-qt4,,$QTHOSTDIR/bin/)
if test x$MOC = x ; then
AC_MSG_ERROR([*** not found! Make sure you have Qt-devel-tools installed!])
fi
fi
fi
@@ -110,7 +115,7 @@ fi
# Calculate Qt include path
QT_CXXFLAGS="-I$QT_INCLUDES"
if test "$QT_MAJOR" = "4" ; then
QT_CXXFLAGS="$QT_CXXFLAGS -I$QTDIR/include"
QT_CXXFLAGS="$QT_CXXFLAGS -I$QTDIR/include/qt4 -I$QTDIR/include"
fi
@@ -138,6 +143,10 @@ case "${host}" in
fi
;;
*mingw32)
QT_IS_MT="yes"
QT_LIB="-L$QTDIR/bin -lQtCore4 -lQtGui4 -lQtXml4 -lQt3Support4"
;;
*)
QT_IS_STATIC=`ls $QTDIR/lib/*.a 2> /dev/null`
if test "x$QT_IS_STATIC" = x; then
@@ -261,7 +270,7 @@ fi
if test x"$QT_IS_MT" = "xyes" ; then
QT_CXXFLAGS="$QT_CXXFLAGS -D_REENTRANT -DQT_THREAD_SUPPORT"
QT_LIBS="$QT_LIBS -lpthread"
QT_LIBS="$QT_LIBS"
fi
if test x"$QT_TRANSLATIONS" != x ; then