libraries/proxyface
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add option to choose moc; refs #32

Browse Source
This commit is contained in:
Marc Wäckerlin
2012-03-13 12:14:34 +00:00
parent 216be027d2
commit 7176effe41
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure.in
View File

@@ -177,7 +177,12 @@ else
CPPFLAGS+=" -DUNICODE -DQT_NO_DEBUG" CPPFLAGS+=" -DUNICODE -DQT_NO_DEBUG"
CPPFLAGS+=" -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_WEBKIT_LIB -DQT_CORE_LIB" CPPFLAGS+=" -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_WEBKIT_LIB -DQT_CORE_LIB"
CPPFLAGS+=" -I$QTINCDIR" CPPFLAGS+=" -I$QTINCDIR"
AC_CHECK_PROGS([MOC], [moc-qt4 moc-mac moc]) AC_ARG_WITH([moc],
AC_HELP_STRING([--with-moc=/path/to/moc],
[to specify the path to qt4 moc.]),
[MOC="$withval"],
[MOC=""])
AC_CHECK_PROGS([MOC], [$MOC moc-qt4 moc-mac moc])
test -n "$MOC" || AC_MSG_ERROR([moc for Qt 4 not found!]) test -n "$MOC" || AC_MSG_ERROR([moc for Qt 4 not found!])
AC_SUBST(MOC) AC_SUBST(MOC)
AC_CHECK_PROGS([RCC], [rcc-qt4 rcc-mac rcc]) AC_CHECK_PROGS([RCC], [rcc-qt4 rcc-mac rcc])

3
install-64-and-32-bit-linux.sh
View File

@@ -11,7 +11,8 @@ LDFLAGS="-L/opt/local/i586-mingw32msvc/lib" \
./configure \ ./configure \
--prefix=/opt/local/i586-mingw32msvc \ --prefix=/opt/local/i586-mingw32msvc \
--build=x86_64 \ --build=x86_64 \
--host=i586-mingw32msvc && \ --host=i586-mingw32msvc \
--with-moc=/usr/local/Trolltech/Qt-4.8.0/bin/moc && \
make && \ make && \
sudo make install && \ sudo make install && \
make clean && \ make clean && \