Revision 108:debead5f6bf8

View differences:

.hgignore
30 30
cov-int/*
31 31
*.deb
32 32
test-svcore-base
33
test-svcore-system
33 34
test-svcore-data-fileio
34 35
test-svcore-data-model
35 36
vamp-plugin-sdk
......
49 50
vamp-plugin-load-checker
50 51
piper-vamp-simple-server
51 52
piper-convert
53
.repoint*
base.pri
32 32
DEFINES += USE_SORD
33 33

  
34 34
CONFIG += qt thread warn_on stl rtti exceptions c++11
35

  
36
include(bq-files.pri)
37
include(vamp-plugin-sdk-files.pri)
38
include(svcore/files.pri)
39
include(capnp-regen.pri)
40

  
41
DATAQUAY_SOURCES=$$fromfile(dataquay/lib.pro, SOURCES)
42
DATAQUAY_HEADERS=$$fromfile(dataquay/lib.pro, HEADERS)
43

  
44
CHECKER_SOURCES=$$fromfile(checker/checker.pri, SOURCES)
45
CHECKER_HEADERS=$$fromfile(checker/checker.pri, HEADERS)
46
                 
47
CLIENT_HEADERS=$$fromfile(piper-cpp/vamp-client/qt/test.pro, HEADERS)
48

  
49
for (file, BQ_SOURCES)       { SOURCES += $$file }
50
for (file, BQ_HEADERS)       { HEADERS += $$file }
51

  
52
for (file, VAMP_SOURCES)     { SOURCES += $$file }
53
for (file, VAMP_HEADERS)     { HEADERS += $$file }
54

  
55
for (file, DATAQUAY_SOURCES) { SOURCES += $$sprintf("dataquay/%1", $$file) }
56
for (file, DATAQUAY_HEADERS) { HEADERS += $$sprintf("dataquay/%1", $$file) }
57

  
58
for (file, CHECKER_SOURCES)  { SOURCES += $$sprintf("checker/%1",  $$file) }
59
for (file, CHECKER_HEADERS)  { HEADERS += $$sprintf("checker/%1",  $$file) }
60

  
61
for (file, SVCORE_SOURCES)   { SOURCES += $$sprintf("svcore/%1", $$file) }
62
for (file, SVCORE_HEADERS)   { HEADERS += $$sprintf("svcore/%1", $$file) }
63
             
64
for (file, CLIENT_HEADERS) {
65
    HEADERS += $$sprintf("piper-cpp/vamp-client/qt/%1",  $$file)
66
}
67

  
68
SOURCES += piper-cpp/vamp-capnp/piper-capnp.cpp
69

  
base.pro
1

  
2
TEMPLATE = lib
3

  
4
exists(config.pri) {
5
    include(config.pri)
6
}
7

  
8
!exists(config.pri) {
9
    include(noconfig.pri)
10
}
11

  
12
include(base.pri)
13

  
14
CONFIG += staticlib
15
QT += network xml
16
QT -= gui
17

  
18
TARGET = base
19

  
20
OBJECTS_DIR = o
21
MOC_DIR = o
22

  
23
include(bq-files.pri)
24
include(vamp-plugin-sdk-files.pri)
25
include(svcore/files.pri)
26
include(capnp-regen.pri)
27

  
28
DATAQUAY_SOURCES=$$fromfile(dataquay/lib.pro, SOURCES)
29
DATAQUAY_HEADERS=$$fromfile(dataquay/lib.pro, HEADERS)
30

  
31
CHECKER_SOURCES=$$fromfile(checker/checker.pri, SOURCES)
32
CHECKER_HEADERS=$$fromfile(checker/checker.pri, HEADERS)
33
                 
34
CLIENT_HEADERS=$$fromfile(piper-cpp/vamp-client/qt/test.pro, HEADERS)
35

  
36
for (file, BQ_SOURCES)       { SOURCES += $$file }
37
for (file, BQ_HEADERS)       { HEADERS += $$file }
38

  
39
for (file, VAMP_SOURCES)     { SOURCES += $$file }
40
for (file, VAMP_HEADERS)     { HEADERS += $$file }
41

  
42
for (file, DATAQUAY_SOURCES) { SOURCES += $$sprintf("dataquay/%1", $$file) }
43
for (file, DATAQUAY_HEADERS) { HEADERS += $$sprintf("dataquay/%1", $$file) }
44

  
45
for (file, CHECKER_SOURCES)  { SOURCES += $$sprintf("checker/%1",  $$file) }
46
for (file, CHECKER_HEADERS)  { HEADERS += $$sprintf("checker/%1",  $$file) }
47

  
48
for (file, SVCORE_SOURCES)   { SOURCES += $$sprintf("svcore/%1", $$file) }
49
for (file, SVCORE_HEADERS)   { HEADERS += $$sprintf("svcore/%1", $$file) }
50
             
51
for (file, CLIENT_HEADERS) {
52
    HEADERS += $$sprintf("piper-cpp/vamp-client/qt/%1",  $$file)
53
}
54

  
55
SOURCES += piper-cpp/vamp-capnp/piper-capnp.cpp
56

  
config.pri.in
11 11
QMAKE_CXXFLAGS += @CXXFLAGS@
12 12
QMAKE_LFLAGS += @LDFLAGS@
13 13

  
14
linux*:LIBS += -lasound -ldl
14
linux*:LIBS += -L$$PWD -lbase -lasound -ldl
15 15

  
16 16
macx*:DEFINES += HAVE_COREAUDIO
17 17
macx*:LIBS += -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices
configure
4494 4494
if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
4495 4495

  
4496 4496
pkg_failed=no
4497
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
4498
$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
4497
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bz2" >&5
4498
$as_echo_n "checking for bz2... " >&6; }
4499 4499

  
4500 4500
if test -n "$bz2_CFLAGS"; then
4501 4501
    pkg_cv_bz2_CFLAGS="$bz2_CFLAGS"
......
4535 4535

  
4536 4536

  
4537 4537
if test $pkg_failed = yes; then
4538
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4538
   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4539 4539
$as_echo "no" >&6; }
4540 4540

  
4541 4541
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
......
4554 4554
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
4555 4555
$as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
4556 4556
elif test $pkg_failed = untried; then
4557
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4557
     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4558 4558
$as_echo "no" >&6; }
4559 4559
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
4560 4560
$as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
......
4645 4645
if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
4646 4646

  
4647 4647
pkg_failed=no
4648
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
4649
$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
4648
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw3" >&5
4649
$as_echo_n "checking for fftw3... " >&6; }
4650 4650

  
4651 4651
if test -n "$fftw3_CFLAGS"; then
4652 4652
    pkg_cv_fftw3_CFLAGS="$fftw3_CFLAGS"
......
4686 4686

  
4687 4687

  
4688 4688
if test $pkg_failed = yes; then
4689
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4689
   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4690 4690
$as_echo "no" >&6; }
4691 4691

  
4692 4692
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
......
4705 4705
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
4706 4706
$as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
4707 4707
elif test $pkg_failed = untried; then
4708
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4708
     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4709 4709
$as_echo "no" >&6; }
4710 4710
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
4711 4711
$as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
......
4796 4796
if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
4797 4797

  
4798 4798
pkg_failed=no
4799
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
4800
$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
4799
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw3f" >&5
4800
$as_echo_n "checking for fftw3f... " >&6; }
4801 4801

  
4802 4802
if test -n "$fftw3f_CFLAGS"; then
4803 4803
    pkg_cv_fftw3f_CFLAGS="$fftw3f_CFLAGS"
......
4837 4837

  
4838 4838

  
4839 4839
if test $pkg_failed = yes; then
4840
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4840
   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4841 4841
$as_echo "no" >&6; }
4842 4842

  
4843 4843
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
......
4856 4856
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
4857 4857
$as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
4858 4858
elif test $pkg_failed = untried; then
4859
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4859
     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4860 4860
$as_echo "no" >&6; }
4861 4861
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
4862 4862
$as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
......
4947 4947
if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
4948 4948

  
4949 4949
pkg_failed=no
4950
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
4951
$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
4950
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sndfile" >&5
4951
$as_echo_n "checking for sndfile... " >&6; }
4952 4952

  
4953 4953
if test -n "$sndfile_CFLAGS"; then
4954 4954
    pkg_cv_sndfile_CFLAGS="$sndfile_CFLAGS"
......
4988 4988

  
4989 4989

  
4990 4990
if test $pkg_failed = yes; then
4991
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4991
   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4992 4992
$as_echo "no" >&6; }
4993 4993

  
4994 4994
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
......
5007 5007
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
5008 5008
$as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
5009 5009
elif test $pkg_failed = untried; then
5010
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5010
     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5011 5011
$as_echo "no" >&6; }
5012 5012
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
5013 5013
$as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
......
5098 5098
if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
5099 5099

  
5100 5100
pkg_failed=no
5101
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
5102
$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
5101
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for samplerate" >&5
5102
$as_echo_n "checking for samplerate... " >&6; }
5103 5103

  
5104 5104
if test -n "$samplerate_CFLAGS"; then
5105 5105
    pkg_cv_samplerate_CFLAGS="$samplerate_CFLAGS"
......
5139 5139

  
5140 5140

  
5141 5141
if test $pkg_failed = yes; then
5142
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5142
   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5143 5143
$as_echo "no" >&6; }
5144 5144

  
5145 5145
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
......
5158 5158
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
5159 5159
$as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
5160 5160
elif test $pkg_failed = untried; then
5161
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5161
     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5162 5162
$as_echo "no" >&6; }
5163 5163
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
5164 5164
$as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
......
5249 5249
if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
5250 5250

  
5251 5251
pkg_failed=no
5252
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
5253
$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
5252
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rubberband" >&5
5253
$as_echo_n "checking for rubberband... " >&6; }
5254 5254

  
5255 5255
if test -n "$rubberband_CFLAGS"; then
5256 5256
    pkg_cv_rubberband_CFLAGS="$rubberband_CFLAGS"
......
5290 5290

  
5291 5291

  
5292 5292
if test $pkg_failed = yes; then
5293
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5293
   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5294 5294
$as_echo "no" >&6; }
5295 5295

  
5296 5296
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
......
5309 5309
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
5310 5310
$as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
5311 5311
elif test $pkg_failed = untried; then
5312
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5312
     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5313 5313
$as_echo "no" >&6; }
5314 5314
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
5315 5315
$as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
......
5400 5400
if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
5401 5401

  
5402 5402
pkg_failed=no
5403
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
5404
$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
5403
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sord" >&5
5404
$as_echo_n "checking for sord... " >&6; }
5405 5405

  
5406 5406
if test -n "$sord_CFLAGS"; then
5407 5407
    pkg_cv_sord_CFLAGS="$sord_CFLAGS"
......
5441 5441

  
5442 5442

  
5443 5443
if test $pkg_failed = yes; then
5444
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5444
   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5445 5445
$as_echo "no" >&6; }
5446 5446

  
5447 5447
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
......
5460 5460
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
5461 5461
$as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
5462 5462
elif test $pkg_failed = untried; then
5463
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5463
     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5464 5464
$as_echo "no" >&6; }
5465 5465
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
5466 5466
$as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
......
5551 5551
if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
5552 5552

  
5553 5553
pkg_failed=no
5554
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
5555
$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
5554
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for serd" >&5
5555
$as_echo_n "checking for serd... " >&6; }
5556 5556

  
5557 5557
if test -n "$serd_CFLAGS"; then
5558 5558
    pkg_cv_serd_CFLAGS="$serd_CFLAGS"
......
5592 5592

  
5593 5593

  
5594 5594
if test $pkg_failed = yes; then
5595
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5595
   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5596 5596
$as_echo "no" >&6; }
5597 5597

  
5598 5598
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
......
5611 5611
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
5612 5612
$as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
5613 5613
elif test $pkg_failed = untried; then
5614
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5614
     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5615 5615
$as_echo "no" >&6; }
5616 5616
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
5617 5617
$as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
......
5687 5687
# version with pkg-config, we check for the symbol with the compiler.
5688 5688

  
5689 5689
pkg_failed=no
5690
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for capnp >= 0.6" >&5
5691
$as_echo_n "checking for capnp >= 0.6... " >&6; }
5690
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for capnp" >&5
5691
$as_echo_n "checking for capnp... " >&6; }
5692 5692

  
5693 5693
if test -n "$capnp_CFLAGS"; then
5694 5694
    pkg_cv_capnp_CFLAGS="$capnp_CFLAGS"
......
5728 5728

  
5729 5729

  
5730 5730
if test $pkg_failed = yes; then
5731
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5731
   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5732 5732
$as_echo "no" >&6; }
5733 5733

  
5734 5734
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
......
5747 5747
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module capnp using pkg-config, trying again by old-fashioned means" >&5
5748 5748
$as_echo "$as_me: Failed to find required module capnp using pkg-config, trying again by old-fashioned means" >&6;}
5749 5749
elif test $pkg_failed = untried; then
5750
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5750
     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5751 5751
$as_echo "no" >&6; }
5752 5752
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module capnp using pkg-config, trying again by old-fashioned means" >&5
5753 5753
$as_echo "$as_me: Failed to find required module capnp using pkg-config, trying again by old-fashioned means" >&6;}
......
5799 5799
if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
5800 5800

  
5801 5801
pkg_failed=no
5802
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
5803
$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
5802
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for liblo" >&5
5803
$as_echo_n "checking for liblo... " >&6; }
5804 5804

  
5805 5805
if test -n "$liblo_CFLAGS"; then
5806 5806
    pkg_cv_liblo_CFLAGS="$liblo_CFLAGS"
......
5840 5840

  
5841 5841

  
5842 5842
if test $pkg_failed = yes; then
5843
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5843
   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5844 5844
$as_echo "no" >&6; }
5845 5845

  
5846 5846
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
......
5859 5859
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
5860 5860
$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
5861 5861
elif test $pkg_failed = untried; then
5862
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5862
     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5863 5863
$as_echo "no" >&6; }
5864 5864
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
5865 5865
$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
......
5954 5954
if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
5955 5955

  
5956 5956
pkg_failed=no
5957
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
5958
$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
5957
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for portaudio_2_0" >&5
5958
$as_echo_n "checking for portaudio_2_0... " >&6; }
5959 5959

  
5960 5960
if test -n "$portaudio_2_0_CFLAGS"; then
5961 5961
    pkg_cv_portaudio_2_0_CFLAGS="$portaudio_2_0_CFLAGS"
......
5995 5995

  
5996 5996

  
5997 5997
if test $pkg_failed = yes; then
5998
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5998
   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5999 5999
$as_echo "no" >&6; }
6000 6000

  
6001 6001
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
......
6014 6014
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
6015 6015
$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
6016 6016
elif test $pkg_failed = untried; then
6017
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6017
     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6018 6018
$as_echo "no" >&6; }
6019 6019
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
6020 6020
$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
......
6109 6109
if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
6110 6110

  
6111 6111
pkg_failed=no
6112
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
6113
$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
6112
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5
6113
$as_echo_n "checking for JACK... " >&6; }
6114 6114

  
6115 6115
if test -n "$JACK_CFLAGS"; then
6116 6116
    pkg_cv_JACK_CFLAGS="$JACK_CFLAGS"
......
6150 6150

  
6151 6151

  
6152 6152
if test $pkg_failed = yes; then
6153
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6153
   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6154 6154
$as_echo "no" >&6; }
6155 6155

  
6156 6156
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
......
6169 6169
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
6170 6170
$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
6171 6171
elif test $pkg_failed = untried; then
6172
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6172
     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6173 6173
$as_echo "no" >&6; }
6174 6174
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
6175 6175
$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
......
6264 6264
if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
6265 6265

  
6266 6266
pkg_failed=no
6267
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
6268
$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
6267
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpulse" >&5
6268
$as_echo_n "checking for libpulse... " >&6; }
6269 6269

  
6270 6270
if test -n "$libpulse_CFLAGS"; then
6271 6271
    pkg_cv_libpulse_CFLAGS="$libpulse_CFLAGS"
......
6305 6305

  
6306 6306

  
6307 6307
if test $pkg_failed = yes; then
6308
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6308
   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6309 6309
$as_echo "no" >&6; }
6310 6310

  
6311 6311
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
......
6324 6324
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
6325 6325
$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
6326 6326
elif test $pkg_failed = untried; then
6327
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6327
     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6328 6328
$as_echo "no" >&6; }
6329 6329
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
6330 6330
$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
......
6419 6419
if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
6420 6420

  
6421 6421
pkg_failed=no
6422
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
6423
$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
6422
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lrdf" >&5
6423
$as_echo_n "checking for lrdf... " >&6; }
6424 6424

  
6425 6425
if test -n "$lrdf_CFLAGS"; then
6426 6426
    pkg_cv_lrdf_CFLAGS="$lrdf_CFLAGS"
......
6460 6460

  
6461 6461

  
6462 6462
if test $pkg_failed = yes; then
6463
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6463
   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6464 6464
$as_echo "no" >&6; }
6465 6465

  
6466 6466
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
......
6479 6479
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
6480 6480
$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
6481 6481
elif test $pkg_failed = untried; then
6482
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6482
     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6483 6483
$as_echo "no" >&6; }
6484 6484
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
6485 6485
$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
......
6574 6574
if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
6575 6575

  
6576 6576
pkg_failed=no
6577
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
6578
$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
6577
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for oggz" >&5
6578
$as_echo_n "checking for oggz... " >&6; }
6579 6579

  
6580 6580
if test -n "$oggz_CFLAGS"; then
6581 6581
    pkg_cv_oggz_CFLAGS="$oggz_CFLAGS"
......
6615 6615

  
6616 6616

  
6617 6617
if test $pkg_failed = yes; then
6618
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6618
   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6619 6619
$as_echo "no" >&6; }
6620 6620

  
6621 6621
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
......
6634 6634
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
6635 6635
$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
6636 6636
elif test $pkg_failed = untried; then
6637
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6637
     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6638 6638
$as_echo "no" >&6; }
6639 6639
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
6640 6640
$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
......
6729 6729
if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
6730 6730

  
6731 6731
pkg_failed=no
6732
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
6733
$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
6732
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fishsound" >&5
6733
$as_echo_n "checking for fishsound... " >&6; }
6734 6734

  
6735 6735
if test -n "$fishsound_CFLAGS"; then
6736 6736
    pkg_cv_fishsound_CFLAGS="$fishsound_CFLAGS"
......
6770 6770

  
6771 6771

  
6772 6772
if test $pkg_failed = yes; then
6773
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6773
   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6774 6774
$as_echo "no" >&6; }
6775 6775

  
6776 6776
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
......
6789 6789
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
6790 6790
$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
6791 6791
elif test $pkg_failed = untried; then
6792
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6792
     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6793 6793
$as_echo "no" >&6; }
6794 6794
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
6795 6795
$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
......
6884 6884
if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
6885 6885

  
6886 6886
pkg_failed=no
6887
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
6888
$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
6887
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mad" >&5
6888
$as_echo_n "checking for mad... " >&6; }
6889 6889

  
6890 6890
if test -n "$mad_CFLAGS"; then
6891 6891
    pkg_cv_mad_CFLAGS="$mad_CFLAGS"
......
6925 6925

  
6926 6926

  
6927 6927
if test $pkg_failed = yes; then
6928
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6928
   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6929 6929
$as_echo "no" >&6; }
6930 6930

  
6931 6931
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
......
6944 6944
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
6945 6945
$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
6946 6946
elif test $pkg_failed = untried; then
6947
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6947
     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6948 6948
$as_echo "no" >&6; }
6949 6949
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
6950 6950
$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
......
7039 7039
if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
7040 7040

  
7041 7041
pkg_failed=no
7042
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
7043
$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
7042
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for id3tag" >&5
7043
$as_echo_n "checking for id3tag... " >&6; }
7044 7044

  
7045 7045
if test -n "$id3tag_CFLAGS"; then
7046 7046
    pkg_cv_id3tag_CFLAGS="$id3tag_CFLAGS"
......
7080 7080

  
7081 7081

  
7082 7082
if test $pkg_failed = yes; then
7083
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7083
   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7084 7084
$as_echo "no" >&6; }
7085 7085

  
7086 7086
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
......
7099 7099
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
7100 7100
$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
7101 7101
elif test $pkg_failed = untried; then
7102
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7102
     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7103 7103
$as_echo "no" >&6; }
7104 7104
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
7105 7105
$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
......
7196 7196
if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
7197 7197

  
7198 7198
pkg_failed=no
7199
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
7200
$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
7199
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5
7200
$as_echo_n "checking for X11... " >&6; }
7201 7201

  
7202 7202
if test -n "$X11_CFLAGS"; then
7203 7203
    pkg_cv_X11_CFLAGS="$X11_CFLAGS"
......
7237 7237

  
7238 7238

  
7239 7239
if test $pkg_failed = yes; then
7240
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7240
   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7241 7241
$as_echo "no" >&6; }
7242 7242

  
7243 7243
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
......
7256 7256
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
7257 7257
$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
7258 7258
elif test $pkg_failed = untried; then
7259
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7259
     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7260 7260
$as_echo "no" >&6; }
7261 7261
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
7262 7262
$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
noconfig.pri
4 4
#CONFIG -= release
5 5
#CONFIG += debug
6 6

  
7
PREFIX_PATH = /usr/local
8

  
7 9
DEFINES += NDEBUG BUILD_RELEASE
8 10
DEFINES += NO_TIMING NO_HIT_COUNTS
9 11

  
......
28 30
# these.
29 31

  
30 32
LIBS += \
33
        -lbase \
31 34
        -lbz2 \
32 35
	-lrubberband \
33 36
	-lfftw3 \
......
54 57

  
55 58
    # This config is currently used for 32-bit Windows builds.
56 59

  
57
    INCLUDEPATH += sv-dependency-builds/win32-mingw/include
60
    INCLUDEPATH += $$PWD/sv-dependency-builds/win32-mingw/include
58 61

  
59
    LIBS += -Lrelease -Lsv-dependency-builds/win32-mingw/lib -L../sonic-visualiser/sv-dependency-builds/win32-mingw/lib
62
    LIBS += -Lrelease -L$$PWD/sv-dependency-builds/win32-mingw/lib
60 63

  
61 64
    DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE
62 65

  
......
76 79
    # we want to do 32-bit builds with MSVC as well, then we'll
77 80
    # need to add a way to distinguish the two.
78 81
    
79
    INCLUDEPATH += sv-dependency-builds/win64-msvc/include
82
    INCLUDEPATH += $$PWD/sv-dependency-builds/win64-msvc/include
80 83

  
81 84
## This seems to be intruding even when we're supposed to be release
82 85
#    CONFIG(debug) {
83 86
#        LIBS += -NODEFAULTLIB:MSVCRT -Ldebug \
84
#            -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib/debug \
85
#            -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib
87
#            -L$$PWD/sv-dependency-builds/win64-msvc/lib/debug \
88
#            -L$$PWD/sv-dependency-builds/win64-msvc/lib
86 89
#    }
87 90
    CONFIG(release) {
88 91
        LIBS += -Lrelease \
89
            -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib
92
            -L$$PWD/sv-dependency-builds/win64-msvc/lib
90 93
    }
91 94

  
92 95
    DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE
......
111 114

  
112 115
    # All Mac builds are 64-bit these days.
113 116

  
114
    INCLUDEPATH += sv-dependency-builds/osx/include
115
    LIBS += -Lsv-dependency-builds/osx/lib
117
    INCLUDEPATH += $$PWD/sv-dependency-builds/osx/include
118
    LIBS += -L$$PWD/sv-dependency-builds/osx/lib -L$$PWD
116 119

  
117 120
    QMAKE_CXXFLAGS_RELEASE += -O3 -ffast-math
118 121

  
repoint-lock.json
1 1
{
2 2
  "libraries": {
3 3
    "vamp-plugin-sdk": {
4
      "pin": "328cb056da44"
4
      "pin": "da86fb0bccb3"
5 5
    },
6 6
    "svcore": {
7
      "pin": "7d9b537b6a1e"
7
      "pin": "cee5ed3f243a"
8 8
    },
9 9
    "svgui": {
10
      "pin": "51e6125627fa"
10
      "pin": "91670e4e76a6"
11 11
    },
12 12
    "svapp": {
13
      "pin": "7da68349a0c5"
13
      "pin": "ca96a514fbbb"
14 14
    },
15 15
    "checker": {
16
      "pin": "cf18645ff411"
16
      "pin": "3ccc384c0161"
17 17
    },
18 18
    "piper": {
19 19
      "pin": "dde809643316e7bb606fc14d66e55f07059bcf36"
......
40 40
      "pin": "a69c1527268d"
41 41
    },
42 42
    "icons/scalable": {
43
      "pin": "42521013b9b1"
43
      "pin": "1c6516ba7fc1"
44 44
    }
45 45
  }
46 46
}
test-svcore-system.pro
1

  
2
TEMPLATE = app
3

  
4
exists(config.pri) {
5
    include(config.pri)
6
}
7

  
8
!exists(config.pri) {
9
    include(noconfig.pri)
10
}
11

  
12
include(base.pri)
13

  
14
CONFIG += console
15
QT += network xml testlib
16
QT -= gui
17

  
18
win32-x-g++:QMAKE_LFLAGS += -Wl,-subsystem,console
19
macx*: CONFIG -= app_bundle
20

  
21
TARGET = test-svcore-system
22

  
23
OBJECTS_DIR = o
24
MOC_DIR = o
25

  
26
include(svcore/system/test/files.pri)
27

  
28
for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/system/test/%1", $$file) }
29
for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/system/test/%1", $$file) }
30

  
31
!win32* {
32
    QMAKE_POST_LINK = ./$${TARGET}
33
}
vect.pro
1 1

  
2 2
TEMPLATE = subdirs
3 3

  
4
SUBDIRS += \
5
        sub_base
6

  
4 7
# We build the tests on every platform, though at the time of
5 8
# writing they are only automatically run on non-Windows platforms
6 9
# (because of the difficulty of getting them running nicely in the
7 10
# IDE without causing great confusion if a test fails).
8 11
SUBDIRS += \
9 12
        sub_test_svcore_base \
13
        sub_test_svcore_system \
10 14
        sub_test_svcore_data_fileio \
11 15
        sub_test_svcore_data_model
12 16

  
......
16 20
        sub_convert \
17 21
	sub_vect
18 22

  
23
sub_base.file = base.pro
24

  
19 25
sub_test_svcore_base.file = test-svcore-base.pro
26
sub_test_svcore_system.file = test-svcore-system.pro
20 27
sub_test_svcore_data_fileio.file = test-svcore-data-fileio.pro
21 28
sub_test_svcore_data_model.file = test-svcore-data-model.pro
22 29

  

Also available in: Unified diff