diff --git a/README b/README index e4d6750..769437c 100644 --- a/README +++ b/README @@ -2,11 +2,12 @@ compiling on ubuntu ------------------- you will need at least the following packages to compile fiat lux: scons libboost-system-dev libboost-program-options-dev libboost-thread-dev libboost-filesystem-dev \ -libaubio-dev libeigen2-dev \ -libjack-dev libjack-jackd2-dev python-qt4 python-qt4-gl python-cython libglu1-mesa-dev \ +libaubio-dev libeigen2-dev libcv-dev libhighgui-dev\ +libjack-dev libjack-jackd2-dev python-qt4 python-qt4-gl python-cython libglu1-mesa-dev pyqt4-dev-tools \ jackd cmake libncurses5 yasm pyqt4-dev-tools \ libavcodec-dev libavformat-dev ffmpeg libglu1-mesa-dev libxmu-dev libxi-dev libqt4-dev libavformat-dev +libasound2-dev #to shut up midiview example if you're running maverick you'll need to compile cython-0.14 from source since 0.12 is the latest package @@ -15,6 +16,9 @@ if you're running maverick you'll need to compile cython-0.14 from source since to start compiling lux, type: scons +export PYTHONPATH=$PYTHONPATH:/home/fenn/code/Fiat-Lux/:/home/fenn/code/Fiat-Lux/xenon/Python/:/home/fenn/code/Fiat-Lux/openlase/python/ +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/fenn/code/Fiat-Lux/openlase/libol/:/home/fenn/code/Fiat-Lux/xenon/ + assuming everything went well, now we need to let python know where stuff went: export PYTHONPATH=$PYTHONPATH:$path_to_lux/ export PYTHONPATH=$PYTHONPATH:/home/fenn/code/Fiat-Lux/openlase/python/ diff --git a/openlase/libol/align.h b/openlase/libol/align.h index 55ee468..2f3ab2a 100644 --- a/openlase/libol/align.h +++ b/openlase/libol/align.h @@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include #ifdef HAVE_MALLOC_H -# include +# include #endif diff --git a/xenon/SConscript b/xenon/SConscript index 296ef54..45f082f 100644 --- a/xenon/SConscript +++ b/xenon/SConscript @@ -9,8 +9,13 @@ xenon_env = env.Clone() # Check for BOOST & JACK libraries conf = Configure(xenon_env) -conf.env.Append(CPPPATH=["/usr/local/include/aubio"]) -conf.env.Append(CPPPATH=["/usr/local/include/eigen3"]) + +if sys.platform == "darwin": + conf.env.Append(CPPPATH=["/usr/local/include/aubio"]) + conf.env.Append(CPPPATH=["/usr/local/include/eigen3"]) +if sys.platform == "linux2": + conf.env.Append(CPPPATH=["/usr/include/aubio"]) + conf.env.Append(CPPPATH=["/usr/include/eigen2"]) if not conf.CheckLibWithHeader('boost_system-mt', 'boost/shared_ptr.hpp', 'c++'): print 'ERROR: Could not locate boost_system library' @@ -33,13 +38,25 @@ if not conf.CheckLibWithHeader('aubio', 'aubio.h', 'c++'): if not conf.CheckCXXHeader('Eigen/Dense'): print 'ERROR: Could not locate eigen library' sys.exit(1) -if not conf.CheckLibWithHeader('opencv_core', 'opencv/cv.h', 'c++'): + +if sys.platform == "darwin": + if not conf.CheckLibWithHeader('opencv_core', 'opencv/cv.h', 'c++'): print 'ERROR: Could not locate opencv_core library' sys.exit(1) -if not conf.CheckLibWithHeader('opencv_imgproc', 'opencv/cv.h', 'c++'): + if not conf.CheckLibWithHeader('opencv_imgproc', 'opencv/cv.h', 'c++'): print 'ERROR: Could not locate opencv_imgproc library' sys.exit(1) -if not conf.CheckLibWithHeader('opencv_highgui', 'opencv/cv.h', 'c++'): + if not conf.CheckLibWithHeader('opencv_highgui', 'opencv/cv.h', 'c++'): + print 'ERROR: Could not locate opencv_highgui library' + sys.exit(1) +if sys.platform == "linux2": + if not conf.CheckLibWithHeader('cxcore', 'opencv/cv.h', 'c++'): + print 'ERROR: Could not locate opencv_core library' + sys.exit(1) + if not conf.CheckLibWithHeader('cv', 'opencv/cv.h', 'c++'): + print 'ERROR: Could not locate opencv library' + sys.exit(1) + if not conf.CheckLibWithHeader('highgui', 'opencv/cv.h', 'c++'): print 'ERROR: Could not locate opencv_highgui library' sys.exit(1)