luisgulo/testdisk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve cross-compilation when calling moc-qt4/moc

Browse source
This commit is contained in:
Christophe Grenier 2012-06-09 15:35:56 +02:00
parent 17a8a827a1
commit 9445d6ca9c
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
compile.sh
View file

@ -19,6 +19,14 @@ else
crosscompile_target=$1 crosscompile_target=$1
TESTDISKCC=$crosscompile_target-gcc TESTDISKCC=$crosscompile_target-gcc
PKG_CONFIG_PATH=/usr/$crosscompile_target/lib/pkgconfig PKG_CONFIG_PATH=/usr/$crosscompile_target/lib/pkgconfig
if [ ! -d $PKG_CONFIG_PATH ];
then
PKG_CONFIG_PATH=/usr/$crosscompile_target/sys-root/mingw/lib/pkgconfig
fi
if [ ! -d $PKG_CONFIG_PATH ];
then
unset PKG_CONFIG_PATH
fi
export PKG_CONFIG_PATH export PKG_CONFIG_PATH
fi fi
fi fi

5
configure.ac
View file

@ -777,7 +777,10 @@ if test "$use_qt" = "true";
then then
PKG_CHECK_MODULES(QTCORE, QtCore >= 4.0.1) PKG_CHECK_MODULES(QTCORE, QtCore >= 4.0.1)
PKG_CHECK_MODULES(QTGUI, QtGui >= 4.0.1) PKG_CHECK_MODULES(QTGUI, QtGui >= 4.0.1)
MOC=`$PKG_CONFIG QtGui --variable=moc_location` AC_CHECK_TOOLS(MOC,[moc-qt4 moc],)
if test x$MOC = x ; then
AC_MSG_WARN(Could not find a moc-qt4 or moc tool in your PATH.)
fi
qphotorec_LDADD="$qphotorec_LDADD $QTGUI_LIBS" qphotorec_LDADD="$qphotorec_LDADD $QTGUI_LIBS"
CXXFLAGS="$CXXFLAGS $QTCORE_CFLAGS $QTGUI_CFLAGS" CXXFLAGS="$CXXFLAGS $QTCORE_CFLAGS $QTGUI_CFLAGS"
fi fi