[Sv1-commits] SF.net SVN: sv1:[1529] sonic-visualiser/trunk
Brought to you by:
cannam
From: <ca...@us...> - 2009-03-27 13:10:11
|
Revision: 1529 http://sv1.svn.sourceforge.net/sv1/?rev=1529&view=rev Author: cannam Date: 2009-03-27 13:10:01 +0000 (Fri, 27 Mar 2009) Log Message: ----------- * Move prf file to prf/ (so that it can be pulled in using externals in other projects) Modified Paths: -------------- sonic-visualiser/trunk/INSTALL sonic-visualiser/trunk/audioio/audioio.pro sonic-visualiser/trunk/base/base.pro sonic-visualiser/trunk/data/data.pro sonic-visualiser/trunk/framework/framework.pro sonic-visualiser/trunk/layer/layer.pro sonic-visualiser/trunk/plugin/plugin.pro sonic-visualiser/trunk/rdf/rdf.pro sonic-visualiser/trunk/sv/sv.pro sonic-visualiser/trunk/system/system.pro sonic-visualiser/trunk/transform/transform.pro sonic-visualiser/trunk/view/view.pro sonic-visualiser/trunk/widgets/widgets.pro Added Paths: ----------- sonic-visualiser/trunk/prf/ sonic-visualiser/trunk/prf/sv.prf Removed Paths: ------------- sonic-visualiser/trunk/sv.prf Modified: sonic-visualiser/trunk/INSTALL =================================================================== --- sonic-visualiser/trunk/INSTALL 2009-03-27 12:41:49 UTC (rev 1528) +++ sonic-visualiser/trunk/INSTALL 2009-03-27 13:10:01 UTC (rev 1529) @@ -50,7 +50,7 @@ careful to ensure it is the Qt 4 version of qmake you are running, and not a Qt 3 version). -If you do not have pkg-config, you should first edit the file sv.prf +If you do not have pkg-config, you should first edit the file prf/sv.prf and comment out any of the optional HAVE_* lines (in the section starting "If you don't have pkg-config...") for library dependencies that you aren't using. Then run the Qt 4 "qmake" command. This will Modified: sonic-visualiser/trunk/audioio/audioio.pro =================================================================== --- sonic-visualiser/trunk/audioio/audioio.pro 2009-03-27 12:41:49 UTC (rev 1528) +++ sonic-visualiser/trunk/audioio/audioio.pro 2009-03-27 13:10:01 UTC (rev 1529) @@ -1,7 +1,7 @@ TEMPLATE = lib SV_UNIT_PACKAGES = fftw3f samplerate jack portaudio-2.0 libpulse rubberband -load(../sv.prf) +load(../prf/sv.prf) CONFIG += sv staticlib qt thread warn_on stl rtti exceptions QT -= gui Modified: sonic-visualiser/trunk/base/base.pro =================================================================== --- sonic-visualiser/trunk/base/base.pro 2009-03-27 12:41:49 UTC (rev 1528) +++ sonic-visualiser/trunk/base/base.pro 2009-03-27 13:10:01 UTC (rev 1529) @@ -1,7 +1,7 @@ TEMPLATE = lib SV_UNIT_PACKAGES = -load(../sv.prf) +load(../prf/sv.prf) CONFIG += sv staticlib qt thread warn_on stl rtti exceptions QT -= gui Modified: sonic-visualiser/trunk/data/data.pro =================================================================== --- sonic-visualiser/trunk/data/data.pro 2009-03-27 12:41:49 UTC (rev 1528) +++ sonic-visualiser/trunk/data/data.pro 2009-03-27 13:10:01 UTC (rev 1529) @@ -1,7 +1,7 @@ TEMPLATE = lib SV_UNIT_PACKAGES = fftw3f sndfile mad quicktime id3tag oggz fishsound liblo -load(../sv.prf) +load(../prf/sv.prf) CONFIG += sv staticlib qt thread warn_on stl rtti exceptions QT += network Modified: sonic-visualiser/trunk/framework/framework.pro =================================================================== --- sonic-visualiser/trunk/framework/framework.pro 2009-03-27 12:41:49 UTC (rev 1528) +++ sonic-visualiser/trunk/framework/framework.pro 2009-03-27 13:10:01 UTC (rev 1529) @@ -1,7 +1,7 @@ TEMPLATE = lib SV_UNIT_PACKAGES = vamp vamp-hostsdk # required because we use transform headers -load(../sv.prf) +load(../prf/sv.prf) CONFIG += sv staticlib qt thread warn_on stl rtti exceptions QT += xml Modified: sonic-visualiser/trunk/layer/layer.pro =================================================================== --- sonic-visualiser/trunk/layer/layer.pro 2009-03-27 12:41:49 UTC (rev 1528) +++ sonic-visualiser/trunk/layer/layer.pro 2009-03-27 13:10:01 UTC (rev 1529) @@ -1,7 +1,7 @@ TEMPLATE = lib SV_UNIT_PACKAGES = fftw3f -load(../sv.prf) +load(../prf/sv.prf) CONFIG += sv staticlib qt thread warn_on stl rtti exceptions QT += xml Modified: sonic-visualiser/trunk/plugin/plugin.pro =================================================================== --- sonic-visualiser/trunk/plugin/plugin.pro 2009-03-27 12:41:49 UTC (rev 1528) +++ sonic-visualiser/trunk/plugin/plugin.pro 2009-03-27 13:10:01 UTC (rev 1529) @@ -1,7 +1,7 @@ TEMPLATE = lib SV_UNIT_PACKAGES = vamp vamp-hostsdk lrdf raptor -load(../sv.prf) +load(../prf/sv.prf) CONFIG += sv staticlib qt thread warn_on stl rtti exceptions QT += xml Copied: sonic-visualiser/trunk/prf/sv.prf (from rev 1525, sonic-visualiser/trunk/sv.prf) =================================================================== --- sonic-visualiser/trunk/prf/sv.prf (rev 0) +++ sonic-visualiser/trunk/prf/sv.prf 2009-03-27 13:10:01 UTC (rev 1529) @@ -0,0 +1,215 @@ + +### +### BEGIN CONFIGURABLE STUFF +### + +CONFIG += release +#CONFIG += debug + + + +# Put your favourite optimization flags here. +# +# Don't use -ffast-math -- it does make things faster, but it +# prevents isnan and isinf from working, and we need those. +# +# SV benefits a bit from SSE, but not from SSE2 (it doesn't do +# very much in double precision). +# +# Always define NDEBUG and NO_TIMING for release builds. +# +QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -DNO_TIMING -O3 +QMAKE_CXXFLAGS_DEBUG += -Wall -Woverloaded-virtual -Wextra + +# To do a static build with gcc on Linux +# +#linux-g++*:LIBS += -Wl,-Bstatic +#linux-g++*:DEFINES += BUILD_STATIC + +DEFINES += NO_PIXMAP_COPY_TO_SELF + +macx*:LIBS += -framework QuickTime -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox + +linux*:LIBS += -lasound # needed for MIDI, even if unused for audio + + +# These are testable on platforms with pkg-config. If you don't have +# pkg-config, edit the "If you don't have pkg-config" block below (see +# comments). +# +PKGCONFIG_PACKAGES = vamp vamp-hostsdk oggz fishsound mad id3tag rubberband fftw3 fftw3f sndfile samplerate lrdf redland rasqal raptor portaudio-2.0 libpulse jack liblo + + +# No pkg-config test for the bzip2 library. This library is required. +# If you don't have it, install it. +# +DEFINES += HAVE_BZ2 +LIBS += -lbz2 + +# No pkg-config test for QuickTime. This library is optional, for +# audio file import. Note that if you compile in support for either +# or both of libmad and libsndfile as well as for QuickTime, libmad +# and libsndfile will be used in preference to QuickTime where +# applicable. For licensing reasons you may not redistribute binaries +# of Sonic Visualiser built with QuickTime support, except for +# platforms which include QuickTime as a standard part of the platform +# (i.e. OS/X). +# +macx*:DEFINES += HAVE_QUICKTIME +macx*:LIBS += -framework QuickTime -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox + + +!system(pkg-config --atleast-pkgconfig-version=0) { + + # If you don't have pkg-config, or want to overrule it, comment + # out (or install) any of the following that you lack. If you + # have pkg-config, you should be able to ignore all this provided + # the right symbols are defined in PKGCONFIG_PACKAGES above. + # + DEFINES += HAVE_JACK # Optional -- an audio playback option + DEFINES += HAVE_PORTAUDIO_2_0 # Optional -- an audio playback option + DEFINES += HAVE_OGGZ # Optional -- to import .ogg files + DEFINES += HAVE_FISHSOUND # Optional -- to import .ogg files + DEFINES += HAVE_MAD # Optional -- to import .mp3 files + DEFINES += HAVE_ID3TAG # Optional -- to import .mp3 file tags + DEFINES += HAVE_FFTW3F # Optional -- but SV will be slower without it + DEFINES += HAVE_FFTW3 # Optional -- used by Rubber Band + # + LIBS += -ljack + LIBS += -lportaudio + LIBS += -loggz -lfishsound + LIBS += -lmad -lid3tag + LIBS += -lfftw3f + LIBS += -lfftw3 + + # These ones are mandatory. + # If you don't have them, you'll have to find them. + # + DEFINES += HAVE_VAMP # Required -- for analysis plugins + DEFINES += HAVE_VAMP_HOSTSDK # Required -- for analysis plugins + DEFINES += HAVE_SNDFILE # Required -- to import and export .wav files + DEFINES += HAVE_SAMPLERATE # Required -- for resampling + DEFINES += HAVE_RUBBERBAND # Required -- for time stretching + DEFINES += HAVE_RASQAL # Required -- for RDF + DEFINES += HAVE_REDLAND # Required -- for RDF + # + LIBS += -lvamp-hostsdk -lsndfile -lrubberband -lrdf -lrasqal -lraptor -lsamplerate + +} + +### +### END CONFIGURABLE STUFF +### + +system(pkg-config --atleast-pkgconfig-version=0) { + + # If you have pkg-config, this block should locate all packages + # for you provided they have .pc files and are listed in + # PKGCONFIG_PACKAGES. + # + for(PKG, PKGCONFIG_PACKAGES) { + contains(SV_UNIT_PACKAGES, $$PKG) { + system(pkg-config --exists $$PKG) { + VERSION = $$system(pkg-config --modversion $$PKG) + PACKAGE_SYMBOL = $$system(echo $$PKG | tr '[a-z-]' '[A-Z_]' | tr '.' '_') + VERSION_SYMBOL = $$PACKAGE_SYMBOL'_VERSION' + DEFINES += HAVE_$$PACKAGE_SYMBOL + QMAKE_CXXFLAGS += -D"'"$$VERSION_SYMBOL='"'$$VERSION'"'"'" + QMAKE_CXXFLAGS += $$system(pkg-config --cflags $$PKG) + LIBS += $$system(pkg-config --libs $$PKG) + message("Using pkg-config package $$PKG with version $$VERSION") + } else { + message("WARNING: Failed to find pkg-config package $$PKG") + } + } + } +} + +contains(SV_UNIT_PACKAGES, portaudio-2.0) { + contains(DEFINES, HAVE_PORTAUDIO_2_0) { + message("Including PortAudio support for audio playback") + } else { + message("WARNING: PortAudio audio playback support will not be included") + } +} + +contains(SV_UNIT_PACKAGES, libpulse) { + contains(DEFINES, HAVE_LIBPULSE) { + message("Including PulseAudio support for audio playback") + } else { + message("WARNING: PulseAudio audio playback support will not be included") + } +} + +contains(SV_UNIT_PACKAGES, jack) { + contains(DEFINES, HAVE_JACK) { + message("Including JACK support for audio playback") + } else { + !win32:message("WARNING: JACK audio playback support will not be included") + !contains(DEFINES, HAVE_PORTAUDIO_2_0) { + message("WARNING: No audio playback support is configured!") + } + } +} + +contains(SV_UNIT_PACKAGES, oggz) { + contains(DEFINES, HAVE_OGGZ) { + contains(DEFINES, HAVE_FISHSOUND) { + message("Including .ogg file import") + } else { + message("WARNING: .ogg file import will not be included") + } + } else { + message("WARNING: .ogg file import will not be included") + } +} + +contains(SV_UNIT_PACKAGES, mad) { + contains(DEFINES, HAVE_MAD) { + message("Including .mp3 file import") + } else { + message("WARNING: .mp3 file import will not be included") + } +} + +contains(SV_UNIT_PACKAGES, id3tag) { + contains(DEFINES, HAVE_ID3TAG) { + message("Including .mp3 file tag support") + } else { + message("WARNING: .mp3 file tag support will not be included") + } +} + +contains(SV_UNIT_PACKAGES, fftw3f) { + contains(DEFINES, HAVE_FFTW3F) { + message("Using FFTW3f") + } else { + message("WARNING: FFTW3f not available, using slower FFT implementation") + } +} + +contains(SV_UNIT_PACKAGES, vamp):!contains(DEFINES, HAVE_VAMP):error("Vamp plugin API required") +contains(SV_UNIT_PACKAGES, vamp-hostsdk):!contains(DEFINES, HAVE_VAMP_HOSTSDK):error("Vamp plugin host SDK required") +contains(SV_UNIT_PACKAGES, bz2):!contains(DEFINES, HAVE_BZ2):error("bzip2 library required") +contains(SV_UNIT_PACKAGES, sndfile):!contains(DEFINES, HAVE_SNDFILE):error("sndfile library required") +contains(SV_UNIT_PACKAGES, samplerate):!contains(DEFINES, HAVE_SAMPLERATE):error("libsamplerate required") +contains(SV_UNIT_PACKAGES, rubberband):!contains(DEFINES, HAVE_RUBBERBAND):error("Rubber Band library required") +contains(SV_UNIT_PACKAGES, rasqal):!contains(DEFINES, HAVE_RASQAL):error("Rasqal RDF query library required") +contains(SV_UNIT_PACKAGES, redland):!contains(DEFINES, HAVE_REDLAND):error("Redland RDF datastore required") + +VERSION_CFLAGS += -D"'"SVNREV='"'$$system(svnversion -n .)'"'"'" + +QMAKE_CXXFLAGS_DEBUG += -DBUILD_DEBUG $$VERSION_CFLAGS +QMAKE_CXXFLAGS_RELEASE += -DBUILD_RELEASE $$VERSION_CFLAGS + +LIBS -= -lpthread + +linux-g++* { + contains(DEFINES, BUILD_STATIC) { + LIBS += -lFLAC -lxml2 + } +} + +# Restore dynamic linkage, in case we went static earlier +linux-g++*:LIBS += -Wl,-Bdynamic -lpthread -ldl + Property changes on: sonic-visualiser/trunk/prf/sv.prf ___________________________________________________________________ Added: svn:mergeinfo + /sonic-visualiser/branches/one-fftdataserver-per-fftmodel/sv.prf:1406-1415 Modified: sonic-visualiser/trunk/rdf/rdf.pro =================================================================== --- sonic-visualiser/trunk/rdf/rdf.pro 2009-03-27 12:41:49 UTC (rev 1528) +++ sonic-visualiser/trunk/rdf/rdf.pro 2009-03-27 13:10:01 UTC (rev 1529) @@ -1,7 +1,7 @@ TEMPLATE = lib SV_UNIT_PACKAGES = redland rasqal raptor -load(../sv.prf) +load(../prf/sv.prf) CONFIG += sv staticlib qt thread warn_on stl rtti exceptions Modified: sonic-visualiser/trunk/sv/sv.pro =================================================================== --- sonic-visualiser/trunk/sv/sv.pro 2009-03-27 12:41:49 UTC (rev 1528) +++ sonic-visualiser/trunk/sv/sv.pro 2009-03-27 13:10:01 UTC (rev 1529) @@ -3,7 +3,7 @@ SV_UNIT_PACKAGES = vamp vamp-hostsdk rubberband fftw3 fftw3f samplerate jack libpulse portaudio-2.0 mad id3tag oggz fishsound lrdf redland rasqal raptor sndfile liblo -load(../sv.prf) +load(../prf/sv.prf) CONFIG += sv qt thread warn_on stl rtti exceptions QT += xml network Deleted: sonic-visualiser/trunk/sv.prf =================================================================== --- sonic-visualiser/trunk/sv.prf 2009-03-27 12:41:49 UTC (rev 1528) +++ sonic-visualiser/trunk/sv.prf 2009-03-27 13:10:01 UTC (rev 1529) @@ -1,215 +0,0 @@ - -### -### BEGIN CONFIGURABLE STUFF -### - -CONFIG += release -#CONFIG += debug - - - -# Put your favourite optimization flags here. -# -# Don't use -ffast-math -- it does make things faster, but it -# prevents isnan and isinf from working, and we need those. -# -# SV benefits a bit from SSE, but not from SSE2 (it doesn't do -# very much in double precision). -# -# Always define NDEBUG and NO_TIMING for release builds. -# -QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -DNO_TIMING -O3 -QMAKE_CXXFLAGS_DEBUG += -Wall -Woverloaded-virtual -Wextra - -# To do a static build with gcc on Linux -# -#linux-g++*:LIBS += -Wl,-Bstatic -#linux-g++*:DEFINES += BUILD_STATIC - -DEFINES += NO_PIXMAP_COPY_TO_SELF - -macx*:LIBS += -framework QuickTime -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox - -linux*:LIBS += -lasound # needed for MIDI, even if unused for audio - - -# These are testable on platforms with pkg-config. If you don't have -# pkg-config, edit the "If you don't have pkg-config" block below (see -# comments). -# -PKGCONFIG_PACKAGES = vamp vamp-hostsdk oggz fishsound mad id3tag rubberband fftw3 fftw3f sndfile samplerate lrdf redland rasqal raptor portaudio-2.0 libpulse jack liblo - - -# No pkg-config test for the bzip2 library. This library is required. -# If you don't have it, install it. -# -DEFINES += HAVE_BZ2 -LIBS += -lbz2 - -# No pkg-config test for QuickTime. This library is optional, for -# audio file import. Note that if you compile in support for either -# or both of libmad and libsndfile as well as for QuickTime, libmad -# and libsndfile will be used in preference to QuickTime where -# applicable. For licensing reasons you may not redistribute binaries -# of Sonic Visualiser built with QuickTime support, except for -# platforms which include QuickTime as a standard part of the platform -# (i.e. OS/X). -# -macx*:DEFINES += HAVE_QUICKTIME -macx*:LIBS += -framework QuickTime -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox - - -!system(pkg-config --atleast-pkgconfig-version=0) { - - # If you don't have pkg-config, or want to overrule it, comment - # out (or install) any of the following that you lack. If you - # have pkg-config, you should be able to ignore all this provided - # the right symbols are defined in PKGCONFIG_PACKAGES above. - # - DEFINES += HAVE_JACK # Optional -- an audio playback option - DEFINES += HAVE_PORTAUDIO_2_0 # Optional -- an audio playback option - DEFINES += HAVE_OGGZ # Optional -- to import .ogg files - DEFINES += HAVE_FISHSOUND # Optional -- to import .ogg files - DEFINES += HAVE_MAD # Optional -- to import .mp3 files - DEFINES += HAVE_ID3TAG # Optional -- to import .mp3 file tags - DEFINES += HAVE_FFTW3F # Optional -- but SV will be slower without it - DEFINES += HAVE_FFTW3 # Optional -- used by Rubber Band - # - LIBS += -ljack - LIBS += -lportaudio - LIBS += -loggz -lfishsound - LIBS += -lmad -lid3tag - LIBS += -lfftw3f - LIBS += -lfftw3 - - # These ones are mandatory. - # If you don't have them, you'll have to find them. - # - DEFINES += HAVE_VAMP # Required -- for analysis plugins - DEFINES += HAVE_VAMP_HOSTSDK # Required -- for analysis plugins - DEFINES += HAVE_SNDFILE # Required -- to import and export .wav files - DEFINES += HAVE_SAMPLERATE # Required -- for resampling - DEFINES += HAVE_RUBBERBAND # Required -- for time stretching - DEFINES += HAVE_RASQAL # Required -- for RDF - DEFINES += HAVE_REDLAND # Required -- for RDF - # - LIBS += -lvamp-hostsdk -lsndfile -lrubberband -lrdf -lrasqal -lraptor -lsamplerate - -} - -### -### END CONFIGURABLE STUFF -### - -system(pkg-config --atleast-pkgconfig-version=0) { - - # If you have pkg-config, this block should locate all packages - # for you provided they have .pc files and are listed in - # PKGCONFIG_PACKAGES. - # - for(PKG, PKGCONFIG_PACKAGES) { - contains(SV_UNIT_PACKAGES, $$PKG) { - system(pkg-config --exists $$PKG) { - VERSION = $$system(pkg-config --modversion $$PKG) - PACKAGE_SYMBOL = $$system(echo $$PKG | tr '[a-z-]' '[A-Z_]' | tr '.' '_') - VERSION_SYMBOL = $$PACKAGE_SYMBOL'_VERSION' - DEFINES += HAVE_$$PACKAGE_SYMBOL - QMAKE_CXXFLAGS += -D"'"$$VERSION_SYMBOL='"'$$VERSION'"'"'" - QMAKE_CXXFLAGS += $$system(pkg-config --cflags $$PKG) - LIBS += $$system(pkg-config --libs $$PKG) - message("Using pkg-config package $$PKG with version $$VERSION") - } else { - message("WARNING: Failed to find pkg-config package $$PKG") - } - } - } -} - -contains(SV_UNIT_PACKAGES, portaudio-2.0) { - contains(DEFINES, HAVE_PORTAUDIO_2_0) { - message("Including PortAudio support for audio playback") - } else { - message("WARNING: PortAudio audio playback support will not be included") - } -} - -contains(SV_UNIT_PACKAGES, libpulse) { - contains(DEFINES, HAVE_LIBPULSE) { - message("Including PulseAudio support for audio playback") - } else { - message("WARNING: PulseAudio audio playback support will not be included") - } -} - -contains(SV_UNIT_PACKAGES, jack) { - contains(DEFINES, HAVE_JACK) { - message("Including JACK support for audio playback") - } else { - !win32:message("WARNING: JACK audio playback support will not be included") - !contains(DEFINES, HAVE_PORTAUDIO_2_0) { - message("WARNING: No audio playback support is configured!") - } - } -} - -contains(SV_UNIT_PACKAGES, oggz) { - contains(DEFINES, HAVE_OGGZ) { - contains(DEFINES, HAVE_FISHSOUND) { - message("Including .ogg file import") - } else { - message("WARNING: .ogg file import will not be included") - } - } else { - message("WARNING: .ogg file import will not be included") - } -} - -contains(SV_UNIT_PACKAGES, mad) { - contains(DEFINES, HAVE_MAD) { - message("Including .mp3 file import") - } else { - message("WARNING: .mp3 file import will not be included") - } -} - -contains(SV_UNIT_PACKAGES, id3tag) { - contains(DEFINES, HAVE_ID3TAG) { - message("Including .mp3 file tag support") - } else { - message("WARNING: .mp3 file tag support will not be included") - } -} - -contains(SV_UNIT_PACKAGES, fftw3f) { - contains(DEFINES, HAVE_FFTW3F) { - message("Using FFTW3f") - } else { - message("WARNING: FFTW3f not available, using slower FFT implementation") - } -} - -contains(SV_UNIT_PACKAGES, vamp):!contains(DEFINES, HAVE_VAMP):error("Vamp plugin API required") -contains(SV_UNIT_PACKAGES, vamp-hostsdk):!contains(DEFINES, HAVE_VAMP_HOSTSDK):error("Vamp plugin host SDK required") -contains(SV_UNIT_PACKAGES, bz2):!contains(DEFINES, HAVE_BZ2):error("bzip2 library required") -contains(SV_UNIT_PACKAGES, sndfile):!contains(DEFINES, HAVE_SNDFILE):error("sndfile library required") -contains(SV_UNIT_PACKAGES, samplerate):!contains(DEFINES, HAVE_SAMPLERATE):error("libsamplerate required") -contains(SV_UNIT_PACKAGES, rubberband):!contains(DEFINES, HAVE_RUBBERBAND):error("Rubber Band library required") -contains(SV_UNIT_PACKAGES, rasqal):!contains(DEFINES, HAVE_RASQAL):error("Rasqal RDF query library required") -contains(SV_UNIT_PACKAGES, redland):!contains(DEFINES, HAVE_REDLAND):error("Redland RDF datastore required") - -VERSION_CFLAGS += -D"'"SVNREV='"'$$system(svnversion -n .)'"'"'" - -QMAKE_CXXFLAGS_DEBUG += -DBUILD_DEBUG $$VERSION_CFLAGS -QMAKE_CXXFLAGS_RELEASE += -DBUILD_RELEASE $$VERSION_CFLAGS - -LIBS -= -lpthread - -linux-g++* { - contains(DEFINES, BUILD_STATIC) { - LIBS += -lFLAC -lxml2 - } -} - -# Restore dynamic linkage, in case we went static earlier -linux-g++*:LIBS += -Wl,-Bdynamic -lpthread -ldl - Modified: sonic-visualiser/trunk/system/system.pro =================================================================== --- sonic-visualiser/trunk/system/system.pro 2009-03-27 12:41:49 UTC (rev 1528) +++ sonic-visualiser/trunk/system/system.pro 2009-03-27 13:10:01 UTC (rev 1529) @@ -1,7 +1,7 @@ TEMPLATE = lib SV_UNIT_PACKAGES = -load(../sv.prf) +load(../prf/sv.prf) CONFIG += sv staticlib qt thread warn_on stl rtti exceptions Modified: sonic-visualiser/trunk/transform/transform.pro =================================================================== --- sonic-visualiser/trunk/transform/transform.pro 2009-03-27 12:41:49 UTC (rev 1528) +++ sonic-visualiser/trunk/transform/transform.pro 2009-03-27 13:10:01 UTC (rev 1529) @@ -1,7 +1,7 @@ TEMPLATE = lib SV_UNIT_PACKAGES = vamp vamp-hostsdk -load(../sv.prf) +load(../prf/sv.prf) CONFIG += sv staticlib qt thread warn_on stl rtti exceptions QT += xml Modified: sonic-visualiser/trunk/view/view.pro =================================================================== --- sonic-visualiser/trunk/view/view.pro 2009-03-27 12:41:49 UTC (rev 1528) +++ sonic-visualiser/trunk/view/view.pro 2009-03-27 13:10:01 UTC (rev 1529) @@ -1,7 +1,7 @@ TEMPLATE = lib SV_UNIT_PACKAGES = -load(../sv.prf) +load(../prf/sv.prf) CONFIG += sv staticlib qt thread warn_on stl rtti exceptions QT += xml Modified: sonic-visualiser/trunk/widgets/widgets.pro =================================================================== --- sonic-visualiser/trunk/widgets/widgets.pro 2009-03-27 12:41:49 UTC (rev 1528) +++ sonic-visualiser/trunk/widgets/widgets.pro 2009-03-27 13:10:01 UTC (rev 1529) @@ -1,7 +1,7 @@ TEMPLATE = lib SV_UNIT_PACKAGES = vamp-hostsdk fftw3f -load(../sv.prf) +load(../prf/sv.prf) CONFIG += sv staticlib qt thread warn_on stl rtti exceptions QT += xml This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |