eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

now it compiles under Linux but does not link correctly

Browse source
This commit is contained in:
Volker Fischer 2008-01-22 18:42:34 +00:00
parent af72c03dd8
commit b4f1dcca0d
2 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
configure.in
View file

@ -21,7 +21,7 @@ dnl Configuration Arguments
AC_ARG_ENABLE( sound,[ --enable-sound generic sound support], enable_sound=$enableval, enable_sound=yes) AC_ARG_ENABLE( sound,[ --enable-sound generic sound support], enable_sound=$enableval, enable_sound=yes)
AC_ARG_WITH( qt4dir,[ --with-qtdir=path to QT],QT4DIR=$withval) dnl AC_ARG_WITH( qt4dir,[ --with-qtdir=path to QT],QT4DIR=$withval)
AC_CHECK_HEADER(sys/asoundlib.h, , enable_sound=no) AC_CHECK_HEADER(sys/asoundlib.h, , enable_sound=no)
@ -47,7 +47,6 @@ AC_LANG(C++)
dnl QT4 ------------------------------------------------------------------------- dnl QT4 -------------------------------------------------------------------------
dnl The QT4 check code was taken from the FreeMat-3.0 code by Samit Basu dnl The QT4 check code was taken from the FreeMat-3.0 code by Samit Basu
PKG_CHECK_MODULES(QT, QtCore QtGui QtNetwork >= 4.0.1, HAVE_QT4="yes", HAVE_QT4="no") PKG_CHECK_MODULES(QT, QtCore QtGui QtNetwork >= 4.0.1, HAVE_QT4="yes", HAVE_QT4="no")
foo=`echo $QT_LIBS | sed -e 's/-L/-Wl,-rpath,/g'`
if test "x$HAVE_QT4" = "xyes"; then if test "x$HAVE_QT4" = "xyes"; then
dnl Check needed because in some cases the QtGui includedir dnl Check needed because in some cases the QtGui includedir
dnl doesn't contain the subsystem dir. dnl doesn't contain the subsystem dir.
@ -71,8 +70,12 @@ if test "x$HAVE_QT4" = "xyes"; then
AC_MSG_ERROR([QT4 uic is required.]) AC_MSG_ERROR([QT4 uic is required.])
fi fi
fi fi
FOO=`echo $QT_LIBS | sed -e 's/-L/-Wl,-rpath,/' | sed -e 's/-L.*//'` dnl FOO=`echo $QT_LIBS | sed -e 's/-L/-Wl,-rpath,/' | sed -e 's/-L.*//'`
LDFLAGS="$LDFLAGS $FOO" dnl LDFLAGS="$LDFLAGS $FOO"
LDFLAGS="-L/usr/lib $LDFLAGS"
dnl AC_MSG_NOTICE([Set LDFLAGS... $LDFLAGS])
AC_MSG_NOTICE([Set QT_CFLAGS... $QT_CFLAGS]) AC_MSG_NOTICE([Set QT_CFLAGS... $QT_CFLAGS])
AC_SUBST(QT_CFLAGS) AC_SUBST(QT_CFLAGS)

18
src/llconserverdlg.cpp
View file

@ -61,9 +61,7 @@ CLlconServerDlg::CLlconServerDlg ( CServer* pNServP, QWidget* parent )
for ( int i = MAX_NUM_CHANNELS - 1; i >= 0; i-- ) for ( int i = MAX_NUM_CHANNELS - 1; i >= 0; i-- )
{ {
vecpListViewItems[i] = new CServerListViewItem ( ListViewClients ); vecpListViewItems[i] = new CServerListViewItem ( ListViewClients );
#ifndef _WIN32 vecpListViewItems[i]->setHidden ( false );
vecpListViewItems[i]->setVisible ( false );
#endif
} }
// Init timing jitter text label // Init timing jitter text label
@ -132,21 +130,11 @@ void CLlconServerDlg::OnTimer()
QString().setNum ( QString().setNum (
double ( veciNetwOutBlSiFact[i] * MIN_BLOCK_DURATION_MS), 'f', 2 ) ); double ( veciNetwOutBlSiFact[i] * MIN_BLOCK_DURATION_MS), 'f', 2 ) );
#ifndef _WIN32 vecpListViewItems[i]->setHidden ( true );
vecpListViewItems[i]->setVisible ( true );
#endif
} }
else else
{ {
#ifdef _WIN32 vecpListViewItems[i]->setHidden ( false );
// remove text for Windows version
vecpListViewItems[i]->setText ( 0, "" );
vecpListViewItems[i]->setText ( 1, "" );
vecpListViewItems[i]->setText ( 4, "" );
vecpListViewItems[i]->setText ( 5, "" );
#else
vecpListViewItems[i]->setVisible ( false );
#endif
} }
} }