diff --git a/INSTALL b/INSTALL index d34b453b..1dab493e 100755 --- a/INSTALL +++ b/INSTALL @@ -41,16 +41,17 @@ Linux: Required packages: QT4 (devel packages, too!), Jack (devel packages, too!) - cd llcon -- sh bootstrap -- ./configure +- qmake llcon.pro - make -- run llcon/linux/llcon - -NOTES: -- if the file "bootstrap" is not available, skip this step +- run ./llcon Mac: ---- -TODO: "qmake -spec /usr/local/Qt4.6/mkspecs/macx-g++ -macx -o Makefile llcon.pro" \ No newline at end of file +- cd llcon +- qmake -spec /usr/local/Qt4.6/mkspecs/macx-g++ -macx -o Makefile llcon.pro +- make +- run ./llcon + +NOTE: You may have to adjust the Qt4.x path to your Qt version diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index a15ebeb7..00000000 --- a/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -AUTOMAKE_OPTIONS = foreign - -SUBDIRS = linux diff --git a/bootstrap b/bootstrap deleted file mode 100755 index fea2bbbc..00000000 --- a/bootstrap +++ /dev/null @@ -1,8 +0,0 @@ -#! /bin/bash - -aclocal -I . && \ -autoheader && \ -libtoolize --automake --copy && \ -automake --add-missing --copy && \ -autoconf -echo "Ready to run ./configure" diff --git a/configure.in b/configure.in deleted file mode 100755 index 07c739c8..00000000 --- a/configure.in +++ /dev/null @@ -1,99 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_PREREQ(2.50) -AC_INIT(src/main.cpp) - -AM_INIT_AUTOMAKE(llcon,3.1.3cvs) - - -AM_CONFIG_HEADER(config.h) - -dnl Checks for programs. -AC_PROG_LIBTOOL -AC_PROG_CC -AC_PROG_CXX -AC_PROG_CPP -AC_PROG_INSTALL -AC_SUBST(LIBTOOL_DEPS) -AC_PROG_MAKE_SET - -dnl Configuration Arguments - -AC_ARG_ENABLE( sound,[ --enable-sound generic sound support], enable_sound=$enableval, enable_sound=yes) - - -dnl Check for Jack -if test "$enable_sound" = "yes"; then - dnl checks for JACK audio - AC_CHECK_HEADER([jack/jack.h], have_jack=yes, have_jack=no, [ - ]) - dnl AM_CONDITIONAL(USE_JACK,test "$have_jack" = yes) - - if test "$have_jack" = yes; then - JACK_LIB="-ljack" - AC_DEFINE(USE_JACK, 1,[Define to enable JACK input module]) - fi - - AC_DEFINE(WITH_SOUND, 1, [Define if you want to use sound]) -fi - -dnl Checks for header files. -AC_HEADER_STDC -AC_LANG_CPLUSPLUS - -dnl Checks for some external libraries that need to be installed -AC_LANG(C++) - - -dnl CELT ------------------------------------------------------------------------ -AC_DEFINE([USE_ALLOCA], [], [Make use of alloca]) - - -dnl QT4 ------------------------------------------------------------------------- -dnl The QT4 check code was taken from the FreeMat-3.0 code by Samit Basu -PKG_CHECK_MODULES(QT, QtCore QtGui QtNetwork QtXml >= 4.0.1, HAVE_QT4="yes", HAVE_QT4="no") -if test "x$HAVE_QT4" = "xyes"; then - - dnl Check needed because in some cases the QtGui includedir - dnl doesn't contain the subsystem dir. - 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_CHECK_PROGS(QT_MOC, [moc4 moc-qt4 moc], []) - AC_CHECK_PROGS(QT_RCC, [rcc4 rcc-qt4 rcc], []) - AC_CHECK_PROGS(QT_UIC, [uic4 uic-qt4 uic], []) - if (test "$QT_MOC" = ""); then - AC_MSG_ERROR([QT4 moc is required.]) - fi - if (test "$QT_RCC" = ""); then - AC_MSG_ERROR([QT4 rcc is required.]) - fi - if (test "$QT_UIC" = ""); then - AC_MSG_ERROR([QT4 uic is required.]) - fi - - QT_LIB="-lQtCore -lQtGui -lQtNetwork -lQtXml" -fi - -QT_LIBS="$QT_LIB" -QT_LDADD="-L$QTDIR/lib $QT_LIBS" -JACK_LIBS="$JACK_LIB" -JACK_LDADD="$JACK_LIBS" -LDFLAGS="$QT_LDADD $JACK_LDADD $LDFLAGS" - -AC_MSG_NOTICE([Set LDFLAGS... $LDFLAGS]) - -AC_MSG_NOTICE([Set QT_CFLAGS... $QT_CFLAGS]) -AC_SUBST(QT_CFLAGS) -AC_SUBST(QT_LIBS) -AC_SUBST(QT_MOC) -AC_SUBST(QT_RCC) -AC_SUBST(QT_UIC) - -AC_CONFIG_FILES(Makefile linux/Makefile) -AC_OUTPUT diff --git a/linux/Makefile.am b/linux/Makefile.am deleted file mode 100755 index d02746e7..00000000 --- a/linux/Makefile.am +++ /dev/null @@ -1,244 +0,0 @@ -bin_PROGRAMS = llcon - -llcon_SOURCES = ../src/buffer.cpp \ - ../src/main.cpp \ - ../src/socket.cpp \ - ../src/channel.cpp \ - ../src/util.cpp \ - ../src/llconclientdlg.cpp \ - ../src/clientsettingsdlg.cpp \ - ../src/llconserverdlg.cpp \ - ../src/chatdlg.cpp \ - ../src/client.cpp \ - ../src/server.cpp \ - ../src/settings.cpp \ - ../src/protocol.cpp \ - ../src/multicolorled.cpp \ - ../src/multicolorledbar.cpp \ - ../src/audiomixerboard.cpp \ - ../src/serverlogging.cpp \ - ../src/soundbase.cpp \ - sound.cpp \ - ../libs/celt/bands.c \ - ../libs/celt/celt.c \ - ../libs/celt/cwrs.c \ - ../libs/celt/ecintrin.h \ - ../libs/celt/entcode.c \ - ../libs/celt/entdec.c \ - ../libs/celt/entenc.c \ - ../libs/celt/header.c \ - ../libs/celt/kfft_single.c \ - ../libs/celt/_kiss_fft.c \ - ../libs/celt/_kiss_fftr.c \ - ../libs/celt/laplace.c \ - ../libs/celt/mdct.c \ - ../libs/celt/modes.c \ - ../libs/celt/pitch.c \ - ../libs/celt/psy.c \ - ../libs/celt/quant_bands.c \ - ../libs/celt/rangedec.c \ - ../libs/celt/rangeenc.c \ - ../libs/celt/rate.c \ - ../libs/celt/vq.c \ - ../src/buffer.h \ - ../src/global.h \ - ../src/socket.h \ - ../src/channel.h \ - ../src/util.h \ - ../src/client.h \ - ../src/server.h \ - ../src/settings.h \ - ../src/protocol.h \ - ../src/multicolorled.h \ - ../src/multicolorledbar.h \ - ../src/audiomixerboard.h \ - ../src/serverlogging.h \ - ../src/testbench.h \ - ../src/soundbase.h \ - ../src/llconserverdlg.h \ - ../src/chatdlg.h \ - ../src/llconclientdlg.h \ - ../src/clientsettingsdlg.h \ - ../src/llconclientdlgbase.ui \ - ../src/llconserverdlgbase.ui \ - ../src/clientsettingsdlgbase.ui \ - ../src/chatdlgbase.ui \ - ../src/aboutdlgbase.ui \ - sound.h \ - ../libs/celt/celt.h \ - ../libs/celt/celt_types.h \ - ../libs/celt/celt_header.h \ - ../libs/celt/_kiss_fft_guts.h \ - ../libs/celt/arch.h \ - ../libs/celt/bands.h \ - ../libs/celt/fixed_c5x.h \ - ../libs/celt/fixed_c6x.h \ - ../libs/celt/cwrs.h \ - ../libs/celt/ecintrin.h \ - ../libs/celt/entcode.h \ - ../libs/celt/entdec.h \ - ../libs/celt/entenc.h \ - ../libs/celt/fixed_generic.h \ - ../libs/celt/float_cast.h \ - ../libs/celt/kfft_double.h \ - ../libs/celt/kfft_single.h \ - ../libs/celt/kiss_fft.h \ - ../libs/celt/kiss_fftr.h \ - ../libs/celt/laplace.h \ - ../libs/celt/mdct.h \ - ../libs/celt/mfrngcod.h \ - ../libs/celt/mathops.h \ - ../libs/celt/modes.h \ - ../libs/celt/os_support.h \ - ../libs/celt/pitch.h \ - ../libs/celt/psy.h \ - ../libs/celt/quant_bands.h \ - ../libs/celt/rate.h \ - ../libs/celt/stack_alloc.h \ - ../libs/celt/vq.h \ - ../src/resources.qrc \ - ../src/res/faderbackground.png \ - ../src/res/faderhandle.png \ - ../src/res/faderhandlesmall.png \ - ../src/res/ledbuttonnotpressed.png \ - ../src/res/ledbuttonpressed.png \ - ../src/res/mixerboardbackground.png \ - ../src/res/gig.png \ - ../src/res/mainicon.png \ - ../src/res/CLEDBlack.png \ - ../src/res/CLEDGrey.png \ - ../src/res/CLEDGreen.png \ - ../src/res/CLEDYellow.png \ - ../src/res/CLEDRed.png \ - ../src/res/CLEDDisabledSmall.png \ - ../src/res/CLEDBlackSmall.png \ - ../src/res/CLEDGreySmall.png \ - ../src/res/CLEDGreenSmall.png \ - ../src/res/CLEDYellowSmall.png \ - ../src/res/CLEDRedSmall.png \ - ../src/res/VLEDBlack.png \ - ../src/res/VLEDGrey.png \ - ../src/res/VLEDGreen.png \ - ../src/res/VLEDYellow.png \ - ../src/res/VLEDRed.png \ - ../src/res/VLEDDisabledSmall.png \ - ../src/res/VLEDBlackSmall.png \ - ../src/res/VLEDGreySmall.png \ - ../src/res/VLEDGreenSmall.png \ - ../src/res/VLEDYellowSmall.png \ - ../src/res/VLEDRedSmall.png \ - ../src/res/VRLEDBlack.png \ - ../src/res/VRLEDGrey.png \ - ../src/res/VRLEDGreen.png \ - ../src/res/VRLEDYellow.png \ - ../src/res/VRLEDRed.png \ - ../src/res/VRLEDBlackSmall.png \ - ../src/res/VRLEDGreySmall.png \ - ../src/res/VRLEDGreenSmall.png \ - ../src/res/VRLEDYellowSmall.png \ - ../src/res/VRLEDRedSmall.png - -# these need to be generated before the rest can be compiled - -BUILT_SOURCES = moc/moc_server.cpp \ - moc/moc_soundbase.cpp \ - moc/moc_client.cpp \ - moc/moc_protocol.cpp \ - moc/moc_channel.cpp \ - moc/moc_socket.cpp \ - moc/moc_multicolorled.cpp \ - moc/moc_multicolorledbar.cpp \ - moc/moc_audiomixerboard.cpp \ - moc/moc_util.cpp \ - moc/moc_testbench.cpp \ - moc/moc_serverlogging.cpp \ - moc/moc_llconclientdlg.cpp \ - moc/llconclientdlgbase.h \ - moc/moc_clientsettingsdlg.cpp \ - moc/clientsettingsdlgbase.h \ - moc/moc_llconserverdlg.cpp \ - moc/llconserverdlgbase.h \ - moc/moc_chatdlg.cpp \ - moc/chatdlgbase.h \ - moc/aboutdlgbase.h \ - moc/resources.cpp - -# and should be cleaned by make clean - -CLEANFILES = $(BUILT_SOURCES) -nodist_llcon_SOURCES = $(BUILT_SOURCES) - -dist-hook: - mkdir $(distdir)/moc - -moc/moc_soundbase.cpp: ../src/soundbase.h - $(QT_MOC) ../src/soundbase.h -o moc/moc_soundbase.cpp - -moc/moc_server.cpp: ../src/server.h - $(QT_MOC) ../src/server.h -o moc/moc_server.cpp - -moc/moc_client.cpp: ../src/client.h - $(QT_MOC) ../src/client.h -o moc/moc_client.cpp - -moc/moc_socket.cpp: ../src/socket.h - $(QT_MOC) ../src/socket.h -o moc/moc_socket.cpp - -moc/moc_multicolorled.cpp: ../src/multicolorled.h - $(QT_MOC) ../src/multicolorled.h -o moc/moc_multicolorled.cpp - -moc/moc_multicolorledbar.cpp: ../src/multicolorledbar.h - $(QT_MOC) ../src/multicolorledbar.h -o moc/moc_multicolorledbar.cpp - -moc/moc_audiomixerboard.cpp: ../src/audiomixerboard.h - $(QT_MOC) ../src/audiomixerboard.h -o moc/moc_audiomixerboard.cpp - -moc/moc_util.cpp: ../src/util.h - $(QT_MOC) ../src/util.h -o moc/moc_util.cpp - -moc/moc_protocol.cpp: ../src/protocol.h - $(QT_MOC) ../src/protocol.h -o moc/moc_protocol.cpp - -moc/moc_channel.cpp: ../src/channel.h - $(QT_MOC) ../src/channel.h -o moc/moc_channel.cpp - -moc/moc_testbench.cpp: ../src/testbench.h - $(QT_MOC) ../src/testbench.h -o moc/moc_testbench.cpp - -moc/moc_serverlogging.cpp: ../src/serverlogging.h - $(QT_MOC) ../src/serverlogging.h -o moc/moc_serverlogging.cpp - - -moc/moc_llconclientdlg.cpp: ../src/llconclientdlg.h - $(QT_MOC) ../src/llconclientdlg.h -o moc/moc_llconclientdlg.cpp - -moc/moc_clientsettingsdlg.cpp: ../src/clientsettingsdlg.h - $(QT_MOC) ../src/clientsettingsdlg.h -o moc/moc_clientsettingsdlg.cpp - -moc/moc_llconserverdlg.cpp: ../src/llconserverdlg.h - $(QT_MOC) ../src/llconserverdlg.h -o moc/moc_llconserverdlg.cpp - -moc/moc_chatdlg.cpp: ../src/chatdlg.h - $(QT_MOC) ../src/chatdlg.h -o moc/moc_chatdlg.cpp - - -moc/aboutdlgbase.h: ../src/aboutdlgbase.ui - $(QT_UIC) ../src/aboutdlgbase.ui -o moc/aboutdlgbase.h - -moc/llconclientdlgbase.h: ../src/llconclientdlgbase.ui - $(QT_UIC) ../src/llconclientdlgbase.ui -o moc/llconclientdlgbase.h - -moc/clientsettingsdlgbase.h: ../src/clientsettingsdlgbase.ui - $(QT_UIC) ../src/clientsettingsdlgbase.ui -o moc/clientsettingsdlgbase.h - -moc/llconserverdlgbase.h: ../src/llconserverdlgbase.ui - $(QT_UIC) ../src/llconserverdlgbase.ui -o moc/llconserverdlgbase.h - -moc/chatdlgbase.h: ../src/chatdlgbase.ui - $(QT_UIC) ../src/chatdlgbase.ui -o moc/chatdlgbase.h - - -moc/resources.cpp: ../src/resources.qrc - $(QT_RCC) ../src/resources.qrc -o moc/resources.cpp - - -llcon_CXXFLAGS = -I../src -I../libs/celt $(LIB_INCL_DIRS) $(QT_CFLAGS) -DQT_THREAD_SUPPORT -D_REENTRANT -g diff --git a/linux/deploy_linux.sh b/linux/deploy_linux.sh index de2eac6c..45df1595 100755 --- a/linux/deploy_linux.sh +++ b/linux/deploy_linux.sh @@ -2,8 +2,7 @@ cd .. make distclean -sh bootstrap -./configure +qmake llcon.pro make -j2 make dist